RHEL/Fedora: fix kdemultimedia, kdetoys, kdewebdev HTML directory location

3 files changed, 28 insertions, 20 deletions

diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index c595d542c..24d538b36 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 3
+%define release 4
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -136,8 +136,9 @@ Requires: %{name} = %{version}-%{release}
 
 # 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"
@@ -281,7 +282,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 # kaboodle
 %doc rpmdocs/kaboodle/
-%doc %lang(en) %{_docdir}/HTML/en/kaboodle/
+%doc %lang(en) %{tde_docdir}/HTML/en/kaboodle/
 %{_bindir}/kaboodle
 %{tde_libdir}/libkaboodlepart.*
 %{_datadir}/applications/kde/kaboodle.desktop
@@ -290,7 +291,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/services/kaboodle*
 
 # noatun
-%doc %lang(en) %{_docdir}/HTML/en/noatun/
+%doc %lang(en) %{tde_docdir}/HTML/en/noatun/
 %{_bindir}/noatun
 %{_libdir}/kconf_update_bin/noatun20update
 %{tde_libdir}/noatun*
@@ -304,7 +305,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
 
 # juk
-%doc %lang(en) %{_docdir}/HTML/en/juk/
+%doc %lang(en) %{tde_docdir}/HTML/en/juk/
 %{_bindir}/juk
 %{_datadir}/applications/kde/juk.desktop
 %{_datadir}/apps/juk/
@@ -411,6 +412,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_libdir}/libyafxplayer.so
 
 %changelog
+* Fri Nov 25 2011 Francois Andriot <[email protected]> - 3.5.13-4
+- Fix HTML directory location
+
 * Sat Nov 12 2011 Francois Andriot <[email protected]> - 3.5.13-3
 - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
 
diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
index f9ef1f207..ebba35cf7 100644
--- a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
+++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%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"
@@ -61,8 +61,9 @@ and user to be logged-in to KDE.
 
 # 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"
@@ -150,13 +151,16 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 %{_datadir}/apps/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/service*/*.desktop
-%doc %lang(en) %{_docdir}/HTML/en/*
+%doc %lang(en) %{tde_docdir}/HTML/en/*
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 25 2011 Francois Andriot <[email protected]> - 3.5.13-2
+- Fix HTML directory location
+
 * Sun Oct 30 2011 Francois Andriot <[email protected]> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15
 
diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
index 53acedb23..c0b464096 100644
--- a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
+++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%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"
@@ -98,13 +98,14 @@ Requires: trinity-kdelibs
 
 # 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"
 
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
 
-install -m644 -p %{SOURCE5} kxsldbg/
+%__install -m644 -p %{SOURCE5} kxsldbg/
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -116,10 +117,6 @@ unset QTDIR || : ; source /etc/profile.d/qt.sh
 export PATH="%{_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
-%if 0%{?fedora} >= 15
-#export CXXFLAGS="${CXXFLAGS} -fpermissive"
-%endif
-
 %configure \
   --includedir=%{tde_includedir} \
   --disable-rpath \
@@ -151,7 +148,7 @@ done
 cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/
 
 # make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML/en
+pushd %{buildroot}%{tde_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -209,7 +206,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
-%doc %lang(en) %{_docdir}/HTML/en/*
+%doc %lang(en) %{tde_docdir}/HTML/en/*
 
 
 %files libs
@@ -224,6 +221,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Fri Nov 25 2011 Francois Andriot <[email protected]> - 3.5.13-2
+- Fix HTML directory location
+
 * Sun Oct 30 2011 Francois Andriot <[email protected]> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15