From d45bc6f2a0b63a4533b1d325207c9421ffd8051c Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 5 May 2012 11:09:11 +0200 Subject: RHEL/Fedora: fix lots of application building --- .../katapult/trinity-katapult-3.5.12.spec | 120 +++++++++++++++++++++ .../katapult/trinity-katapult-3.5.13.spec | 31 ++++-- redhat/applications/kbarcode/trinity-kbarcode.spec | 10 +- .../kbookreader/trinity-kbookreader-3.5.13.spec | 22 ++-- .../kchmviewer/trinity-kchmviewer.spec | 27 ++--- redhat/applications/kcpuload/trinity-kcpuload.spec | 39 ++++--- .../trinity-kdbusnotification-3.5.13.spec | 40 ++----- .../kde-guidance/trinity-kde-guidance.spec | 22 +++- .../trinity-kde-style-lipstik-3.5.13.spec | 26 ++--- .../trinity-kde-style-qtcurve.spec | 23 ++-- .../trinity-kde-systemsettings.spec | 8 +- .../kdesudo/trinity-kdesudo-3.5.13.spec | 34 +++--- .../kdesvn-3.5.13-fix_gcc47_compilation.patch | 11 ++ redhat/applications/kdesvn/trinity-kdesvn.spec | 17 ++- 14 files changed, 295 insertions(+), 135 deletions(-) create mode 100644 redhat/applications/katapult/trinity-katapult-3.5.12.spec create mode 100644 redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch diff --git a/redhat/applications/katapult/trinity-katapult-3.5.12.spec b/redhat/applications/katapult/trinity-katapult-3.5.12.spec new file mode 100644 index 000000000..4f1b16493 --- /dev/null +++ b/redhat/applications/katapult/trinity-katapult-3.5.12.spec @@ -0,0 +1,120 @@ +# Default version for this component +%define kdecomp katapult +%define version 0.3.2.1 +%define release 1 + +# 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 +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/kde3 + + +Name: trinity-%{kdecomp} +Summary: Faster access to applications, bookmarks, and other items. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Source0: %{kdecomp}-3.5.12.tar.gz +Patch0: katapult-0.3.2.1_to_0.3.2.2.patch + +# TQt4 port Katapult. This enables compilation under both Qt3 and Qt4. +Patch1: r1233929.diff + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +Katapult is an application for KDE, designed to allow faster access to +applications, bookmarks, and other items. It is plugin-based, so it can +launch anything that is has a plugin for. Its display is driven by +plugins as well, so its appearance is completely customizable. It was +inspired by Quicksilver for OS X. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 +#patch1 -p2 + +%__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" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +export CXXFLAGS="-DTQ_OBJECT=//" + +chmod +x ./configure + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%make_install + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{_datadir}/services/*.desktop +%{_datadir}/servicetypes/*.desktop +%{tde_libdir}/*.so +%{_libdir}/*.so.* +%{tde_docdir}/HTML/en/katapult + + +%exclude %{tde_libdir}/*.la +%exclude %{_libdir}/*.so +%exclude %{_libdir}/*.la + +%Changelog +* Tue Sep 14 2011 Francois Andriot - 0.3.2.1-1 +- Initial build for RHEL 6.0 +- Import to GIT + diff --git a/redhat/applications/katapult/trinity-katapult-3.5.13.spec b/redhat/applications/katapult/trinity-katapult-3.5.13.spec index c746befce..9f745b2f2 100644 --- a/redhat/applications/katapult/trinity-katapult-3.5.13.spec +++ b/redhat/applications/katapult/trinity-katapult-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp katapult %define version 0.3.2.1 -%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" @@ -53,12 +53,12 @@ inspired by Quicksilver for OS X. # 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" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -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" +%__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 @@ -84,13 +84,17 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done /sbin/ldconfig @@ -99,7 +103,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %doc AUTHORS COPYING %{_bindir}/* %{_datadir}/applications/*/*.desktop -%{_datadir}/icons/*/*/*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* %{_datadir}/locale/*/*/*.mo %{_datadir}/services/*.desktop %{_datadir}/servicetypes/*.desktop @@ -113,6 +118,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %exclude %{_libdir}/*.la %Changelog +* Tue May 01 2012 Francois Andriot - 0.3.2.1-4 +- Rebuilt for Fedora 17 +- Fix post and postun + * Fri Nov 25 2011 Francois Andriot - 0.3.2.1-3 - Fix HTML directory location diff --git a/redhat/applications/kbarcode/trinity-kbarcode.spec b/redhat/applications/kbarcode/trinity-kbarcode.spec index 4af036bb6..507e0b1a5 100644 --- a/redhat/applications/kbarcode/trinity-kbarcode.spec +++ b/redhat/applications/kbarcode/trinity-kbarcode.spec @@ -66,12 +66,12 @@ to use them in another application. # 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" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -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" +%__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 diff --git a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec index 1157fc5ff..03b1a7779 100644 --- a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec +++ b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kbookreader %define version 0.2.0 -%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" @@ -51,12 +51,13 @@ within the Trinity 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 -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" +%__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 @@ -118,11 +119,16 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_datadir}/applnk/*/*.desktop %{_datadir}/apps/*/ %{_datadir}/config.kcfg/* -%{_docdir}/HTML/en/*/ -%{_datadir}/icons/*/*/*/* +%{tde_docdir}/HTML/en/*/ +%{_datadir}/icons/hicolor/*/*/* %Changelog +* Tue May 01 2012 Francois Andriot - 0.2.0-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix HTML directory location + * Sun Oct 30 2011 Francois Andriot - 0.2.0-1 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kchmviewer/trinity-kchmviewer.spec b/redhat/applications/kchmviewer/trinity-kchmviewer.spec index c322597fc..5b1c28d58 100644 --- a/redhat/applications/kchmviewer/trinity-kchmviewer.spec +++ b/redhat/applications/kchmviewer/trinity-kchmviewer.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kchmviewer %define version 3.1.2 -%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" @@ -66,11 +66,12 @@ support. Correctly detects and shows encoding of any valid chm file. # 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 "/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" @@ -86,9 +87,6 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" --with-extra-includes=%{_includedir}/tqt \ --enable-closure -# --with-qt-dir=${QTDIR} \ -# --with-qt-includes=${QTINC} \ -# --with-qt-libraries=${QTLIB} \ %__make %{?_smp_mflags} @@ -105,12 +103,12 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : %files -f %{kdecomp}.lang @@ -127,5 +125,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot - 3.1.2-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot - 3.1.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kcpuload/trinity-kcpuload.spec b/redhat/applications/kcpuload/trinity-kcpuload.spec index 67b2c39d1..345381e31 100644 --- a/redhat/applications/kcpuload/trinity-kcpuload.spec +++ b/redhat/applications/kcpuload/trinity-kcpuload.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kcpuload %define version 2.00 -%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" @@ -41,7 +41,7 @@ BuildRequires: gettext %description -KCPULoad is a small program for Kicker (the KDE panel). It shows a +KCPULoad is a small program for Kicker (the TDE panel). It shows a recent history of CPU usage in the form of one or two configurable diagrams in the system tray. These diagrams have settings for colours and various different styles. @@ -54,11 +54,12 @@ KCPULoad has support for SMP and separate user/system loads. # 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 "/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" @@ -84,12 +85,16 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +for f in crystalsvg locolor ; do + touch --no-create %{_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : +done %files @@ -97,12 +102,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/kcpuload %{_datadir}/applnk/System/kcpuload.desktop %{_datadir}/apps/kcpuload/icons/*/*/*/*.png -%{_datadir}/icons/*/*/apps/kcpuload.png -%{_docdir}/HTML/en/kcpuload/common -%{_docdir}/HTML/en/kcpuload/index.cache.bz2 -%{_docdir}/HTML/en/kcpuload/index.docbook +%{_datadir}/icons/crystalsvg/*/apps/kcpuload.png +%{_datadir}/icons/locolor/*/apps/kcpuload.png +%{tde_docdir}/HTML/en/kcpuload/common +%{tde_docdir}/HTML/en/kcpuload/index.cache.bz2 +%{tde_docdir}/HTML/en/kcpuload/index.docbook %Changelog +* Tue May 01 2012 Francois Andriot - 2.00-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix HTML directory location + * Sat Nov 19 2011 Francois Andriot - 2.00-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec index 27d2f55e5..83aa3617a 100644 --- a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec +++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdbusnotification %define version 0.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" @@ -56,11 +56,12 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. # 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" @@ -83,36 +84,10 @@ export PATH="%{_bindir}:${PATH}" -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - %clean %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %files %defattr(-,root,root,-) @@ -122,5 +97,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot - 0.1-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + * Sun Oct 30 2011 Francois Andriot - 0.1-1 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kde-guidance/trinity-kde-guidance.spec b/redhat/applications/kde-guidance/trinity-kde-guidance.spec index c15b9fd43..f08cd25de 100644 --- a/redhat/applications/kde-guidance/trinity-kde-guidance.spec +++ b/redhat/applications/kde-guidance/trinity-kde-guidance.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp guidance %define version 0.8.0svn20080103 -%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" @@ -18,7 +18,7 @@ BuildRequires: autoconf automake libtool m4 %define __arch_install_post %{nil} Name: trinity-%{kdecomp} -Summary: collection of KDE system administration tools for GNU/Linux [Trinity] +Summary: A collection of system administration tools for Trinity Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -256,14 +256,22 @@ find %{buildroot} -name "*.egg-info" -exec rm -f {} \; %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : /sbin/ldconfig || : %postun +touch --no-create %{_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +/sbin/ldconfig || : + +%post powermanager +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun powermanager touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : %files -f %{kdecomp}.lang @@ -313,5 +321,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot - 0.8.0svn20080103-2 +- Rebuilt for Fedora 17 +- Fix post and postun + * Thu Dec 01 2011 Francois Andriot - 0.8.0svn20080103-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec index 6a6dcd028..5883a3d92 100644 --- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec +++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kde-style-lipstik %define version 2.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" @@ -16,7 +16,7 @@ BuildRequires: autoconf automake libtool m4 %define tde_libdir %{_libdir}/trinity -Name: trinity-%{kdecomp} +Name: trinity-style-lipstik Summary: Lipstik style for TDE Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -33,6 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +Obsoletes: trinity-kde-style-lipstik + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -52,11 +54,12 @@ Lipstik also provides Lipstik-color-schemes # 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" @@ -81,14 +84,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -104,5 +99,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot - 2.2.3-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + * Sat Nov 19 2011 Francois Andriot - 2.2.3-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec index 4995202a2..b52e16305 100644 --- a/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec +++ b/redhat/applications/kde-style-qtcurve/trinity-kde-style-qtcurve.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kde-style-qtcurve %define version 0.55.2 -%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" @@ -16,7 +16,7 @@ BuildRequires: autoconf automake libtool m4 %define tde_libdir %{_libdir}/trinity -Name: trinity-%{kdecomp} +Name: trinity-style-qtcurve Summary: This is a set of widget styles for Trinity based apps Version: %{?version} Release: %{?release}%{?dist}%{?_variant} @@ -41,10 +41,11 @@ BuildRequires: trinity-kdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext +Obsoletes: trinity-kde-style-qtcurve %description This package together with gtk2-engines-qtcurve aim to provide a unified look -and feel on the desktop when using KDE and Gnome applications. +and feel on the desktop when using TDE and Gnome applications. This package is most useful when installed together with gtk2-engines-qtcurve. @@ -56,8 +57,8 @@ gtk2-engines-qtcurve. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i CMakeLists.txt \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" +%__sed -i CMakeLists.txt \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" %build @@ -85,14 +86,6 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - %files %defattr(-,root,root,-) @@ -114,5 +107,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot - 0.55.2-2 +- Rebuilt for Fedora 17 +- Removes post and postun + * Sat Nov 19 2011 Francois Andriot - 0.55.2-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec index 8b34131a5..bd19f7746 100644 --- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec +++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec @@ -52,12 +52,12 @@ unset QTDIR; . /etc/profile.d/qt.sh # 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" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',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" diff --git a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec index 28425aac5..2817ed3db 100644 --- a/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec +++ b/redhat/applications/kdesudo/trinity-kdesudo-3.5.13.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdesudo %define version 2.5.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" @@ -51,12 +51,14 @@ It allows you to run programs as another user by entering your password. # 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/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" -%__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 %build unset QTDIR || : ; source /etc/profile.d/qt.sh @@ -100,25 +102,21 @@ fi %__rm -rf %{buildroot} -%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 %defattr(-,root,root,-) %{_bindir}/kdesudo -%{_docdir}/HTML/en/kdesudo/common -%{_docdir}/HTML/en/kdesudo/index.cache.bz2 -%{_docdir}/HTML/en/kdesudo/index.docbook +%{tde_docdir}/HTML/en/kdesudo/common +%{tde_docdir}/HTML/en/kdesudo/index.cache.bz2 +%{tde_docdir}/HTML/en/kdesudo/index.docbook %{_datadir}/locale/fr/LC_MESSAGES/kdesudo.mo %Changelog +* Tue May 01 2012 Francois Andriot - 2.5.1-2 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Removes post and postun + * Wed Nov 02 2011 Francois Andriot - 2.5.1-1 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch new file mode 100644 index 000000000..850d5c7c0 --- /dev/null +++ b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch @@ -0,0 +1,11 @@ +--- kdesvn/src/kdesvnd/CMakeLists.txt.ORI 2012-05-01 23:53:03.503449741 +0200 ++++ kdesvn/src/kdesvnd/CMakeLists.txt 2012-05-01 23:53:09.754340075 +0200 +@@ -23,7 +23,7 @@ + + SET_TARGET_PROPERTIES(kded_kdesvnd + PROPERTIES +- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -module") ++ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS}") + + INSTALL(TARGETS kded_kdesvnd + RUNTIME DESTINATION ${BIN_INSTALL_DIR} diff --git a/redhat/applications/kdesvn/trinity-kdesvn.spec b/redhat/applications/kdesvn/trinity-kdesvn.spec index 20904fd46..7f03c6c33 100644 --- a/redhat/applications/kdesvn/trinity-kdesvn.spec +++ b/redhat/applications/kdesvn/trinity-kdesvn.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kdesvn %define version 1.0.4 -%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" @@ -33,6 +33,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# [kdesvn] Fix compilation with GCC 4.7 +Patch1: kdesvn-3.5.13-fix_gcc47_compilation.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -90,6 +93,7 @@ This package is part of tdesvn-trinity. %prep %setup -q -n applications/%{kdecomp} +%patch1 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -137,11 +141,15 @@ export PATH="%{_bindir}:${PATH}" %post touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -/sbin/ldconfig || : %postun touch --no-create %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%post -n trinity-libsvnqt +/sbin/ldconfig || : + +%postun -n trinity-libsvnqt /sbin/ldconfig || : @@ -192,5 +200,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Tue May 01 2012 Francois Andriot - 1.0.4-2 +- Rebuilt for Fedora 17 +- Fix post and postun +- Fix compilation with GCC 4.7 + * Thu Dec 01 2011 Francois Andriot - 1.0.4-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- cgit v1.2.3