From a8666cac95adf2d6155856d9a7abeab2afdc2602 Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 2 Nov 2011 20:52:44 +0100 Subject: [PATCH] Fedora/RHEL TDE 3.5.13: - Updates gwenview - Add kbookreader, kdbusnotification, kstreamripper --- .../gwenview/trinity-gwenview-3.5.13.spec | 6 +- .../trinity-kbookreader-3.5.13.spec | 128 ++++++++++++++++++ ...otification-3.5.13-ftbfs_qt_ldlflags.patch | 10 ++ .../trinity-kdbusnotification-3.5.13.spec | 126 +++++++++++++++++ ...eamripper-3.5.13-missing_include_tqt.patch | 10 ++ .../trinity-kstreamripper-3.5.13.spec | 118 ++++++++++++++++ redhat/components.txt | 6 +- 7 files changed, 400 insertions(+), 4 deletions(-) create mode 100644 redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec create mode 100644 redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch create mode 100644 redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec create mode 100644 redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch create mode 100644 redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec diff --git a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec index e709120d5..a1323c5c2 100644 --- a/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec +++ b/redhat/applications/gwenview/trinity-gwenview-3.5.13.spec @@ -9,11 +9,11 @@ %define _docdir %{_prefix}/share/doc %endif -# TDE 3.5.12 specific building variables +# TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} +%define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/kde3 +%define tde_libdir %{_libdir}/trinity Name: trinity-%{kdecomp} diff --git a/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec new file mode 100644 index 000000000..1157fc5ff --- /dev/null +++ b/redhat/applications/kbookreader/trinity-kbookreader-3.5.13.spec @@ -0,0 +1,128 @@ +# Default version for this component +%define kdecomp kbookreader +%define version 0.2.0 +%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.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: eBook reader for Trinity. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + + +%description +kbookreader is an application which allows you to view eBooks +within the Trinity Desktop Environment. + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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" + +%__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}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## 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 +/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,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applnk/*/*.desktop +%{_datadir}/apps/*/ +%{_datadir}/config.kcfg/* +%{_docdir}/HTML/en/*/ +%{_datadir}/icons/*/*/*/* + + + +%Changelog +* 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/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch new file mode 100644 index 000000000..06e1d455e --- /dev/null +++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch @@ -0,0 +1,10 @@ +--- kdbusnotification/src/daemon/Makefile.am.ORI 2011-11-01 22:59:28.000000000 +0100 ++++ kdbusnotification/src/daemon/Makefile.am 2011-11-01 22:59:45.000000000 +0100 +@@ -35,6 +35,7 @@ + $(KDE_RPATH) \ + $(KDE_LDFLAGS) \ + $(LIB_QT) \ ++ $(QT_LDFLAGS) \ + -lDCOP \ + $(LIB_KDECORE) \ + $(LIB_KDEUI) \ diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec new file mode 100644 index 000000000..27d2f55e5 --- /dev/null +++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec @@ -0,0 +1,126 @@ +# Default version for this component +%define kdecomp kdbusnotification +%define version 0.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.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: a DBUS notification service [Trinity] + +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +# [kdbusnotification/src/daemon] Missing QT LDFLAGS +Patch0: kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: dbus-glib-devel +BuildRequires: gtk2-devel + +%description +kdbusnotification is a small program for Trinity that displays +DBUS notifications via unobtrusive, easily dismissed passive popups. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -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" + +%__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}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## 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,-) +%{_bindir}/notification-daemon-tde +%{_datadir}/autostart/kdbusnotification-autostart.desktop + + + +%Changelog +* 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/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch new file mode 100644 index 000000000..5663b1a81 --- /dev/null +++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch @@ -0,0 +1,10 @@ +--- kstreamripper/src/addnewstreamimpl.h.ORI 2011-11-02 20:40:17.450317896 +0100 ++++ kstreamripper/src/addnewstreamimpl.h 2011-11-02 20:40:25.777317020 +0100 +@@ -22,6 +22,7 @@ + #define ADDNEWSTREAMIMPL_H + + #include "addnewstream.h" ++#include + + class AddNewStreamImpl : public AddNewStream + { diff --git a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec new file mode 100644 index 000000000..94855fdcf --- /dev/null +++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec @@ -0,0 +1,118 @@ +# Default version for this component +%define kdecomp kstreamripper +%define version 0.3.4 +%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.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: TDE frontend for streamripper + +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +Patch0: kstreamripper-3.5.13-missing_include_tqt.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: scons + + +%description +KStreamRipper is a small frontend for the streamripper command +line utility. Streamripper captures internet shoutcast radio streams +on your harddisk and splits them up in mp3 files. KStreamRipper helps +you with managing/ripping your preferred streams. + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +export CXXFLAGS="-I%{_includedir}/tqt" + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +## 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 +/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}/kstreamripper +%{_datadir}/applnk/Utilities/kstreamripper.desktop +%{_datadir}/apps/kstreamripper/kstreamripperui.rc +%{tde_docdir}/HTML/en/en/index.cache.bz2 + + + +%Changelog +* Wed Nov 02 2011 Francois Andriot - 0.3.4-1 +- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/components.txt b/redhat/components.txt index ee194d47e..47ea807b7 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -36,5 +36,9 @@ applications/filelight applications/kdiff3 #applications/kuickshow #applications/basket -#applications/katapult +applications/katapult #compizconfig-backend-kconfig +applications/kbookreader +applications/kdbusnotification +applications/kmymoney2 +applications/kstreamripper