RHEL/Fedora: updates main components

5 files changed, 58 insertions, 19 deletions

diff --git a/redhat/libraries/libkipi/trinity-libkipi.spec b/redhat/libraries/libkipi/trinity-libkipi.spec
index fad0abae5..130fb1507 100644
--- a/redhat/libraries/libkipi/trinity-libkipi.spec
+++ b/redhat/libraries/libkipi/trinity-libkipi.spec
@@ -70,12 +70,13 @@ Homepage: http://www.kipi-plugins.org/
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
index 0be591792..6a1659ace 100644
--- a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
@@ -78,12 +78,13 @@ Tools for KSquirrel.
 
 # 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"
+%__sed -i admin/acinclude.m4.in \
+  -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"
-%__make -f "admin/Makefile.common" cvs
+%__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"
 
 
 %build
@@ -109,13 +110,9 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 %files
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..199c7e0ae
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,33 @@
+--- python-trinity/sip/kdecore/kaccel.sip.ORI	2012-05-01 23:10:27.686395190 +0200
++++ python-trinity/sip/kdecore/kaccel.sip	2012-05-01 23:10:39.955113222 +0200
+@@ -35,7 +35,7 @@
+                          KAccel (QWidget* /TransferThis/, const char* = 0);
+                          KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
+     KAccelActions&       actions ();
+-    bool                 isEnabled () const;
++    bool                 isEnabled ();
+     void                 setEnabled (bool);
+     bool                 setAutoUpdate (bool);
+ 
+--- python-trinity/sip/kdecore/kaccelbase.sip.ORI	2012-05-01 23:13:58.455551130 +0200
++++ python-trinity/sip/kdecore/kaccelbase.sip	2012-05-01 23:14:14.835174681 +0200
+@@ -48,7 +48,7 @@
+                          KAccelBase (int);
+     uint                 actionCount () const;
+     KAccelActions&       actions ();
+-    bool                 isEnabled () const;
++    bool                 isEnabled ();
+     KAccelAction*        actionPtr (const QString&);
+     KAccelAction*        actionPtr (const KKey&);
+     KAccelAction*        actionPtr (const KKeyServer::Key&);
+--- python-trinity/sip/kdecore/kglobalaccel.sip.ORI	2012-05-01 23:19:11.934346517 +0200
++++ python-trinity/sip/kdecore/kglobalaccel.sip	2012-05-01 23:19:18.755189755 +0200
+@@ -33,7 +33,7 @@
+ 
+ public:
+                          KGlobalAccel (QObject*, const char* = 0);
+-    bool                 isEnabled () const;
++    bool                 isEnabled ();
+     void                 setEnabled (bool);
+     KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
+ 
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
index a2949fc2b..4ca22d637 100644
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
@@ -1,5 +1,5 @@
---- configure.py.ORI	2011-12-03 17:07:41.589390850 +0100
-+++ configure.py	2011-12-03 17:14:35.226888035 +0100
+--- a/configure.py.ORI	2011-12-03 17:07:41.589390850 +0100
++++ b/configure.py	2011-12-03 17:14:35.226888035 +0100
 @@ -786,7 +786,7 @@
      sipconfig.ParentMakefile(
          configuration = pyqtcfg,
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec
index dec9a719a..0a1adfc82 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/python-trinity/python-trinity.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp python-trinity
 %define version 3.16.3
-%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"
@@ -34,7 +34,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 ## RHEL/Fedora patches
-Patch0:		python-trinity-3.5.13-install_directories.patch
+Patch1:		python-trinity-3.5.13-install_directories.patch
+
+# [python-trinity] Fix compilation with GCC 4.7
+Patch2:		python-trinity-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-kdelibs-devel
@@ -75,11 +78,12 @@ tips and working code you can use to learn from.
 
 %prep
 %setup -q -n libraries/%{kdecomp}
-%patch0 -p0
+%patch1 -p1
+%patch2 -p1
 
 # Hack to get TQT include files under /opt
 %__sed -i "configure.py" \
-	-e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+	-e "s|/usr/include/tqt|%{_includedir}/tqt|g"
 
 %build
 export PATH="%{_bindir}:${PATH}"
@@ -125,5 +129,9 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-2
+- Rebuild for Fedora 17
+- Fix compilation with GCC 4.7
+ 
 * Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16