From 2e154bd106bef693530a4c534afc235b337627ffcd85ca0c31f15cd3a7b5b227 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 1 Oct 2011 17:29:02 +0000 Subject: [PATCH 1/2] Accepting request 85808 from home:TheBlackCat:branches:multimedia:libs - Made descriptions consistent - Added %suse_update_desktop_file for pulseaudio-kde (fix for RPMLINT warning) - Added check for duplicate files (fix for RPMLINT warning) - Cleaned up spec file formatting with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/85808 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=76 --- pulseaudio.changes | 9 ++ pulseaudio.spec | 292 +++++++++++++++++++++++---------------------- 2 files changed, 160 insertions(+), 141 deletions(-) diff --git a/pulseaudio.changes b/pulseaudio.changes index 7feea34..28811d2 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 30 11:09:58 UTC 2011 - toddrme2178@gmail.com + +- Made descriptions consistent +- Added %suse_update_desktop_file for pulseaudio-kde + (fix for RPMLINT warning) +- Added check for duplicate files (fix for RPMLINT warning) +- Cleaned up spec file formatting with spec-cleaner + ------------------------------------------------------------------- Tue Sep 27 23:56:50 CEST 2011 - dimstar@opensuse.org diff --git a/pulseaudio.spec b/pulseaudio.spec index d5d05eb..6b551c5 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -15,31 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%define drvver 1.0 Name: pulseaudio -Summary: A Networked Sound Server Version: 1.0 +%define drvver 1.0 Release: 1 License: GPLv2+ ; LGPLv2.1+ +Summary: A Networked Sound Server +Url: http://pulseaudio.org Group: System/Sound Daemons -Source: http://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz +Source: http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz Source1: default.pa-for-gdm Source2: setup-pulseaudio Source3: sysconfig.sound-pulseaudio Source99: baselibs.conf Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff -Url: http://pulseaudio.org -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel BuildRequires: bluez-devel BuildRequires: doxygen -BuildRequires: gconf2-devel -BuildRequires: glib2-devel -BuildRequires: gtk2-devel +BuildRequires: fdupes +BuildRequires: gdbm-devel BuildRequires: intltool BuildRequires: jack-devel BuildRequires: libatomic-ops-devel @@ -47,12 +43,11 @@ BuildRequires: libavahi-devel BuildRequires: libopenssl-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel -BuildRequires: libtool #our libtdb-devel does not have a .pc file BuildRequires: libtdb-devel -BuildRequires: gdbm-devel -BuildRequires: lirc-devel +BuildRequires: libtool BuildRequires: libudev-devel >= 143 +BuildRequires: lirc-devel BuildRequires: speex-devel BuildRequires: tcpd-devel BuildRequires: translation-update-upstream @@ -60,16 +55,22 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(json) >= 0.9 PreReq: %fillup_prereq PreReq: pwdutils -Recommends: alsa-plugins-pulse -Recommends: %{name}-lang -Requires: udev >= 146 Requires: rtkit +Requires: udev >= 146 +Recommends: %{name}-lang +Recommends: alsa-plugins-pulse +Obsoletes: libpulsecore9 < 0.9.15 +Provides: libpulsecore9 = 0.9.15 +Obsoletes: libpulsecore7 < 0.9.13 +Provides: libpulsecore7 = 0.9.13 +BuildRoot: %{_tmppath}/%{name}-%{version}-build Conflicts: kernel < 2.6.31 -Obsoletes: libpulsecore9 <= 0.9.14 -Obsoletes: libpulsecore7 <= 0.9.12 %description pulseaudio is a networked sound server for Linux, other Unix like @@ -77,12 +78,11 @@ operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). %package esound-compat -License: GPLv2+ ; LGPLv2.1+ Summary: ESOUND compatibility for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} Provides: esound-daemon = 0.2.41 -Obsoletes: esound-daemon <= 0.2.38 +Obsoletes: esound-daemon < 0.2.41 %description esound-compat pulseaudio is a networked sound server for Linux and other Unix like @@ -93,7 +93,6 @@ This package provides the compatibility layer for drop-in replacement of ESOUND. %package module-lirc -License: GPLv2+ ; LGPLv2.1+ Summary: LIRC module for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} @@ -103,8 +102,9 @@ 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 support for IR and RF remotes. + %package module-x11 -License: GPLv2+ ; LGPLv2.1+ Summary: X11 module for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} @@ -115,8 +115,10 @@ 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 components needed to automatically start +the PulseAudio sound server on X11 startup. + %package module-zeroconf -License: GPLv2+ ; LGPLv2.1+ Summary: Zeroconf module for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} @@ -126,8 +128,9 @@ 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 zeroconf network support for the PulseAudio sound server + %package module-jack -License: GPLv2+ ; LGPLv2.1+ Summary: JACK support for the PulseAudio sound server Group: System/Sound Daemons Requires: %{name} = %{version} @@ -140,17 +143,19 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). This package includes support for Jack-based applications. %package module-bluetooth -License: GPLv2+ ; LGPLv2.1+ Summary: Bluetooth support for the PulseAudio sound server Group: System/Sound Daemons Requires: %{name} = %{version} Requires: bluez >= 4.34 %description module-bluetooth +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). + Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server. %package module-gconf -License: GPLv2+ ; LGPLv2.1+ Summary: GCONF module for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} @@ -160,11 +165,12 @@ 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 gconf storage of PulseAudio sound server settings. + %package -n libpulse0 Summary: Client interface to PulseAudio -License: GPLv2+ ; LGPLv2.1+ Group: System/Libraries -Provides: pulseaudio-libs = %{version}-%{release} +Provides: pulseaudio-libs = %{version} Obsoletes: pulseaudio-libs < %{version} %description -n libpulse0 @@ -176,10 +182,9 @@ This package contains the system libraries for clients of pulseaudio sound server. %package -n libpulse-mainloop-glib0 -Summary: GLIB 2.0 Main Loop wrapper for PulseAudio -License: GPLv2+ ; LGPLv2.1+ +Summary: GLIB 2.0 Main Loop wrapper for PulseAudio Group: System/Sound Daemons -Provides: pulseaudio-libs-glib2 = %{version}-%{release} +Provides: pulseaudio-libs-glib2 = %{version} Obsoletes: pulseaudio-libs-glib2 < %{version} %description -n libpulse-mainloop-glib0 @@ -187,14 +192,17 @@ 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 contains the GLIB Main Loop bindings for the PulseAudio +sound server. + %package -n libpulse-devel Summary: Development package for the pulseaudio library -License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/C and C++ -Requires: libpulse0 = %{version} Requires: libpulse-mainloop-glib0 = %{version} -Requires: pkgconfig glib2-devel -Provides: pulseaudio-devel = %{version}-%{release} +Requires: libpulse0 = %{version} +Requires: pkgconfig +Requires: pkgconfig(glib-2.0) +Provides: pulseaudio-devel = %{version} Obsoletes: pulseaudio-devel < %{version} %description -n libpulse-devel @@ -207,20 +215,21 @@ pulseaudio library. %package utils Summary: PulseAudio utilities -License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons Requires: %{name} = %{version} -Requires: libpulse0 = %{version} Requires: libpulse-mainloop-glib0 = %{version} +Requires: libpulse0 = %{version} %description utils 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 utilies for making use of the PulseAudio sound +server. + %package gdm-hooks Summary: PulseAudio GDM integration -License: GPLv2+ ; LGPLv2.1+ Group: Productivity/Multimedia/Other Requires: %{name} = %{version} Requires: gdm >= 2.22 @@ -230,6 +239,10 @@ Requires(pre): gdm #!BuildIgnore: gdm %description gdm-hooks +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 contains GDM integration hooks for the PulseAudio sound server. %lang_package @@ -241,7 +254,7 @@ translation-update-upstream %build autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" # libpulse and libpulsecommon need each other - no way with as-needed export SUSE_ASNEEDED=0 %configure \ @@ -251,29 +264,32 @@ export SUSE_ASNEEDED=0 --with-system-group=pulse \ --with-access-group=pulse-access \ --disable-hal -make %{?jobs:-j%jobs} +make %{?_smp_mflags} make doxygen %install -%makeinstall -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la +%make_install +rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/pulse-%{drvver}/modules/*.la # configure --disable-static had no effect; delete manually. -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a +rm -rf %{buildroot}%{_libdir}/*.a +# openSUSE 11.3 cannot find the .desktop files %suse_update_desktop_file pulseaudio +%suse_update_desktop_file pulseaudio-kde %find_lang %{name} -install %SOURCE2 $RPM_BUILD_ROOT%{_bindir} -chmod 755 $RPM_BUILD_ROOT%{_bindir}/setup-pulseaudio -install -d $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates -install -m 0644 %SOURCE3 %{buildroot}%{_localstatedir}/adm/fillup-templates -mkdir -p $RPM_BUILD_ROOT/etc/profile.d -touch $RPM_BUILD_ROOT/etc/profile.d/pulseaudio.sh -touch $RPM_BUILD_ROOT/etc/profile.d/pulseaudio.csh -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse -cp $RPM_SOURCE_DIR/default.pa-for-gdm $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa -ln -s esdcompat $RPM_BUILD_ROOT%{_bindir}/esd +install %{SOURCE2} %{buildroot}%{_bindir} +chmod 755 %{buildroot}%{_bindir}/setup-pulseaudio +install -d %{buildroot}%{_localstatedir}/adm/fillup-templates +install -m 0644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.sh +touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.csh +mkdir -p %{buildroot}%{_localstatedir}/lib/gdm/.pulse +cp $RPM_SOURCE_DIR/default.pa-for-gdm %{buildroot}%{_localstatedir}/lib/gdm/.pulse/default.pa +ln -s esdcompat %{buildroot}%{_bindir}/esd +%fdupes -s doxygen/html %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %pre groupadd -r pulse &>/dev/null || : @@ -281,12 +297,10 @@ useradd -r -c 'PulseAudio daemon' \ -s /sbin/nologin -d /var/lib/pulseaudio -g pulse -G audio pulse &>/dev/null || : groupadd -r pulse-access &>/dev/null || : -%post -n libpulse0 -p /sbin/ldconfig - +%post -n libpulse0 -p /sbin/ldconfig %postun -n libpulse0 -p /sbin/ldconfig -%post -n libpulse-mainloop-glib0 -p /sbin/ldconfig - +%post -n libpulse-mainloop-glib0 -p /sbin/ldconfig %postun -n libpulse-mainloop-glib0 -p /sbin/ldconfig %post @@ -300,21 +314,15 @@ setup-pulseaudio --auto > /dev/null %files %defattr(-,root,root) %doc README LICENSE GPL LGPL -%dir %{_sysconfdir}/pulse/ -%config(noreplace) %{_sysconfdir}/pulse/daemon.conf -%config(noreplace) %{_sysconfdir}/pulse/default.pa -%config(noreplace) %{_sysconfdir}/pulse/system.pa -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf %{_bindir}/pulseaudio %{_bindir}/setup-pulseaudio -# created by setup-pulseaudio script -%ghost /etc/profile.d/pulseaudio.sh -%ghost /etc/profile.d/pulseaudio.csh +%dir %{_datadir}/pulseaudio +%{_datadir}/pulseaudio/alsa-mixer %{_localstatedir}/adm/fillup-templates/sysconfig.sound-pulseaudio -%dir %{_libdir}/pulse-%{drvver}/ -%dir %{_libdir}/pulse-%{drvver}/modules/ %{_libdir}/libpulsecore-%{drvver}.so %{_libdir}/libpulsedsp.so +%dir %{_libdir}/pulse-%{drvver}/ +%dir %{_libdir}/pulse-%{drvver}/modules/ %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so %{_libdir}/pulse-%{drvver}/modules/libcli.so %{_libdir}/pulse-%{drvver}/modules/liboss-util.so @@ -324,21 +332,25 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/libprotocol-native.so %{_libdir}/pulse-%{drvver}/modules/libprotocol-simple.so %{_libdir}/pulse-%{drvver}/modules/librtp.so +%{_libdir}/pulse-%{drvver}/modules/module-alsa-card.so %{_libdir}/pulse-%{drvver}/modules/module-alsa-sink.so %{_libdir}/pulse-%{drvver}/modules/module-alsa-source.so -%{_libdir}/pulse-%{drvver}/modules/module-alsa-card.so %{_libdir}/pulse-%{drvver}/modules/module-always-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-augment-properties.so +%{_libdir}/pulse-%{drvver}/modules/module-card-restore.so +%{_libdir}/pulse-%{drvver}/modules/module-cli.so %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-cli-protocol-unix.so -%{_libdir}/pulse-%{drvver}/modules/module-cli.so %{_libdir}/pulse-%{drvver}/modules/module-combine.so %{_libdir}/pulse-%{drvver}/modules/module-combine-sink.so -%{_libdir}/pulse-%{drvver}/modules/module-dbus-protocol.so -%{_libdir}/pulse-%{drvver}/modules/module-device-manager.so -%{_libdir}/pulse-%{drvver}/modules/module-loopback.so %{_libdir}/pulse-%{drvver}/modules/module-console-kit.so +%{_libdir}/pulse-%{drvver}/modules/module-cork-music-on-phone.so +%{_libdir}/pulse-%{drvver}/modules/module-dbus-protocol.so +%{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so %{_libdir}/pulse-%{drvver}/modules/module-detect.so +%{_libdir}/pulse-%{drvver}/modules/module-device-manager.so %{_libdir}/pulse-%{drvver}/modules/module-device-restore.so +%{_libdir}/pulse-%{drvver}/modules/module-echo-cancel.so %{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnfd.so %{_libdir}/pulse-%{drvver}/modules/module-esound-compat-spawnpid.so %{_libdir}/pulse-%{drvver}/modules/module-esound-protocol-tcp.so @@ -349,6 +361,9 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-hal-detect.so %{_libdir}/pulse-%{drvver}/modules/module-http-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-http-protocol-unix.so +%{_libdir}/pulse-%{drvver}/modules/module-intended-roles.so +%{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-loopback.so %{_libdir}/pulse-%{drvver}/modules/module-match.so %{_libdir}/pulse-%{drvver}/modules/module-mmkbd-evdev.so %{_libdir}/pulse-%{drvver}/modules/module-native-protocol-fd.so @@ -360,42 +375,37 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-pipe-sink.so %{_libdir}/pulse-%{drvver}/modules/module-pipe-source.so %{_libdir}/pulse-%{drvver}/modules/module-position-event-sounds.so +%{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so %{_libdir}/pulse-%{drvver}/modules/module-rescue-streams.so %{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so %{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so +%{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-tcp.so %{_libdir}/pulse-%{drvver}/modules/module-simple-protocol-unix.so -%{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so -%{_libdir}/pulse-%{drvver}/modules/module-switch-on-connect.so -%{_libdir}/pulse-%{drvver}/modules/module-card-restore.so %{_libdir}/pulse-%{drvver}/modules/module-sine.so +%{_libdir}/pulse-%{drvver}/modules/module-sine-source.so +%{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so +%{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so +%{_libdir}/pulse-%{drvver}/modules/module-switch-on-connect.so %{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so %{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so -%{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so -%{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so -%{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so -%{_libdir}/pulse-%{drvver}/modules/module-ladspa-sink.so -%{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so -%{_libdir}/pulse-%{drvver}/modules/module-augment-properties.so -%{_libdir}/pulse-%{drvver}/modules/module-cork-music-on-phone.so -%{_libdir}/pulse-%{drvver}/modules/module-sine-source.so -%{_libdir}/pulse-%{drvver}/modules/module-intended-roles.so -%{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so %{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so -%{_libdir}/pulse-%{drvver}/modules/module-echo-cancel.so %{_libdir}/pulse-%{drvver}/modules/module-virtual-sink.so %{_libdir}/pulse-%{drvver}/modules/module-virtual-source.so -%dir %{_datadir}/pulseaudio -%dir %{_datadir}/pulseaudio/alsa-mixer -%dir %{_datadir}/pulseaudio/alsa-mixer/paths -%dir %{_datadir}/pulseaudio/alsa-mixer/profile-sets -%{_datadir}/pulseaudio/alsa-mixer/paths/* -%{_datadir}/pulseaudio/alsa-mixer/profile-sets/* +%{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so +/lib/udev/rules.d/90-pulseaudio.rules %{_mandir}/man1/pulseaudio.1.gz %{_mandir}/man5/default.pa.5.gz %{_mandir}/man5/pulse-client.conf.5.gz %{_mandir}/man5/pulse-daemon.conf.5.gz -/lib/udev/rules.d/90-pulseaudio.rules +%dir %{_sysconfdir}/pulse/ +%config(noreplace) %{_sysconfdir}/pulse/daemon.conf +%config(noreplace) %{_sysconfdir}/pulse/default.pa +%config(noreplace) %{_sysconfdir}/pulse/system.pa +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf +# created by setup-pulseaudio script +%ghost %{_sysconfdir}/profile.d/pulseaudio.sh +%ghost %{_sysconfdir}/profile.d/pulseaudio.csh %files esound-compat %defattr(-,root,root) @@ -403,37 +413,34 @@ setup-pulseaudio --auto > /dev/null %{_bindir}/esd %{_mandir}/man1/esdcompat.1.gz -%files module-lirc +%files gdm-hooks %defattr(-,root,root) -%{_libdir}/pulse-%{drvver}/modules/module-lirc.so +%attr(0750, gdm, gdm) %dir %{_localstatedir}/lib/gdm +%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse +%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa -%files module-x11 +%files -n libpulse0 %defattr(-,root,root) -%{_sysconfdir}/xdg/autostart/pulseaudio.desktop -%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop -%{_bindir}/start-pulseaudio-x11 -%{_bindir}/start-pulseaudio-kde -%{_libdir}/pulse-%{drvver}/modules/module-x11-bell.so -%{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so -%{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so -%{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so -%{_mandir}/man1/start-pulseaudio-kde.1.gz -%{_mandir}/man1/start-pulseaudio-x11.1.gz +%doc README LICENSE GPL LGPL +%dir %{_sysconfdir}/pulse/ +%config(noreplace) %{_sysconfdir}/pulse/client.conf +%{_libdir}/libpulse.so.* +%{_libdir}/libpulsecommon-%{drvver}.so +%{_libdir}/libpulse-simple.so.* -%files module-zeroconf +%files -n libpulse-devel %defattr(-,root,root) -%{_libdir}/pulse-%{drvver}/modules/libavahi-wrap.so -%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-publish.so -%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-discover.so -%{_libdir}/pulse-%{drvver}/modules/libraop.so -%{_libdir}/pulse-%{drvver}/modules/module-raop-discover.so -%{_libdir}/pulse-%{drvver}/modules/module-raop-sink.so +%doc doxygen/html +%{_includedir}/pulse/ +%{_libdir}/libpulse.so +%{_libdir}/libpulse-mainloop-glib.so +%{_libdir}/libpulse-simple.so +%{_libdir}/pkgconfig/libpulse*.pc +%{_datadir}/vala -%files module-jack +%files -n libpulse-mainloop-glib0 %defattr(-,root,root) -%{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so -%{_libdir}/pulse-%{drvver}/modules/module-jack-source.so -%{_libdir}/pulse-%{drvver}/modules/module-jackdbus-detect.so +%{_libdir}/libpulse-mainloop-glib.so.* %files module-bluetooth %defattr(-,root,root) @@ -451,28 +458,37 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/pulse-%{drvver}/modules/module-gconf.so %{_libexecdir}/pulse/gconf-helper -%files -n libpulse0 +%files module-lirc %defattr(-,root,root) -%doc README LICENSE GPL LGPL -%dir %{_sysconfdir}/pulse/ -%config(noreplace) %{_sysconfdir}/pulse/client.conf -%{_libdir}/libpulse.so.* -%{_libdir}/libpulsecommon-%{drvver}.so -%{_libdir}/libpulse-simple.so.* +%{_libdir}/pulse-%{drvver}/modules/module-lirc.so -%files -n libpulse-mainloop-glib0 +%files module-jack %defattr(-,root,root) -%{_libdir}/libpulse-mainloop-glib.so.* +%{_libdir}/pulse-%{drvver}/modules/module-jack-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-jack-source.so +%{_libdir}/pulse-%{drvver}/modules/module-jackdbus-detect.so -%files -n libpulse-devel +%files module-x11 %defattr(-,root,root) -%doc doxygen/html -%{_includedir}/pulse/ -%{_libdir}/libpulse.so -%{_libdir}/libpulse-mainloop-glib.so -%{_libdir}/libpulse-simple.so -%{_libdir}/pkgconfig/libpulse*.pc -%{_datadir}/vala +%{_sysconfdir}/xdg/autostart/pulseaudio.desktop +%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop +%{_bindir}/start-pulseaudio-x11 +%{_bindir}/start-pulseaudio-kde +%{_libdir}/pulse-%{drvver}/modules/module-x11-bell.so +%{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so +%{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so +%{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so +%{_mandir}/man1/start-pulseaudio-kde.1.gz +%{_mandir}/man1/start-pulseaudio-x11.1.gz + +%files module-zeroconf +%defattr(-,root,root) +%{_libdir}/pulse-%{drvver}/modules/libavahi-wrap.so +%{_libdir}/pulse-%{drvver}/modules/libraop.so +%{_libdir}/pulse-%{drvver}/modules/module-raop-discover.so +%{_libdir}/pulse-%{drvver}/modules/module-raop-sink.so +%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-discover.so +%{_libdir}/pulse-%{drvver}/modules/module-zeroconf-publish.so %files utils %defattr(-,root,root) @@ -494,12 +510,6 @@ setup-pulseaudio --auto > /dev/null %{_mandir}/man1/padsp.1.gz %{_mandir}/man1/pax11publish.1.gz -%files gdm-hooks -%defattr(-,root,root) -%attr(0750, gdm, gdm) %dir %{_localstatedir}/lib/gdm -%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse -%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa - %files lang -f %{name}.lang %changelog From 769738bc8aa894f775e84ae881071c923b20e2ea708d5a2779466e01b4daeb6d Mon Sep 17 00:00:00 2001 From: Will Stephenson Date: Fri, 21 Oct 2011 08:30:45 +0000 Subject: [PATCH 2/2] Accepting request 88931 from home:wstephenson:branches:multimedia:libs - Update to version 1.1: + Reintroduce a 3 point version string in various API calls, fixing PulseAudio with Skype. + Fix some linking errors that accidentally linked libpulse to libpulsecore which could under some circumstance "downgrade" libpulse to GPL (rather than LGPL) which could in turn cause problems with non-GPL compatible apps which link to libpulse. + Fix a problem where starting PA without X11 would fail due to dbus problems. OBS-URL: https://build.opensuse.org/request/show/88931 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=77 --- pulseaudio-1.0.tar.xz | 3 --- pulseaudio-1.1.tar.xz | 3 +++ pulseaudio.changes | 13 +++++++++++++ pulseaudio.spec | 10 ++++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) delete mode 100644 pulseaudio-1.0.tar.xz create mode 100644 pulseaudio-1.1.tar.xz diff --git a/pulseaudio-1.0.tar.xz b/pulseaudio-1.0.tar.xz deleted file mode 100644 index 0c45440..0000000 --- a/pulseaudio-1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be -size 1305008 diff --git a/pulseaudio-1.1.tar.xz b/pulseaudio-1.1.tar.xz new file mode 100644 index 0000000..eb73153 --- /dev/null +++ b/pulseaudio-1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee +size 1306168 diff --git a/pulseaudio.changes b/pulseaudio.changes index 28811d2..1be1efd 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Oct 21 08:17:27 UTC 2011 - wstephenson@suse.com + +- Update to version 1.1: + + Reintroduce a 3 point version string in various API calls, + fixing PulseAudio with Skype. + + Fix some linking errors that accidentally linked libpulse to + libpulsecore which could under some circumstance "downgrade" + libpulse to GPL (rather than LGPL) which could in turn cause + problems with non-GPL compatible apps which link to libpulse. + + Fix a problem where starting PA without X11 would fail due to + dbus problems. + ------------------------------------------------------------------- Fri Sep 30 11:09:58 UTC 2011 - toddrme2178@gmail.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 6b551c5..994a740 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -16,10 +16,11 @@ # + Name: pulseaudio -Version: 1.0 -%define drvver 1.0 +Version: 1.1 Release: 1 +%define drvver 1.1 License: GPLv2+ ; LGPLv2.1+ Summary: A Networked Sound Server Url: http://pulseaudio.org @@ -298,9 +299,11 @@ useradd -r -c 'PulseAudio daemon' \ groupadd -r pulse-access &>/dev/null || : %post -n libpulse0 -p /sbin/ldconfig + %postun -n libpulse0 -p /sbin/ldconfig %post -n libpulse-mainloop-glib0 -p /sbin/ldconfig + %postun -n libpulse-mainloop-glib0 -p /sbin/ldconfig %post @@ -436,6 +439,9 @@ setup-pulseaudio --auto > /dev/null %{_libdir}/libpulse-mainloop-glib.so %{_libdir}/libpulse-simple.so %{_libdir}/pkgconfig/libpulse*.pc +%dir %{_libdir}/cmake +%dir %{_libdir}/cmake/PulseAudio +%{_libdir}/cmake/PulseAudio/PulseAudio*.cmake %{_datadir}/vala %files -n libpulse-mainloop-glib0