diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 4b98b33f9..682142a65 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -39,6 +39,8 @@ BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel BuildRequires: libutempter-devel BuildRequires: bzip2-devel BuildRequires: openssl-devel +BuildRequires: libtiff-devel +BuildRequires: jasper-devel Requires: tqtinterface Requires: trinity-arts diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index adcafccb5..868754041 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -47,6 +47,9 @@ Provides: kdemultimedia3 = %{version}-%{release} Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch +Patch100: svn.patch + + Requires: %{name}-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -93,14 +96,7 @@ noatun plugins. %package extras Summary: Extra applications from %{name} Group: Applications/Multimedia -%if 0%{?libs} Requires: %{name}-extras-libs = %{version}-%{release} -%else -Obsoletes: %{name}-extras-libs < %{version}-%{release} -Provides: %{name}-extras-libs = %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -%endif %description extras %{summary}, including: * juk, a media player @@ -129,6 +125,8 @@ Requires: %{name} = %{version}-%{release} %patch3 -p1 -b .xdg %patch5 -p1 -b .pthread +%patch100 -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 \ @@ -141,14 +139,9 @@ sed -i admin/acinclude.m4.in \ %build unset QTDIR || : ; . /etc/profile.d/qt.sh - -# just to be paranoid -- Rex -unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export CXXFLAGS="${LDFLAGS} $(pkg-config --libs gsl)" - %configure \ --enable-new-ldflags \ --disable-dependency-tracking \ @@ -168,19 +161,19 @@ export CXXFLAGS="${LDFLAGS} $(pkg-config --libs gsl)" %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} \ - --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt + --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install +export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} - -%make_install -%make_install -C kaudiocreator +%__make install DESTDIR=%{buildroot} ## Remove/uninstall (conflicting) bits we don't want -rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass +%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass # only show in KDE, really? -- Rex (FIXME) for f in %{buildroot}%{appdir}/*.desktop ; do @@ -225,7 +218,7 @@ done %post -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -233,14 +226,13 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -%if 0%{?libs} %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -248,10 +240,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %post extras-libs -p /sbin/ldconfig %postun extras-libs -p /sbin/ldconfig -%endif %post extras -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -259,7 +250,7 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun extras -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -372,6 +363,16 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/* %{_datadir}/servicetypes/* +# Misc HTML docs +%doc %lang(en) %{tde_docdir}/HTML/en/artsbuilder +%doc %lang(en) %{tde_docdir}/HTML/en/kaudiocreator +%doc %lang(en) %{tde_docdir}/HTML/en/kioslave/audiocd.docbook +%doc %lang(en) %{tde_docdir}/HTML/en/kmid +%doc %lang(en) %{tde_docdir}/HTML/en/kmix +%doc %lang(en) %{tde_docdir}/HTML/en/krec +%doc %lang(en) %{tde_docdir}/HTML/en/kscd + + %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libnoatun*.* diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec new file mode 100644 index 000000000..ef533a8db --- /dev/null +++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec @@ -0,0 +1,162 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# 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}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Summary: K Desktop Environment - Toys and Amusements +Name: trinity-kdetoys +Group: Amusements/Graphics +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Source0: kdetoys-%{version}.tar.gz + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: desktop-file-utils +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: gettext + + +%description +Includes: +* amor: Amusing Misuse Of Resources put's comic figures above your windows +* eyesapplet: a kicker applet similar to XEyes +* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them +* kmoon: system tray applet showing the moon phase +* kodo: mouse movement meter +* kteatime: system tray applet that makes sure your tea doesn't get too strong +* ktux: Tux-in-a-Spaceship screen saver +* kweather: kicker applet that will display the current weather outside +* kworldwatch: application and kicker applet showing daylight area on the world + globe + +NOTE: kicker applets and screen savers require kdebase to be installed, +and user to be logged-in to KDE. + + +%prep +%setup -q -n kdetoys + +# 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 "/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 || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --includedir=%{_includedir}/kde \ + --disable-rpath \ + --enable-new-ldflags \ + --enable-closure \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf "%{buildroot}" +%__make install DESTDIR=%{buildroot} + +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applnk/System/ScreenSavers \ + --vendor="" \ + %{buildroot}%{_datadir}/applnk/System/ScreenSavers/*.desktop ||: + +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications/kde \ + --vendor="" \ + %{buildroot}%{_datadir}/applications/kde/*.desktop ||: + +# replace absolute symlink with relative +ln -nfs tips-en %{buildroot}%{_datadir}/apps/amor/tips + +## File lists +# locale's +%find_lang %{name} || touch %{name}.lang +# 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 ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +## Unpackaged files +# not sure the point of just one header file 'AmorIface.h', omit (for now). +%__rm -rf %{buildroot}%{_includedir} + + +%post +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + +%postun +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%{_bindir}/* +%{_libdir}/libkdeinit_*.* +%{tde_libdir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/applnk/System/ScreenSavers/*.desktop +%{_datadir}/apps/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/service*/*.desktop +%doc %lang(en) %{_docdir}/HTML/en/* + +%clean +%__rm -rf %{buildroot} + + +%changelog +* Fri Oct 28 2011 Francois Andriot - 3.5.13-0 +- Initial version for RHEL 6 and Fedora 15 +