RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)

1 files changed, 33 insertions, 6 deletions

diff --git a/redhat/applications/konversation/trinity-konversation-3.5.13.spec b/redhat/applications/konversation/trinity-konversation-3.5.13.spec
index 2b9d0c192..c99927475 100644
--- a/redhat/applications/konversation/trinity-konversation-3.5.13.spec
+++ b/redhat/applications/konversation/trinity-konversation-3.5.13.spec
@@ -1,12 +1,12 @@
 # Default version for this component
 %define kdecomp konversation
 %define version 1.1
-%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 _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -33,6 +33,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [konversation] Rename old tq methods that no longer need a unique name [Commit #01f5ea83]
+Patch0:		bp000-01f5ea83.diff
+# [konversation] Remove additional unneeded tq method conversions [Commit #efdae4e7]
+Patch1:		bp001-efdae4e7.diff
+# [konversation] Rename obsolete tq methods to standard names [Commit #c64099e5]
+Patch2:		bp002-c64099e5.diff
+# [konversation] Fix linear alphabet string errors [Commit #440010aa]
+Patch3:		bp003-440010aa.diff
+# [konversation] Fix inadvertent "TQ" changes. [Commit #ca3d6cef]
+Patch4:		96f2a488.diff
+Patch5:		bp004-ca3d6cef.diff
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
@@ -68,14 +79,21 @@ and experienced users alike will appreciate its many features:
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -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"
+%__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"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -122,11 +140,20 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_datadir}/services/*.protocol
 #%{_datadir}/servicetypes/digikamimageplugin.desktop
 %{_datadir}/apps/*/
-%{_docdir}/HTML/*/konversation/
+%{tde_docdir}/HTML/*/konversation/
 %{_datadir}/icons/*/*/*/*
 #%{_mandir}/man*/*
 
 %Changelog
+* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2
+- Rebuild for Fedora 17
+- Fix HTML directory location
+- Rename old tq methods that no longer need a unique name [Commit #01f5ea83]
+- Remove additional unneeded tq method conversions [Commit #efdae4e7]
+- Rename obsolete tq methods to standard names [Commit #c64099e5]
+- Fix linear alphabet string errors [Commit #440010aa]
+- Fix inadvertent "TQ" changes. [Commit #ca3d6cef]
+
 * Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 1.1-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15