rpms/kdemultimedia/F-7 .cvsignore, 1.38, 1.39 kdemultimedia.spec, 1.85, 1.86 sources, 1.40, 1.41
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Oct 25 10:10:01 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdemultimedia/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21356
Modified Files:
.cvsignore kdemultimedia.spec sources
Log Message:
sync w/devel, kde-3.5.8
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-7/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 13 Aug 2007 14:26:33 -0000 1.38
+++ .cvsignore 25 Oct 2007 10:09:28 -0000 1.39
@@ -1,3 +1,4 @@
kdemultimedia-3.5.7.tar.bz2
kdemultimedia-3.5.7-patched.tar.bz2
kdemultimedia-3.5.7-patched-2.tar.bz2
+kdemultimedia-3.5.8-patched.tar.bz2
Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-7/kdemultimedia.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdemultimedia.spec 13 Aug 2007 14:26:33 -0000 1.85
+++ kdemultimedia.spec 25 Oct 2007 10:09:28 -0000 1.86
@@ -17,17 +17,22 @@
%define _with_taglib --with-taglib
%define _with_xine --with-xine
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
+
Name: kdemultimedia
Summary: Multimedia applications for the K Desktop Environment (KDE)
Epoch: 6
-Version: 3.5.7
-Release: 2%{?dist}
+Version: 3.5.8
+Release: 4%{?dist}
-License: GPLv2+
+License: GPLv2
Group: Applications/Multimedia
Url: http://www.kde.org
-%define patch patched-2
+%define patch patched
%define nonfree_bits mpeglib mpeglib_artsplugin mpg123_artsplugin
## To generate -patched tarball,
# 1. tar xjf kdemultimedia-%{version}
@@ -47,6 +52,13 @@
# upstream patches
Patch100: kdemultimedia-3.5.3-noatun.patch
+%if 0%{?libs}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -71,7 +83,7 @@
%description
The K Desktop Environment (KDE) is a GUI desktop for the X Window
-System. The kdemultimedia package contains multimedia applications for
+System. The %{name} package contains multimedia applications for
KDE, including:
kmid, a midi player
kmix, an audio mixer
@@ -81,29 +93,53 @@
kaudiocreator, a graphical frontend for audio file creation
%package devel
-Summary: Development files for aRts plugins
+Summary: Development files for %{name}, aRts and noatun plugins
Group: Development/Libraries
Provides: kdemultimedia3-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
# for noatun shlib(s)
-Requires: %{name}-extras = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel
+Requires: %{name}-extras-libs = %{epoch}:%{version}-%{release}
+Requires: kdelibs3-devel
%description devel
-Development files for aRts and noatun plugins.
-Install kdemultimedia-devel if you wish to develop or compile any
+{summary}.
+Install %{name}-devel if you wish to develop or compile any
applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
noatun plugins.
%package extras
-Summary: Extras packages from kdemultimedia
+Summary: Extra applications from %{name}
Group: Applications/Multimedia
-Requires: %{name} = %{epoch}:%{version}-%{release}
+%if 0%{?libs}
+Requires: %{name}-extras-libs- = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
%description extras
-More multimedia applications for the K Desktop Environment:
+%{summary}, including:
* juk, a media player
* kaboodle, a media player
* noatun, a media player
+%if 0%{?libs}
+%package extras-libs
+Summary: Extra %{name} runtime libraries
+Group: System Environment/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%description extras-libs
+%{summary}.
+
+%package libs
+Summary: %{name} runtime libraries
+Group: System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+%endif
+
+
%prep
%setup -q -n %{name}-%{version}-%{patch}
@@ -154,7 +190,11 @@
%{?_with_taglib} %{!?_with_taglib:--without-taglib} \
%{?_with_xine} %{!?_with_xine:--without-xine}
-make %{?_smp_mflags}
+# FIXME: See http://bugzilla.redhat.com/330971
+make %{?_smp_mflags} -k || \
+ sed -i -e "s|-Wp,-D_FORTIFY_SOURCE=2||" noatun/modules/artseffects/Makefile && \
+ make %{?_smp_mflags}
+
make %{?_smp_mflags} -C kaudiocreator
@@ -225,6 +265,16 @@
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%post extras-libs -p /sbin/ldconfig
+
+%postun extras-libs -p /sbin/ldconfig
+%endif
+
%post extras
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
@@ -263,12 +313,8 @@
%{_libdir}/kconf_update_bin/noatun20update
%{_libdir}/kde3/noatun*
%{_libdir}/libartseffects.*
-%{_libdir}/libkdeinit_noatun.*
-%{_libdir}/libnoatunarts.*
-%{_libdir}/libnoatuncontrols.*
-%{_libdir}/libnoatun.*
-%{_libdir}/libnoatuntags.*
%{_libdir}/libwinskinvis.*
+%{_libdir}/libkdeinit_noatun.*
%{_datadir}/applications/kde/noatun.desktop
%{_datadir}/apps/kconf_update/noatun.upd
%{_datadir}/apps/noatun/
@@ -284,9 +330,18 @@
%{_datadir}/icons/crystalsvg/*/*/juk*
%{_datadir}/icons/hicolor/*/apps/juk.png
+%if 0%{?libs}
+%files extras-libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/libnoatuncontrols.so.*
+%{_libdir}/libnoatun.so.*
+%{_libdir}/libnoatuntags.so.*
+%{_libdir}/libnoatunarts.*
+
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc COPYING COPYING-DOCS
+%doc COPYING
# kaboodle
%exclude %{_docdir}/HTML/en/kaboodle/
@@ -326,9 +381,7 @@
/etc/xdg/menus/applications-merged/*
%{_libdir}/mcop/*
-%{_libdir}/*.la
%{_libdir}/libkdeinit_*.so
-%{_libdir}/lib*.so.*
%{_libdir}/liboggarts.so
%{_libdir}/kde3/*
%{_libdir}/kconf_update_bin/*
@@ -345,21 +398,45 @@
%{_datadir}/services/*
%{_datadir}/servicetypes/*
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%exclude %{_libdir}/libnoatun*.*
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/kde/*
-%{_libdir}/*.so
-%exclude %{_libdir}/libkdeinit_*
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*.so
%exclude %{_libdir}/libartseffects.so
-%exclude %{_libdir}/libnoatunarts.so
+%exclude %{_libdir}/libnoatunarts.*
%exclude %{_libdir}/liboggarts.so
%exclude %{_libdir}/libwinskinvis.so
%changelog
+* Tue Oct 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-4
+- omit libs from main pkg (-> -libs)
+- -libs conditional (f8+)
+
+* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3
+- -extras-libs: +%%_libdir/libnoatunarts.*
+- -libs,-extras-libs: %%post/%%postun -p /sbin/ldconfig
+
+* Sun Oct 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-2
+- -extras-libs: +%%defattr
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-1
+- kde-3.5.8
+- -libs, -extras-libs subpkg (more multilib friendly)
+
* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
-- (re)include kfile_mp3, kfile_mpeg, which includes metadata support only
- (not nonfree decoders).
+- (re)include kfile_mp3, kfile_mpeg, providing (konq) meta-info support
+ (not nonfree decoders)
- License: GPLv2+
- Provides: kdemultimedia3(-devel) ...
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-7/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 13 Aug 2007 14:26:33 -0000 1.40
+++ sources 25 Oct 2007 10:09:28 -0000 1.41
@@ -1 +1 @@
-087610cce1f0b3f5ea9fbdb3b8120377 kdemultimedia-3.5.7-patched-2.tar.bz2
+09451109c854e34ba237d8d267f7bbd2 kdemultimedia-3.5.8-patched.tar.bz2
More information about the fedora-extras-commits
mailing list