summaryrefslogtreecommitdiffstats
path: root/redhat/applications/krusader
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/krusader')
-rw-r--r--redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch20
-rw-r--r--redhat/applications/krusader/trinity-krusader.spec40
2 files changed, 45 insertions, 15 deletions
diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..cc1e71ff0
--- /dev/null
+++ b/redhat/applications/krusader/krusader-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,20 @@
+commit fdf6d34084255fa4e17833f8ef93626e5dd926e6
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date: 1335632256 -0500
+
+ GCC 4.7 fixes.
+
+diff --git a/krusader/UserAction/tstring.h b/krusader/UserAction/tstring.h
+index 94ece59..9356e5c 100644
+--- a/krusader/UserAction/tstring.h
++++ b/krusader/UserAction/tstring.h
+@@ -14,6 +14,9 @@
+ #include <tqvaluelist.h>
+ #include <utility>
+ #include <cassert>
++
++using namespace std;
++
+ template <class T>
+ class TagString_t
+ {
diff --git a/redhat/applications/krusader/trinity-krusader.spec b/redhat/applications/krusader/trinity-krusader.spec
index eeb31a155..2816e930f 100644
--- a/redhat/applications/krusader/trinity-krusader.spec
+++ b/redhat/applications/krusader/trinity-krusader.spec
@@ -1,13 +1,13 @@
# Default version for this component
%define kdecomp krusader
%define version 1.90.0
-%define release 1
+%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%define _mandir %{_prefix}/share/man
+%define _docdir %{_datadir}/doc
+%define _mandir %{_datadir}/man
%endif
# TDE 3.5.13 specific building variables
@@ -34,6 +34,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
+# [krusader] GCC 4.7 fixes. [Commit #fdf6d340]
+Patch1: krusader-3.5.13-fix_gcc47_compilation.patch
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
@@ -44,7 +46,7 @@ BuildRequires: trinity-kdebindings-devel
%description
Krusader is a simple, easy, powerful, twin-panel (commander-style) file
-manager for KDE and other desktops, similar to Midnight Commander (C) or Total
+manager for TDE and other desktops, similar to Midnight Commander (C) or Total
Commander (C).
It provides all the file management features you could possibly want.
@@ -64,15 +66,16 @@ great on your desktop.
%prep
%setup -q -n applications/%{kdecomp}
+%patch1 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
- -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -99,14 +102,16 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
+for f in crystalsvg locolor ; do
+ touch --no-create %{_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
+for f in crystalsvg locolor ; do
+ touch --no-create %{_datadir}/icons/${f} || :
+ gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+done
%files -f %{kdecomp}.lang
@@ -122,13 +127,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_datadir}/apps/krusader
%{tde_docdir}/HTML/en/krusader
%{tde_docdir}/HTML/ru/krusader
-%{_datadir}/icons/*/*/apps/*.png
+%{_datadir}/icons/crystalsvg/*/apps/*.png
+%{_datadir}/icons/locolor/*/apps/*.png
%{_datadir}/services/krarc.protocol
%{_datadir}/services/virt.protocol
%{_mandir}/man1/krusader.1
%Changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
+- Rebuild for Fedora 17
+- GCC 4.7 fixes. [Commit #fdf6d340]
+
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16