rpms/kdemultimedia/F-8 kdemultimedia.spec,1.89,1.90
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Oct 25 17:12:06 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdemultimedia/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28263
Modified Files:
kdemultimedia.spec
Log Message:
* Thu Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5
- -extras-libs: (re)include libnoatun*.la
Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-8/kdemultimedia.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kdemultimedia.spec 16 Oct 2007 18:35:07 -0000 1.89
+++ kdemultimedia.spec 25 Oct 2007 17:11:31 -0000 1.90
@@ -17,11 +17,16 @@
%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.8
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Multimedia
@@ -47,7 +52,13 @@
# upstream patches
Patch100: kdemultimedia-3.5.3-noatun.patch
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%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
@@ -98,13 +109,19 @@
%package extras
Summary: Extra applications from %{name}
Group: Applications/Multimedia
-Requires: %{name}-extras-libs = %{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
%{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
@@ -120,6 +137,7 @@
#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs
%{summary}.
+%endif
%prep
@@ -247,10 +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 ||:
@@ -265,10 +289,6 @@
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-%post extras-libs -p /sbin/ldconfig
-
-%postun extras-libs -p /sbin/ldconfig
-
%clean
rm -rf %{buildroot}
@@ -310,12 +330,13 @@
%{_datadir}/icons/crystalsvg/*/*/juk*
%{_datadir}/icons/hicolor/*/apps/juk.png
+%if 0%{?libs}
%files extras-libs
%defattr(-,root,root,-)
-%{_libdir}/libnoatuncontrols.so.*
-%{_libdir}/libnoatun.so.*
-%{_libdir}/libnoatuntags.so.*
-%{_libdir}/libnoatunarts.*
+%endif
+%{_libdir}/libnoatun*.la
+%{_libdir}/libnoatun*.so.*
+%{_libdir}/libnoatunarts.so
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -376,6 +397,15 @@
%{_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/*
@@ -386,16 +416,14 @@
%exclude %{_libdir}/liboggarts.so
%exclude %{_libdir}/libwinskinvis.so
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-%exclude %{_libdir}/libnoatun*.*
-
%changelog
+* Thu Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-5
+- -extras-libs: (re)include libnoatun*.la
+
* 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.*
More information about the fedora-extras-commits
mailing list