Author: qboosh                       Date: Sun Apr 23 13:04:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.8, updated suid,libdir patches
- dropped autoreqdep bcond (soname has changed)
- added jack,lirc subpackages

---- Files affected:
SPECS:
   polypaudio.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/polypaudio.spec
diff -u SPECS/polypaudio.spec:1.14 SPECS/polypaudio.spec:1.15
--- SPECS/polypaudio.spec:1.14  Mon Mar 20 01:27:00 2006
+++ SPECS/polypaudio.spec       Sun Apr 23 15:04:20 2006
@@ -1,39 +1,40 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without autoreqdep      # don't care about package name deps generated 
by rpm
+%bcond_without lirc    # without lirc module
 #
 Summary:       Modular sound server
 Summary(pl):   Modularny serwer dźwięku
 Name:          polypaudio
-Version:       0.7
-Release:       7
+Version:       0.8
+Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       
http://0pointer.de/lennart/projects/polypaudio/%{name}-%{version}.tar.gz
-# Source0-md5: 1c3693ab9c6904dbed6dfa7656778de4
+# Source0-md5: f15a351c125c1953ec5c4c8b42ac13f7
 Patch0:                %{name}-suid.patch
 Patch1:                %{name}-libdir.patch
 URL:           http://0pointer.de/lennart/projects/polypaudio/
 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 >= 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
 BuildRequires: xorg-lib-libX11-devel
-%{?with_autoreqdep:BuildConflicts:     polypaudio < 0.7-4}
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2 >= 1:2.4.0
-Requires:      libsamplerate >= 0.1.0
-Requires:      libsndfile >= 1.0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,6 +52,10 @@
 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
@@ -64,8 +69,10 @@
 Summary(pl):   Pliki programistyczne polyaudio
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      xorg-lib-libX11-devel
 Requires:      glib2-devel >= 1:2.4.0
+Requires:      libasyncns-devel >= 0.1
+Requires:      libcap-devel
+Requires:      xorg-lib-libX11-devel
 
 %description devel
 Development files for polypaudio.
@@ -98,6 +105,31 @@
 %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
 %patch0 -p1
@@ -106,13 +138,17 @@
 # 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
@@ -122,13 +158,13 @@
        DESTDIR=$RPM_BUILD_ROOT
 
 # *.la are needed (libltdl is used)
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs     -p /sbin/ldconfig
-%postun libs   -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -136,38 +172,59 @@
 %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}/%{name}-%{version}
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/*.so
-%{_libdir}/%{name}-%{version}/*.la
-%exclude %{_libdir}/%{name}-%{version}/libalsa-util.*
-%exclude %{_libdir}/%{name}-%{version}/module-alsa-sink.*
-%exclude %{_libdir}/%{name}-%{version}/module-alsa-source.*
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/*.so
+%{_libdir}/%{name}/*.la
+%exclude %{_libdir}/%{name}/libalsa-util.*
+%exclude %{_libdir}/%{name}/module-alsa-sink.*
+%exclude %{_libdir}/%{name}/module-alsa-source.*
+%exclude %{_libdir}/%{name}/module-jack-sink.*
+%exclude %{_libdir}/%{name}/module-jack-source.*
+%if %{with lirc}
+%exclude %{_libdir}/%{name}/module-lirc.*
+%endif
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*-*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpolypcore.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
-%{_libdir}/lib*-*.la
+%{_libdir}/lib*.la
 %{_includedir}/polyp
+%{_includedir}/polypcore
 %{_pkgconfigdir}/*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*-*.a
+%{_libdir}/lib*.a
 
 %files alsa
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/libalsa-util.so
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/module-alsa-sink.so
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/module-alsa-source.so
-%{_libdir}/%{name}-%{version}/libalsa-util.la
-%{_libdir}/%{name}-%{version}/module-alsa-sink.la
-%{_libdir}/%{name}-%{version}/module-alsa-source.la
+%attr(755,root,root) %{_libdir}/%{name}/libalsa-util.so
+%attr(755,root,root) %{_libdir}/%{name}/module-alsa-sink.so
+%attr(755,root,root) %{_libdir}/%{name}/module-alsa-source.so
+%{_libdir}/%{name}/libalsa-util.la
+%{_libdir}/%{name}/module-alsa-sink.la
+%{_libdir}/%{name}/module-alsa-source.la
+
+%files jack
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/module-jack-sink.so
+%attr(755,root,root) %{_libdir}/%{name}/module-jack-source.so
+%{_libdir}/%{name}/module-jack-sink.la
+%{_libdir}/%{name}/module-jack-source.la
+
+%if %{with lirc}
+%files lirc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/module-lirc.so
+%{_libdir}/%{name}/module-lirc.la
+%endif
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -175,6 +232,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/04/23 13:04:20  qboosh
+- updated to 0.8, updated suid,libdir patches
+- dropped autoreqdep bcond (soname has changed)
+- added jack,lirc subpackages
+
 Revision 1.14  2006/03/20 00:27:00  pluto
 - libdirs fixed, release 7.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/polypaudio.spec?r1=1.14&r2=1.15&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to