From 26fc278c18dac39af1708b603d0dbf46e16da622 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:19:29 +0200 Subject: kdelibs, kdemultimedia, kdetoys 3.5.13 RPM --- .../trinity-kdemultimedia-3.5.13.spec | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'redhat/kdemultimedia') 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*.* -- cgit v1.2.1 From 703986bfe4270bb901f594b92eebb265d04ad8f5 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 23:32:41 +0200 Subject: Lot of updates for TDE 3.5.13 (RHEL 5, RHEL 6, Fedora 15) --- redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec | 9 +++++++-- redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec | 12 +++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'redhat/kdemultimedia') diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec index e4f1f310c..82e4df87f 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec @@ -43,6 +43,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdemultimedia-%{version}.tar.gz +Provides: kdemultimedia3 = %{version}-%{release} + # RedHat Legacy patches (from Fedora 8) Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch @@ -159,7 +161,8 @@ export CXXFLAGS="${CXXFLAGS} -lDCOP" %{?_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} @@ -172,7 +175,7 @@ export PATH="%{_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C kaudiocreator ## 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 @@ -217,6 +220,7 @@ done %post +/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 ||: @@ -224,6 +228,7 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun +/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 ||: diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 868754041..0eda9a831 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -38,8 +38,10 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: kdemultimedia-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: kdemultimedia3 = %{version}-%{release} @@ -47,8 +49,8 @@ Provides: kdemultimedia3 = %{version}-%{release} Patch3: kdemultimedia-3.4.0-xdg.patch Patch5: kdemultimedia-3.5.7-pthread.patch -Patch100: svn.patch +Provides: kdemultimedia3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} @@ -67,6 +69,8 @@ BuildRequires: automake libtool %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel} %{?_with_taglib:BuildRequires: taglib-devel} %{?_with_xine:BuildRequires: xine-lib-devel} +BuildRequires: libXxf86dga-devel +BuildRequires: libXxf86vm-devel %description The K Desktop Environment (KDE) is a GUI desktop for the X Window @@ -125,8 +129,6 @@ 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 \ @@ -169,7 +171,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %install export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} +%__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} ## Remove/uninstall (conflicting) bits we don't want -- cgit v1.2.1 From 0061571b57d37f17c074ba869a674fb774fb49b4 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 18:36:20 +0100 Subject: TDE 3.5.13 stable release for RHEL/Fedora --- redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'redhat/kdemultimedia') diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 0eda9a831..8d19e5159 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 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" @@ -394,6 +394,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sat Sep 09 2011 Francois Andriot - 3.5.13-0 -- Initial build for RHEL 6 +- Import to GIT - Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2" -- cgit v1.2.1 From 8ad5f8901297e11bd05eb48488b6315aae50de0b Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 21:55:14 +0100 Subject: Fix TDE 3.5.13 package dependencies --- redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'redhat/kdemultimedia') diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 8d19e5159..a57642152 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -54,8 +54,10 @@ Provides: kdemultimedia3 = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -BuildRequires: zlib-devel +BuildRequires: trinity-arts-devel BuildRequires: trinity-kdelibs-devel + +BuildRequires: zlib-devel BuildRequires: libvorbis-devel BuildRequires: audiofile-devel BuildRequires: desktop-file-utils @@ -350,6 +352,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_libdir}/mcop/* %{_libdir}/libkdeinit_*.so #%{_libdir}/liboggarts.so +%{_libdir}/libmpeg-0.3.0.so +%{_libdir}/libyafcore.so +%{_libdir}/libyafxplayer.so %{tde_libdir}/* %{_libdir}/kconf_update_bin/* %{_bindir}/* @@ -391,7 +396,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libnoatunarts.* #exclude %{_libdir}/liboggarts.so %exclude %{_libdir}/libwinskinvis.so - +%exclude %{_libdir}/libmpeg-0.3.0.so +%exclude %{_libdir}/libyafcore.so +%exclude %{_libdir}/libyafxplayer.so %changelog * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 -- cgit v1.2.1