diff --git a/.cvsignore b/.cvsignore index 0ad8e8d..4ade7f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pulseaudio-0.9.5.tar.gz +pulseaudio-0.9.6.tar.gz diff --git a/pulseaudio-0.9.2-nochown.patch b/pulseaudio-0.9.2-nochown.patch deleted file mode 100644 index 878f958..0000000 --- a/pulseaudio-0.9.2-nochown.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pulseaudio-0.9.2/src/Makefile.in.orig 2006-07-08 15:26:11.000000000 +0200 -+++ pulseaudio-0.9.2/src/Makefile.in 2006-07-08 23:23:40.000000000 +0200 -@@ -4488,7 +4488,7 @@ - - suid: pulse - chown root $< -- chmod u+s $< -+# chmod u+s $< - - esdcompat: daemon/esdcompat.in Makefile - sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -@@ -4509,7 +4509,7 @@ - - install-exec-hook: - chown root $(DESTDIR)$(bindir)/pulseaudio ; true -- chmod u+s $(DESTDIR)$(bindir)/pulseaudio -+# chmod u+s $(DESTDIR)$(bindir)/pulseaudio - ln -sf pacat $(DESTDIR)$(bindir)/parec - rm -f $(DESTDIR)$(modlibexecdir)/*.a - rm -f $(DESTDIR)$(libdir)/libpulsedsp.a diff --git a/pulseaudio-0.9.6-nochown.patch b/pulseaudio-0.9.6-nochown.patch new file mode 100644 index 0000000..0dd59f5 --- /dev/null +++ b/pulseaudio-0.9.6-nochown.patch @@ -0,0 +1,20 @@ +--- pulseaudio-0.9.6/src/Makefile.in.orig 2007-05-27 22:59:32.000000000 +0200 ++++ pulseaudio-0.9.6/src/Makefile.in 2007-05-29 11:30:19.000000000 +0200 +@@ -5028,7 +5028,7 @@ + + suid: pulseaudio .libs/lt-pulseaudio + chown root $^ +- chmod u+s $^ ++# chmod u+s $^ + + esdcompat: daemon/esdcompat.in Makefile + sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ +@@ -5052,7 +5052,7 @@ + + install-exec-hook: + chown root $(DESTDIR)$(bindir)/pulseaudio ; true +- chmod u+s $(DESTDIR)$(bindir)/pulseaudio ++# chmod u+s $(DESTDIR)$(bindir)/pulseaudio + ln -sf pacat $(DESTDIR)$(bindir)/parec + rm -f $(DESTDIR)$(modlibexecdir)/*.a + rm -f $(DESTDIR)$(libdir)/libpulsedsp.a diff --git a/pulseaudio.spec b/pulseaudio.spec index f10ce3b..84bd837 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -2,7 +2,7 @@ Name: pulseaudio Summary: Improved Linux sound server -Version: 0.9.5 +Version: 0.9.6 Release: 2%{?dist} License: GPL Group: System Environment/Daemons @@ -13,23 +13,29 @@ BuildRequires: tcp_wrappers, libsamplerate-devel, libsndfile-devel BuildRequires: liboil-devel, m4, libcap-devel, libtool-ltdl-devel, pkgconfig BuildRequires: alsa-lib-devel, glib2-devel, avahi-devel GConf2-devel BuildRequires: lirc-devel doxygen jack-audio-connection-kit-devel -BuildRequires: hal-devel +BuildRequires: hal-devel libatomic_ops-devel # Libtool is dragging in rpaths. Fedora's libtool should get rid of the # unneccessary ones. BuildRequires: libtool - -# FC 5 BuildRequires: libXt-devel, xorg-x11-proto-devel -# FC 4 -#BuildRequires: xorg-x11-devel -Patch1: pulseaudio-0.9.2-nochown.patch +Patch1: pulseaudio-0.9.6-nochown.patch %description PulseAudio is a sound server for Linux and other Unix like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). +%package esound-compat +Summary: PulseAudio EsounD daemon compatibility script +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} +Conflicts: esound + +%description esound-compat +A compatibility script that allows applications to call /usr/bin/esd +and start PulseAudio with EsounD protocol modules. + %package module-lirc Summary: LIRC support for the PulseAudio sound server Group: System Environment/Daemons @@ -146,6 +152,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a chmod 755 $RPM_BUILD_ROOT%{_bindir}/pulseaudio +ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd + %clean rm -rf $RPM_BUILD_ROOT @@ -183,7 +191,6 @@ fi %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa %attr(4755,root,root) %{_bindir}/pulseaudio -%{_bindir}/esdcompat %{_libdir}/libpulsecore.so.* %dir %{_libdir}/pulse-%{drvver}/ %dir %{_libdir}/pulse-%{drvver}/modules/ @@ -247,6 +254,11 @@ fi %{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so +%files esound-compat +%defattr(-,root,root) +%{_bindir}/esdcompat +%{_bindir}/esd + %files module-lirc %defattr(-,root,root) %{_libdir}/pulse-%{drvver}/modules/module-lirc.so @@ -317,6 +329,25 @@ fi %{_libdir}/libpulsedsp.so %changelog +* Tue May 29 2007 Pierre Ossman 0.9.6-2 +- Add libatomic_ops-devel as a build requirement. + +* Tue May 29 2007 Pierre Ossman 0.9.6-1 +- Upgrade to 0.9.6. + +* Sat Mar 2 2007 Pierre Ossman 0.9.5-5 +- Fix merge problems with patch. + +* Fri Mar 2 2007 Pierre Ossman 0.9.5-4 +- Add patch to handle ALSA changing the frame size (bug 230211). +- Add patch for suspended ALSA devices (bug 228205). + +* Mon Feb 5 2007 Pierre Ossman 0.9.5-3 +- Add esound-compat subpackage that allows PulseAudio to be a drop-in + replacement for esd (based on patch by Matthias Clasen). +- Backport patch allows startup to continue even when the users' + config cannot be read. + * Wed Oct 23 2006 Pierre Ossman 0.9.5-2 - Create user and groups for daemon. diff --git a/sources b/sources index 93bb3d2..bb91cd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99b5d9efd4fce35cabb4ae5d0ebb230d pulseaudio-0.9.5.tar.gz +669d52a70fb9a7a83c2507005bfa2a6f pulseaudio-0.9.6.tar.gz