summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2013-09-02 23:22:35 +0200
committerFran├žois Andriot <albator78@libertysurf.fr>2013-09-02 23:22:35 +0200
commitc51008ebee10edfbccb321d9e473c6b6c24a8e80 (patch)
treec22b8d67ddd0135ed22334ea62f68629f298debe
parentd7491fce7864ba058980188493d312c572864712 (diff)
downloadtde-packaging-c51008ebee10edfbccb321d9e473c6b6c24a8e80.tar.gz
tde-packaging-c51008ebee10edfbccb321d9e473c6b6c24a8e80.zip
RPM Packaging: update 3.5.13.2 kvirc, krusader
-rw-r--r--redhat/applications/krusader/krusader-3.5.13.2.spec2
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch18
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.2.spec2
3 files changed, 13 insertions, 9 deletions
diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec
index cf43135d4..2df09636c 100644
--- a/redhat/applications/krusader/krusader-3.5.13.2.spec
+++ b/redhat/applications/krusader/krusader-3.5.13.2.spec
@@ -41,7 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: krusader-3.5.13.2-ftbfs.patch
+Patch0: krusader-tmpvfs-ftbfs.diff
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch b/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch
index 33bdda5a7..0c2b8e820 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch
+++ b/redhat/applications/kvirc/kvirc-3.5.13.2-install_directory.patch
@@ -1,11 +1,15 @@
--- trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in.ROI 2013-08-04 20:37:52.076477391 +0200
+++ trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in 2013-08-04 20:37:57.402529614 +0200
-@@ -2633,7 +2633,7 @@
- AC_DEFINE_UNQUOTED([VERSION_BRANCH], "$SS_DIRTAG", [MAJOR.MINOR part of version])
- AC_DEFINE_UNQUOTED([BUILD_FLAGS],"$target_cpu-$build_flags", [these are the build flags])
+@@ -2603,10 +2603,10 @@
+ helpdir="\${globalkvircdir}/help/en"
+ AC_SUBST(helpdir)
-- globalkvircdir="\${datadir}/kvirc/$SS_DIRTAG"
-+ globalkvircdir="\${libdir}/kvirc/$SS_DIRTAG"
- AC_SUBST(globalkvircdir)
+- pluglibdir="\${globalkvircdir}/modules"
++ pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
+ AC_SUBST(pluglibdir)
- configdir="\${globalkvircdir}/config"
+- modulelibdir="\${globalkvircdir}/modules"
++ modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
+ AC_SUBST(modulelibdir)
+
+ defscriptdir="\${globalkvircdir}/defscript"
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
index 8fa752273..fcade0876 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec
+++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
@@ -47,7 +47,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: kvirc-3.5.13.2-fix_ftbfs.patch
# [kvirc] FTBFS because of missing link libraries [Bug #991]
Patch1: kvirc-3.5.13-ftbfs.patch
-Patch2: kvirc-14.0.0-install_directory.patch
+Patch2: kvirc-3.5.13.2-install_directory.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10