diff --git a/default.pa b/default.pa index cce201c..a47e7e5 100644 --- a/default.pa +++ b/default.pa @@ -1,4 +1,4 @@ -#!/usr/bin/pulseaudio -nF +##!/usr/bin/pulseaudio -nF # # This file is part of polypaudio. diff --git a/pulseaudio-0.9.7.svn20071017.tar.gz b/pulseaudio-0.9.7.svn20071017.tar.gz deleted file mode 100644 index 4bb0d53..0000000 --- a/pulseaudio-0.9.7.svn20071017.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2902b00c433137882781130c30831cc6bbe2a2962644b6e7c912da7d52076ec -size 1276662 diff --git a/pulseaudio-0.9.7.tar.bz2 b/pulseaudio-0.9.7.tar.bz2 new file mode 100644 index 0000000..eca13d1 --- /dev/null +++ b/pulseaudio-0.9.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:858eeec3a64adebd111e4bafb65e8f0649a8d65bc6c587600468090acf13edc4 +size 922586 diff --git a/pulseaudio.changes b/pulseaudio.changes index c3fedd2..5c3e80d 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 9 20:19:57 CET 2008 - rodrigo@suse.de + +- Renamed libs packages to follow shared lib policy +- Added better descriptions for subpackages +- Use tar.bz2 instead of tar.gz +- Fixed unversioned self-provides and obsoletes +- Use update-desktop-files for .desktop file +- PreRequire pwdutils for groupadd/del +- Moved libpulsedsp.so to libpusecore4 to avoid rpmlint errors + ------------------------------------------------------------------- Tue Jan 8 17:48:35 CET 2008 - rodrigo@suse.de diff --git a/pulseaudio.spec b/pulseaudio.spec index 54b895f..6679470 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -14,17 +14,16 @@ Name: pulseaudio %define drvver 0.9 Summary: A Networked Sound Server Version: 0.9.7 -Release: 16 +Release: 17 License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons -#Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz -Source0: pulseaudio-0.9.7.svn20071017.tar.gz +Source: %{name}-%{version}.tar.bz2 Source1: default.pa Url: http://pulseaudio.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: alsa-devel avahi-devel doxygen glib2-devel hal-devel jack-devel libatomic-ops-devel liboil-devel libsamplerate-devel libsndfile-devel xorg-x11-devel -BuildRequires: doxygen gconf2-devel lirc-devel -Requires: %{name}-core-libs = %{version}-%{release} +BuildRequires: alsa-devel avahi-devel doxygen gconf2-devel glib2-devel hal-devel jack-devel libatomic-ops-devel liboil-devel libsamplerate-devel libsndfile-devel lirc-devel update-desktop-files xorg-x11-devel +Requires: libpulsecore4 = %{version} +PreReq: pwdutils Patch1: pulseaudio-0.9.6-nochown.patch Patch2: pulseaudio-0.9.7-eof-fix-r1964.patch Patch3: pulseaudio-0.9.5-esd-max-samplesize.diff @@ -43,15 +42,18 @@ Authors: Pierre Ossman %package esound-compat -Summary: A Networked Sound Server +Summary: ESOUND compatibility for PulseAudio Group: System/Sound Daemons -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description esound-compat pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). +This package provides the compatibility layer for drop-in replacement +of ESOUND. + Authors: @@ -60,9 +62,9 @@ Authors: Pierre Ossman %package module-lirc -Summary: A Networked Sound Server +Summary: LIRC module for PulseAudio Group: System/Sound Daemons -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description module-lirc pulseaudio is a networked sound server for Linux and other Unix like @@ -77,9 +79,9 @@ Authors: Pierre Ossman %package module-x11 -Summary: A Networked Sound Server +Summary: X11 module for PulseAudio Group: System/Sound Daemons -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description module-x11 pulseaudio is a networked sound server for Linux and other Unix like @@ -94,9 +96,9 @@ Authors: Pierre Ossman %package module-zeroconf -Summary: A Networked Sound Server +Summary: Zeroconf module for PulseAudio Group: System/Sound Daemons -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description module-zeroconf pulseaudio is a networked sound server for Linux and other Unix like @@ -111,9 +113,9 @@ Authors: Pierre Ossman %package module-gconf -Summary: A Networked Sound Server +Summary: GCONF module for PulseAudio Group: System/Sound Daemons -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %description module-gconf pulseaudio is a networked sound server for Linux and other Unix like @@ -127,14 +129,18 @@ Authors: Lennart Poettering Pierre Ossman -%package libs -Summary: System libraries for pulseaudio +%package -n libpulse0 +Summary: Client interface to PulseAudio License: GPL v2 or later; LGPL v2.1 or later Group: System/Libraries -Provides: pulseaudio-lib -Obsoletes: pulseaudio-lib +Provides: pulseaudio-libs = %{version}-%{release} +Obsoletes: pulseaudio-libs < %{version} + +%description -n libpulse0 +pulseaudio is a networked sound server for Linux and other Unix like +operating systems and Microsoft Windows. It is intended to be an +improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). -%description libs This package contains the system libraries for clients of pulseaudio sound server. @@ -145,12 +151,14 @@ Authors: Lennart Poettering Pierre Ossman -%package core-libs -Summary: A Networked Sound Server +%package -n libpulsecore4 +Summary: System libraries for PulseAudio License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons +Provides: pulseaudio-core-libs = %{version}-%{release} +Obsoletes: pulseaudio-core-libs < %{version} -%description core-libs +%description -n libpulsecore4 pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -162,14 +170,14 @@ Authors: Lennart Poettering Pierre Ossman -%package libs-glib2 -Summary: A Networked Sound Server +%package -n libpulse-mainloop-glib0 +Summary: GLIB 2.0 Main Loop wrapper for PulseAudio License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons -Provides: pulseaudio-lib-glib2 -Obsoletes: pulseaudio-lib-glib2 +Provides: pulseaudio-libs-glib2 = %{version}-%{release} +Obsoletes: pulseaudio-libs-glib2 < %{version} -%description libs-glib2 +%description -n libpulse-mainloop-glib0 pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -181,14 +189,14 @@ Authors: Lennart Poettering Pierre Ossman -%package libs-zeroconf -Summary: A Networked Sound Server +%package -n libpulse-browse0 +Summary: PulseAudio network browsing API License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons -Provides: pulseaudio-lib-zeroconf -Obsoletes: pulseaudio-lib-zeroconf +Provides: pulseaudio-libs-zeroconf = %{version}-%{release} +Obsoletes: pulseaudio-libs-zeroconf < %{version} -%description libs-zeroconf +%description -n libpulse-browse0 pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -200,18 +208,22 @@ Authors: Lennart Poettering Pierre Ossman -%package devel +%package -n libpulse-devel Summary: Development package for the pulseaudio library License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-libs-glib2 = %{version}-%{release} -Requires: %{name}-libs-zeroconf = %{version}-%{release} +Requires: libpulse0 = %{version} +Requires: libpulse-mainloop-glib0 = %{version} +Requires: libpulse-browse0 = %{version} Requires: pkgconfig glib2-devel -Provides: pulseaudio-devel -Obsoletes: pulseaudio-devel +Provides: pulseaudio-devel = %{version}-%{release} +Obsoletes: pulseaudio-devel < %{version} + +%description -n libpulse-devel +pulseaudio is a networked sound server for Linux and other Unix like +operating systems and Microsoft Windows. It is intended to be an +improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). -%description devel This package contains the files needed to compile programs that use the pulseaudio library. @@ -223,10 +235,13 @@ Authors: Pierre Ossman %package utils -Summary: A Networked Sound Server +Summary: PulseAudio utilities License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons -Requires: %{name}-libs = %{version}-%{release} +Requires: libpulse0 = %{version} +Requires: libpulsecore4 = %{version} +Requires: libpulse-browse0 = %{version} +Requires: libpulse-mainloop-glib0 = %{version} %description utils pulseaudio is a networked sound server for Linux and other Unix like @@ -249,11 +264,12 @@ Authors: %build %configure --disable-ltdl-install --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access -make LIBTOOL=/usr/bin/libtool +make %{?jobs:-j%jobs} make doxygen %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall +%suse_update_desktop_file pulseaudio-module-xsmp cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pulse/ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la # configure --disable-static had no effect; delete manually. @@ -272,21 +288,21 @@ useradd -r -c 'PulseAudio daemon' \ groupadd -r pulse-rt &>/dev/null || : groupadd -r pulse-access &>/dev/null || : -%post -p /sbin/ldconfig +%post -n libpulse0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libpulse0 -p /sbin/ldconfig -%post libs -p /sbin/ldconfig +%post -n libpulse-mainloop-glib0 -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%postun -n libpulse-mainloop-glib0 -p /sbin/ldconfig -%post libs-glib2 -p /sbin/ldconfig +%post -n libpulse-browse0 -p /sbin/ldconfig -%postun libs-glib2 -p /sbin/ldconfig +%postun -n libpulse-browse0 -p /sbin/ldconfig -%post libs-zeroconf -p /sbin/ldconfig +%post -n libpulsecore4 -p /sbin/ldconfig -%postun libs-zeroconf -p /sbin/ldconfig +%postun -n libpulsecore4 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -394,7 +410,7 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/pulse-%{drvver}/modules/module-gconf.so %{_libexecdir}/pulse/gconf-helper -%files libs +%files -n libpulse0 %defattr(-,root,root) %doc README LICENSE GPL LGPL %dir %{_sysconfdir}/pulse/ @@ -402,20 +418,21 @@ groupadd -r pulse-access &>/dev/null || : %{_libdir}/libpulse.so.* %{_libdir}/libpulse-simple.so.* -%files core-libs +%files -n libpulsecore4 %defattr(-,root,root) %{_libdir}/libpulsecore.so.* +%{_libdir}/libpulsedsp.so -%files libs-glib2 +%files -n libpulse-mainloop-glib0 %defattr(-,root,root) %{_libdir}/libpulse-mainloop-glib.so.* -%files libs-zeroconf +%files -n libpulse-browse0 %defattr(-,root,root) %{_bindir}/pabrowse %{_libdir}/libpulse-browse.so.* -%files devel +%files -n libpulse-devel %defattr(-,root,root) %doc doxygen/html %{_includedir}/pulse/ @@ -435,9 +452,16 @@ groupadd -r pulse-access &>/dev/null || : %{_bindir}/pax11publish %{_bindir}/padsp %{_bindir}/pasuspender -%{_libdir}/libpulsedsp.so %changelog +* Wed Jan 09 2008 - rodrigo@suse.de +- Renamed libs packages to follow shared lib policy +- Added better descriptions for subpackages +- Use tar.bz2 instead of tar.gz +- Fixed unversioned self-provides and obsoletes +- Use update-desktop-files for .desktop file +- PreRequire pwdutils for groupadd/del +- Moved libpulsedsp.so to libpusecore4 to avoid rpmlint errors * Tue Jan 08 2008 - rodrigo@suse.de - Don't remove users/groups on %%postun * Tue Jan 08 2008 - rodrigo@suse.de