RHEL/Fedora: more application fixes ...

2 files changed, 34 insertions, 12 deletions

diff --git a/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..2f08804da
--- /dev/null
+++ b/redhat/applications/kio-locate/kio-locate-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,22 @@
+--- kio-locate/src/SConscript.ORI	2012-05-02 00:23:36.637608539 +0200
++++ kio-locate/src/SConscript	2012-05-02 00:23:44.142459165 +0200
+@@ -28,7 +28,7 @@
+     pattern.cpp
+ """
+ obj.libs='tqt kio'
+-obj.linkflags='-module' # add more link flags
++#obj.linkflags='-module' # add more link flags
+ obj.execute()
+ 
+ # Install the protocol files
+--- kio-locate/admin/kde.py.ORI	2012-05-02 00:37:55.095993387 +0200
++++ kio-locate/admin/kde.py	2012-05-02 00:38:34.615142101 +0200
+@@ -781,7 +781,7 @@
+ 		lenv.KDEinstall( 'KDEDOC', lenv.join(lang,destination), lenv.join(folder,'index.cache.bz2') )
+ 		
+ 		if env['_INSTALL']:
+-			dir=lenv.join(lenv.getInstDirForResType('KDEDOC'), lang, destination)
++			dir=lenv.join(env['DESTDIR'], lenv.getInstDirForResType('KDEDOC'), lang, destination)
+ 			comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir)
+ 			lenv.Execute(comp)
+ 
diff --git a/redhat/applications/kio-locate/trinity-kio-locate.spec b/redhat/applications/kio-locate/trinity-kio-locate.spec
index 1ff1b119b..7f43664d0 100644
--- a/redhat/applications/kio-locate/trinity-kio-locate.spec
+++ b/redhat/applications/kio-locate/trinity-kio-locate.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kio-locate
 %define version 0.4.5
-%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"
@@ -33,6 +33,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [kio-locate] Fix compilation with GCC 4.7
+Patch1:		kio-locate-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
@@ -43,7 +45,7 @@ BuildRequires:	scons
 
 %description
 Adds support for the "locate:" and "locater:"
-protocols to Konqueror and other KDE applications.
+protocols to Konqueror and other TDE applications.
 
 This enables you to perform locate searches as you
 would in a terminal. The result is displayed just
@@ -51,16 +53,17 @@ as a directory.
 
 
 %prep
-unset QTDIR; . /etc/profile.d/qt.sh
 %setup -q -n applications/%{kdecomp}
+%patch1 -p1
 
 # Ugly hack to modify TQT include directory inside SCONS files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/kde.py \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
 
 
 %build
+unset QTDIR; . /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 scons configure
@@ -76,14 +79,6 @@ scons install DESTDIR=%{buildroot}
 %__rm -rf %{buildroot}
 
 
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
 
 %files
 %defattr(-,root,root,-)
@@ -100,6 +95,11 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
+- Rebuilt for Fedora 17
+- Removes post and postun
+- Fix compilation with GCC 4.7
+
 * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16