SPECS (AC-branch): pulseaudio.spec - HEAD merge: - project Name ...

hawk hawk at pld-linux.org
Tue Sep 5 15:09:24 CEST 2006


Author: hawk                         Date: Tue Sep  5 13:09:24 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge:
  - project Name changed to pulseaudio (following upstream), new URLs
  - updated to 0.9.4, updated suid patch; libdir patch obsolete
  - added triggers to move config files after upgrade from polypaudio

---- Files affected:
SPECS:
   pulseaudio.spec (1.5.2.2 -> 1.5.2.3) 

---- Diffs:

================================================================
Index: SPECS/pulseaudio.spec
diff -u SPECS/pulseaudio.spec:1.5.2.2 SPECS/pulseaudio.spec:1.5.2.3
--- SPECS/pulseaudio.spec:1.5.2.2	Sat Jun 10 22:07:21 2006
+++ SPECS/pulseaudio.spec	Tue Sep  5 15:09:18 2006
@@ -1,26 +1,29 @@
 # $Revision$, $Date$
+# TODO:
+# system-wide pulse daemon stuff:
+# - init script
+# - pulse:pulse uid/gid for daemon
+# - realtime and pulse-access groups for users
 #
 # Conditional build:
 %bcond_without	lirc	# without lirc module
 #
 Summary:	Modular sound server
 Summary(pl):	Modularny serwer dźwięku
-Name:		polypaudio
-Version:	0.9.1
+Name:		pulseaudio
+Version:	0.9.4
 Release:	1
-License:	LGPL
+License:	GPL (server and libpulsecore), LGPL (libpulse)
 Group:		Libraries
-Source0:	http://0pointer.de/lennart/projects/polypaudio/%{name}-%{version}.tar.gz
-# Source0-md5:	552741fc972a98319cf0414d704e9b78
+Source0:	http://0pointer.de/lennart/projects/pulseaudio/%{name}-%{version}.tar.gz
+# Source0-md5:	aadbbc68306653f9052872c11e0cc707
 Patch0:		%{name}-suid.patch
-Patch1:		%{name}-libdir.patch
-URL:		http://0pointer.de/lennart/projects/polypaudio/
-BuildRequires:	XFree86-devel
+URL:		http://pulseaudio.org/
 BuildRequires:	alsa-lib-devel >= 1.0.0
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	glib2-devel >= 1:2.4.0
-BuildRequires:	howl-devel >= 0.9.8
+BuildRequires:	avahi-devel >= 0.6.0
 BuildRequires:	jack-audio-connection-kit-devel >= 0.100
 BuildRequires:	libasyncns-devel >= 0.1
 BuildRequires:	libcap-devel
@@ -32,111 +35,127 @@
 BuildRequires:	libwrap-devel
 %{?with_lirc:BuildRequires:	lirc-devel}
 BuildRequires:	lynx
+BuildRequires:	m4
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
+BuildRequires:	XFree86-devel
 Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	polypaudio
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-polypaudio 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). It is my ultimate ambition to get
-Polypaudio into GNOME as a replacement for EsounD.
+PulseAudio (previously known as PolypAudio) is a sound server for
+POSIX and Win32 operating systems. It allows you to do advanced
+operations on your sound data as it passes between your application
+and your hardware. Things like transferring the audio to a different
+machine, changing the sample format or channel count and mixing
+several sounds into one are easily achieved using a sound server.
 
 %description -l pl
-polypaudio to serwer dźwięku dla Linuksa i innych uniksowych systemów
-operacyjnych. Ma być zamiennikiem Oświeconego Demona Dźwięku (EsounD),
-a ambicją autora jest zastąpienie EsounD w GNOME.
+PulseAudio (poprzednio znany jako PolypAudio) to serwer dźwięku dla
+systemów operacyjnych zgodnych z POSIX oraz Win32. Pozwala na
+wykonywanie zaawansowanych operacji na danych dźwiękowych
+przekazywanych między aplikacjami a sprzętem. Przy użyciu tego serwera
+można łatwo osiągnąć takie rzeczy jak przesyłanie dźwięku na inną
+maszynę, zmiana formatu próbek czy liczby kanałów oraz miksowanie
+kilku dźwięków w jeden.
 
 %package libs
-Summary:	Libraries for polypaudio
-Summary(pl):	Biblioteki dla polypaudio
+Summary:	PulseAudio libraries
+Summary(pl):	Biblioteki PulseAudio
 Group:		Libraries
 Requires:	glib2 >= 1:2.4.0
 Requires:	libasyncns >= 0.1
 Requires:	libsamplerate >= 0.1.0
 Requires:	libsndfile >= 1.0.10
+Obsoletes:	polypaudio-libs
 Conflicts:	polypaudio < 0.7-4
 
 %description
-Libraries for polypaudio.
+PulseAudio libraries.
 
 %description libs -l pl
-Biblioteki dla polypaudio.
+Biblioteki PulseAudio.
 
 %package devel
-Summary:	Development files for polypaudio
-Summary(pl):	Pliki programistyczne polyaudio
+Summary:	Development files for PulseAudio libraries
+Summary(pl):	Pliki programistyczne bibliotek PulseAudio
+License:	GPL (libpulsecore), LGPL (libpulse)
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.4.0
 Requires:	libasyncns-devel >= 0.1
 Requires:	libcap-devel
 Requires:	XFree86-devel
+Obsoletes:	polypaudio-devel
 
 %description devel
-Development files for polypaudio.
+Development files for PulseAudio libraries.
 
 %description devel -l pl
-Pliki programistyczne polypaudio.
+Pliki programistyczne bibliotek PulseAudio.
 
 %package static
-Summary:	Static polypaudio libraries
-Summary(pl):	Statyczne biblioteki polypaudio
+Summary:	Static PulseAudio libraries
+Summary(pl):	Statyczne biblioteki PulseAudio
+License:	GPL (libpulsecore), LGPL (libpulse)
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Obsoletes:	polypaudio-static
 
 %description static
-Static polypaudio libraries.
+Static PulseAudio libraries.
 
 %description static -l pl
-Statyczne biblioteki polypaudio.
+Statyczne biblioteki PulseAudio.
 
 %package alsa
-Summary:	ALSA modules for polypaudio
-Summary(pl):	Moduły ALSA dla polypaudio
+Summary:	ALSA modules for PulseAudio
+Summary(pl):	Moduły ALSA dla PulseAudio
+License:	GPL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	alsa-lib >= 1.0.0
+Obsoletes:	polypaudio-alsa
 
 %description alsa
-ALSA modules for polypaudio.
+ALSA modules for PulseAudio.
 
 %description alsa -l pl
-Moduły ALSA dla polypaudio.
+Moduły ALSA dla PulseAudio.
 
 %package jack
-Summary:	JACK modules for polypaudio
-Summary(pl):	Moduły JACK dla polypaudio
+Summary:	JACK modules for PulseAudio
+Summary(pl):	Moduły JACK dla PulseAudio
+License:	GPL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	jack-audio-connection-kit >= 0.100
+Obsoletes:	polypaudio-jack
 
 %description jack
-JACK modules for polypaudio.
+JACK modules for PulseAudio.
 
 %description jack -l pl
-Moduły JACK dla polypaudio.
+Moduły JACK dla PulseAudio.
 
 %package lirc
-Summary:	LIRC module for polypaudio
-Summary(pl):	Moduł LIRC dla polypaudio
+Summary:	LIRC module for PulseAudio
+Summary(pl):	Moduł LIRC dla PulseAudio
+License:	GPL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	polypaudio-lirc
 
 %description lirc
-LIRC module for polypaudio.
+LIRC module for PulseAudio.
 
 %description lirc -l pl
-Moduł LIRC dla polypaudio.
+Moduł LIRC dla PulseAudio.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-# glib2 version should be sufficient
-sed -i -e 's/HAVE_GLIB12=1/HAVE_GLIB12=0/' configure.ac
 
 # no need for -lSM -lICE
 sed -i -e 's/ \$(X_PRE_LIBS)//' src/Makefile.am
@@ -148,7 +167,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	%{!?with_lirc:ac_cv_header_lirc_lirc_client_h=no}
+	%{!?with_lirc:--disable-lirc}
 %{__make}
 
 %install
@@ -158,47 +177,63 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # not needed (lt_dlopenext() is used)
-rm -f $RPM_BUILD_ROOT%{_libdir}/polypaudio-*/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/pulse-*/modules/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun -- polypaudio
+if [ -f %{_sysconfdir}/polypaudio/daemon.conf.rpmsave ]; then
+	mv -f %{_sysconfdir}/pulse/daemon.conf %{_sysconfdir}/pulse/daemon.conf.rpmnew
+	mv -f %{_sysconfdir}/polypaudio/daemon.conf.rpmsave %{_sysconfdir}/pulse/daemon.conf
+fi
+if [ -f %{_sysconfdir}/polypaudio/default.pa.rpmsave ]; then
+	mv -f %{_sysconfdir}/pulse/default.pa %{_sysconfdir}/pulse/default.pa.rpmnew
+	mv -f %{_sysconfdir}/polypaudio/default.pa.rpmsave %{_sysconfdir}/pulse/default.pa
+fi
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
+%triggerpostun -- polypaudio-libs
+if [ -f %{_sysconfdir}/polypaudio/client.conf.rpmsave ]; then
+	mv -f %{_sysconfdir}/pulse/client.conf %{_sysconfdir}/pulse/client.conf.rpmnew
+	mv -f %{_sysconfdir}/polypaudio/client.conf.rpmsave %{_sysconfdir}/pulse/client.conf
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc README
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/polypaudio/daemon.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/polypaudio/default.pa
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/daemon.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/default.pa
 %attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/polypaudio-*
-%dir %{_libdir}/polypaudio-*/modules
-%attr(755,root,root) %{_libdir}/polypaudio-*/modules/*.so
-%exclude %{_libdir}/polypaudio-*/modules/libalsa-util.*
-%exclude %{_libdir}/polypaudio-*/modules/module-alsa-sink.*
-%exclude %{_libdir}/polypaudio-*/modules/module-alsa-source.*
-%exclude %{_libdir}/polypaudio-*/modules/module-jack-sink.*
-%exclude %{_libdir}/polypaudio-*/modules/module-jack-source.*
+%dir %{_libdir}/pulse-*
+%dir %{_libdir}/pulse-*/modules
+%attr(755,root,root) %{_libdir}/pulse-*/modules/*.so
+%exclude %{_libdir}/pulse-*/modules/libalsa-util.*
+%exclude %{_libdir}/pulse-*/modules/module-alsa-sink.*
+%exclude %{_libdir}/pulse-*/modules/module-alsa-source.*
+%exclude %{_libdir}/pulse-*/modules/module-jack-sink.*
+%exclude %{_libdir}/pulse-*/modules/module-jack-source.*
 %if %{with lirc}
-%exclude %{_libdir}/polypaudio-*/modules/module-lirc.*
+%exclude %{_libdir}/pulse-*/modules/module-lirc.*
 %endif
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %{_libdir}/libpolypdsp.so
-%dir %{_sysconfdir}/polypaudio
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/polypaudio/client.conf
+%attr(755,root,root) %{_libdir}/libpulsedsp.so
+%dir %{_sysconfdir}/pulse
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/client.conf
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
-%exclude %{_libdir}/libpolypdsp.so
+%exclude %{_libdir}/libpulsedsp.so
 %{_libdir}/lib*.la
-%{_includedir}/polyp
-%{_includedir}/polypcore
-%{_pkgconfigdir}/*
+%{_includedir}/pulse
+%{_includedir}/pulsecore
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -206,19 +241,19 @@
 
 %files alsa
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/polypaudio-*/modules/libalsa-util.so
-%attr(755,root,root) %{_libdir}/polypaudio-*/modules/module-alsa-sink.so
-%attr(755,root,root) %{_libdir}/polypaudio-*/modules/module-alsa-source.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/libalsa-util.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-alsa-sink.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-alsa-source.so
 
 %files jack
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/polypaudio-*/modules/module-jack-sink.so
-%attr(755,root,root) %{_libdir}/polypaudio-*/modules/module-jack-source.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-jack-sink.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-jack-source.so
 
 %if %{with lirc}
 %files lirc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/polypaudio-*/modules/module-lirc.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-lirc.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -227,6 +262,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5.2.3  2006/09/05 13:09:18  hawk
+- HEAD merge:
+  - project Name changed to pulseaudio (following upstream), new URLs
+  - updated to 0.9.4, updated suid patch; libdir patch obsolete
+  - added triggers to move config files after upgrade from polypaudio
+
 Revision 1.5.2.2  2006/06/10 20:07:21  hawk
 - merged changes from HEAD (except modular xorg deps)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pulseaudio.spec?r1=1.5.2.2&r2=1.5.2.3&f=u



More information about the pld-cvs-commit mailing list