Author: hawk Date: Sat Jun 10 20:07:26 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged changes from HEAD (except modular xorg deps)
---- Files affected: SPECS: polypaudio.spec (1.5.2.1 -> 1.5.2.2) ---- Diffs: ================================================================ Index: SPECS/polypaudio.spec diff -u SPECS/polypaudio.spec:1.5.2.1 SPECS/polypaudio.spec:1.5.2.2 --- SPECS/polypaudio.spec:1.5.2.1 Mon May 29 00:08:58 2006 +++ SPECS/polypaudio.spec Sat Jun 10 22:07:21 2006 @@ -1,37 +1,42 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without lirc # without lirc module +# Summary: Modular sound server Summary(pl): Modularny serwer dźwięku Name: polypaudio -Version: 0.9.0 +Version: 0.9.1 Release: 1 License: LGPL Group: Libraries Source0: http://0pointer.de/lennart/projects/polypaudio/%{name}-%{version}.tar.gz -# Source0-md5: dc2703235ad12234f8da19ecd0c9c560 +# Source0-md5: 552741fc972a98319cf0414d704e9b78 Patch0: %{name}-suid.patch +Patch1: %{name}-libdir.patch URL: http://0pointer.de/lennart/projects/polypaudio/ BuildRequires: XFree86-devel BuildRequires: alsa-lib-devel >= 1.0.0 -BuildRequires: autoconf >= 2.57 +BuildRequires: autoconf >= 2.59-9 BuildRequires: automake BuildRequires: glib2-devel >= 1:2.4.0 -BuildRequires: howl-devel +BuildRequires: howl-devel >= 0.9.8 +BuildRequires: jack-audio-connection-kit-devel >= 0.100 +BuildRequires: libasyncns-devel >= 0.1 BuildRequires: libcap-devel BuildRequires: libltdl-devel -BuildRequires: libtool +BuildRequires: liboil-devel >= 0.3.0 BuildRequires: libsamplerate-devel >= 0.1.0 BuildRequires: libsndfile-devel >= 1.0.10 +BuildRequires: libtool BuildRequires: libwrap-devel +%{?with_lirc:BuildRequires: lirc-devel} BuildRequires: lynx BuildRequires: pkgconfig BuildRequires: sed >= 4.0 -Requires: glib2 >= 1:2.4.0 -Requires: libsamplerate >= 0.1.0 -Requires: libsndfile >= 1.0.10 +Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define major %(echo %{version} | sed -e 's/\.[0-9]$//') - %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 @@ -43,19 +48,37 @@ operacyjnych. Ma być zamiennikiem Oświeconego Demona Dźwięku (EsounD), a ambicją autora jest zastąpienie EsounD w GNOME. +%package libs +Summary: Libraries for polypaudio +Summary(pl): Biblioteki dla polypaudio +Group: Libraries +Requires: glib2 >= 1:2.4.0 +Requires: libasyncns >= 0.1 +Requires: libsamplerate >= 0.1.0 +Requires: libsndfile >= 1.0.10 +Conflicts: polypaudio < 0.7-4 + +%description +Libraries for polypaudio. + +%description libs -l pl +Biblioteki dla polypaudio. + %package devel Summary: Development files for polypaudio Summary(pl): Pliki programistyczne polyaudio Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: XFree86-devel +Requires: %{name}-libs = %{version}-%{release} Requires: glib2-devel >= 1:2.4.0 +Requires: libasyncns-devel >= 0.1 +Requires: libcap-devel +Requires: XFree86-devel %description devel Development files for polypaudio. %description devel -l pl -Pliki programistyczne polyaudio. +Pliki programistyczne polypaudio. %package static Summary: Static polypaudio libraries @@ -74,7 +97,7 @@ Summary(pl): Moduły ALSA dla polypaudio Group: Libraries Requires: %{name} = %{version}-%{release} -BuildRequires: alsa-lib >= 1.0.0 +Requires: alsa-lib >= 1.0.0 %description alsa ALSA modules for polypaudio. @@ -82,20 +105,50 @@ %description alsa -l pl Moduły ALSA dla polypaudio. +%package jack +Summary: JACK modules for polypaudio +Summary(pl): Moduły JACK dla polypaudio +Group: Libraries +Requires: %{name} = %{version}-%{release} +Requires: jack-audio-connection-kit >= 0.100 + +%description jack +JACK modules for polypaudio. + +%description jack -l pl +Moduły JACK dla polypaudio. + +%package lirc +Summary: LIRC module for polypaudio +Summary(pl): Moduł LIRC dla polypaudio +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description lirc +LIRC module for polypaudio. + +%description lirc -l pl +Moduł LIRC dla polypaudio. + %prep -%setup -q +%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 + %build %{__libtoolize} %{__aclocal} %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + %{!?with_lirc:ac_cv_header_lirc_lirc_client_h=no} %{__make} %install @@ -104,35 +157,44 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -# *.la are needed (libltdl is used) -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/*.a +# not needed (lt_dlopenext() is used) +rm -f $RPM_BUILD_ROOT%{_libdir}/polypaudio-*/modules/*.la %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files %defattr(644,root,root,755) %doc README -%dir /etc/polypaudio -%config(noreplace) %verify(not md5 mtime size) /etc/polypaudio/daemon.conf -%config(noreplace) %verify(not md5 mtime size) /etc/polypaudio/default.pa -%config(noreplace) %verify(not md5 mtime size) /etc/polypaudio/client.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/polypaudio/daemon.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/polypaudio/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.* +%if %{with lirc} +%exclude %{_libdir}/polypaudio-*/modules/module-lirc.* +%endif + +%files libs +%defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/lib*.so.*.*.* -%dir %{_libdir}/%{name}-%{major} -%dir %{_libdir}/%{name}-%{major}/modules -%attr(755,root,root) %{_libdir}/%{name}-%{major}/modules/*.so -%{_libdir}/%{name}-%{major}/modules/*.la -%exclude %{_libdir}/%{name}-%{major}/modules/libalsa-util.* -%exclude %{_libdir}/%{name}-%{major}/modules/module-alsa-sink.* -%exclude %{_libdir}/%{name}-%{major}/modules/module-alsa-source.* - +%attr(755,root,root) %{_libdir}/libpolypdsp.so +%dir %{_sysconfdir}/polypaudio +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/polypaudio/client.conf + %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/lib*.so +%exclude %{_libdir}/libpolypdsp.so %{_libdir}/lib*.la %{_includedir}/polyp %{_includedir}/polypcore @@ -144,12 +206,20 @@ %files alsa %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}-%{major}/modules/libalsa-util.so -%attr(755,root,root) %{_libdir}/%{name}-%{major}/modules/module-alsa-sink.so -%attr(755,root,root) %{_libdir}/%{name}-%{major}/modules/module-alsa-source.so -%{_libdir}/%{name}-%{major}/modules/libalsa-util.la -%{_libdir}/%{name}-%{major}/modules/module-alsa-sink.la -%{_libdir}/%{name}-%{major}/modules/module-alsa-source.la +%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 + +%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 + +%if %{with lirc} +%files lirc +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/polypaudio-*/modules/module-lirc.so +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -157,6 +227,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5.2.2 2006/06/10 20:07:21 hawk +- merged changes from HEAD (except modular xorg deps) + Revision 1.5.2.1 2006/05/28 22:08:58 aredridel - up to 0.9.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/polypaudio.spec?r1=1.5.2.1&r2=1.5.2.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
