From e2bd7a7c7d6839d050e69fde803e0816c1aa8d6b Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 26 Nov 2011 10:39:45 +0100 Subject: [PATCH] RHEL/Fedora: fix gwenview, k9copy, knights HTML directory location --- .../gwenview/trinity-gwenview-3.5.13.spec | 13 ++++++++----- redhat/applications/k9copy/trinity-k9copy.spec | 12 ++++++++---- redhat/applications/knights/trinity-knights.spec | 12 ++++++++---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec index 98b178c0f..d8b62c9a1 100644 --- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp gwenview %define version 1.4.2 -%define release 5 +%define release 6 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -70,8 +70,9 @@ KIPI image framework. # 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" @@ -138,7 +139,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/services/*.desktop %{_datadir}/apps/*/ %{_datadir}/config.kcfg/* -%{_docdir}/HTML/en/*/ +%{tde_docdir}/HTML/en/*/ %{_datadir}/icons/*/*/*/* %{_mandir}/man*/* @@ -149,8 +150,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %Changelog +* Fri Nov 25 2011 Francois Andriot - 1.4.2-6 +- Fix HTML directory location + * Fri Nov 04 2011 Francois Andriot - 1.4.2-5 - Adds missing files diff --git a/redhat/applications/k9copy/trinity-k9copy.spec b/redhat/applications/k9copy/trinity-k9copy.spec index ab79315ea..c26b384f2 100644 --- a/redhat/applications/k9copy/trinity-k9copy.spec +++ b/redhat/applications/k9copy/trinity-k9copy.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp k9copy %define version 1.2.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" @@ -54,8 +54,9 @@ This is the Trinity version # 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" @@ -101,10 +102,13 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/applications/kde/k9copy.desktop %{_datadir}/apps/k9copy %{_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop -%{_docdir}/HTML/en/k9copy +%{tde_docdir}/HTML/en/k9copy %{_datadir}/icons/hicolor/*/apps/k9copy.png %Changelog +* Fri Nov 25 2011 Francois Andriot - 1.2.3-2 +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot - 1.2.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/knights/trinity-knights.spec b/redhat/applications/knights/trinity-knights.spec index 2dbbdc1a4..f1b53b788 100644 --- a/redhat/applications/knights/trinity-knights.spec +++ b/redhat/applications/knights/trinity-knights.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp knights %define version 0.6 -%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 @@ Here's a quick list of Knights' key features: # 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" @@ -105,11 +106,14 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/knights %{_datadir}/applnk/Games/Board/knights.desktop %{_datadir}/apps/knights -%{_docdir}/HTML/*/knights +%{tde_docdir}/HTML/*/knights %{_datadir}/icons/*/*/*/*.png %{_datadir}/mimelnk/application/pgn.desktop %Changelog +* Fri Nov 25 2011 Francois Andriot - 0.6-2 +- Fix HTML directory location + * Sun Nov 20 2011 Francois Andriot - 0.6-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16