RHEL/Fedora: fix kdebindings, kdeutils, kdevelop HTML directory location.

3 files changed, 39 insertions, 24 deletions

diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index 0a6a57f39..a095e581a 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 2
+%define release 3
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -13,8 +13,8 @@
 # TDE 3.5.13 specific building variables
 BuildRequires: autoconf automake libtool m4
 %define tde_docdir %{_docdir}/kde
-%define tde_libdir %{_libdir}/trinity
 %define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
 
 
 Name:	 trinity-kdebindings
@@ -113,8 +113,9 @@ Perl bindings to the DCOP interprocess communication protocol used by 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"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
@@ -260,7 +261,7 @@ update-desktop-database >& /dev/null ||:
 #%{ruby_sitelib}/Qt*
 %{_usr}/lib/ruby/*/*
 %{ruby_arch}/*.so.*
-%doc %lang(en) %{_docdir}/HTML/en/javalib/*
+%doc %lang(en) %{tde_docdir}/HTML/en/javalib/*
 
 # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6)
 %if "%{?_prefix}" == "/usr"
@@ -286,6 +287,9 @@ update-desktop-database >& /dev/null ||:
 %{ruby_arch}/*.la
 
 %changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Fix HTML directory location
+
 * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
 - Add missing BuildRequires
 
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 67af6e856..657e53abe 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 4
+%define release 5
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -120,8 +120,10 @@ More Utilities for the K Desktop Environment:
 
 # 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"
@@ -143,7 +145,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
    --with-xscreensaver \
    --with-extra-includes=%{_includedir}/tqt \
    --enable-closure
-
+   
 %__make %{?_smp_mflags}
 
 %install
@@ -186,17 +188,17 @@ done
 fi
 
 # using pam
-install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%__install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper
+%__install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
 
 pushd %{buildroot}%{_bindir}
-  mkdir -p %{buildroot}%{_sbindir}
-  mv klaptop_acpi_helper ../sbin
-  ln -s /usr/bin/consolehelper klaptop_acpi_helper
+  %__mkdir_p %{buildroot}%{_sbindir}
+  %__mv klaptop_acpi_helper ../sbin
+  %__ln_s /usr/bin/consolehelper klaptop_acpi_helper
 popd
 
 # klaptop setting
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
+%__install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
 
 
 %clean
@@ -246,7 +248,7 @@ done
 %{_datadir}/servicetypes/kmilo
 
 # ksim
-%doc %{_docdir}/HTML/*/ksim/
+%doc %{tde_docdir}/HTML/*/ksim/
 %{tde_libdir}/ksim*
 %{_libdir}/libksimcore.la
 %{_libdir}/libksimcore.so.*
@@ -257,7 +259,7 @@ done
 %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
 
 # klaptop
-%doc %{_docdir}/HTML/en/kcontrol
+%doc %{tde_docdir}/HTML/en/kcontrol
 %{_sysconfdir}/pam.d/klaptop_acpi_helper
 %attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
 %{_bindir}/klaptop*
@@ -287,7 +289,7 @@ done
 %exclude %{_datadir}/servicetypes/kmilo
 
 # ksim
-%exclude %{_docdir}/HTML/*/ksim/
+%exclude %{tde_docdir}/HTML/*/ksim/
 %exclude %{tde_libdir}/ksim*
 %exclude %{_libdir}/libksimcore.la
 %exclude %{_libdir}/libksimcore.so.*
@@ -309,7 +311,7 @@ done
 %exclude %{_libdir}/libkcmlaptop.*
 %exclude %{_datadir}/applications/kde/laptop.desktop
 %exclude %{_datadir}/config/kcmlaptoprc
-%exclude %{_docdir}/HTML/en/kcontrol/
+%exclude %{tde_docdir}/HTML/en/kcontrol/
 %exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
 %exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
 %exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
@@ -334,7 +336,7 @@ done
 %{_datadir}/mimelnk/application/*
 %endif
 %{_datadir}/autostart/*
-%doc %lang(en) %{_docdir}/HTML/en/*
+%doc %lang(en) %{tde_docdir}/HTML/en/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -347,6 +349,9 @@ done
 
 
 %changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Fix HTML directory location
+
 * Thu Nov 17 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Fix symbolic link to 'consolehelper'
 
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
index 969f6bab5..ca27fc19f 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
+++ b/redhat/kdevelop/trinity-kdevelop-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"
@@ -12,6 +12,8 @@
 
 # TDE 3.5.13 specific variables
 BuildRequires:	cmake >= 2.8
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
 %define _default_patch_fuzz 2
@@ -127,8 +129,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"
 
 
 %__rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
@@ -202,7 +205,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root,-)
-%{_docdir}/HTML/en/*
+%{tde_docdir}/HTML/en/*
 %{_bindir}/*
 %{tde_libdir}/*
 %{_libdir}/kconf_update_bin/*
@@ -229,6 +232,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Fix HTML directory location
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
 - Initial release for RHEL 6, RHEL 5 and Fedora 15