rpms/akode/EL-5 .cvsignore, 1.3, 1.4 akode.spec, 1.8, 1.9 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/akode/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8522

Modified Files:
	.cvsignore akode.spec sources 
Log Message:
rawhide sync (akode-2.0.2)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/akode/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Aug 2006 12:56:31 -0000	1.3
+++ .cvsignore	9 Jan 2008 04:45:06 -0000	1.4
@@ -1 +1 @@
-30375-akode-2.0.1.tar.bz2
+30375-akode-2.0.2.tar.bz2


Index: akode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akode/EL-5/akode.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- akode.spec	6 Jun 2007 15:25:46 -0000	1.8
+++ akode.spec	9 Jan 2008 04:45:06 -0000	1.9
@@ -1,40 +1,35 @@
 
 Summary: Audio-decoding framework 
 Name:	 akode 
-Version: 2.0.1
-Release: 5%{?dist}.1
-License: LGPL
+Version: 2.0.2
+Release: 4%{?dist}
+
+License: LGPLv2+
 Group: 	 System Environment/Libraries
 #URL:	 http://carewolf.com/akode/  
 URL:	 http://www.kde-apps.org/content/show.php?content=30375
-Source0: http://www.kde-apps.org/content/files/30375-akode-%{version}.tar.bz2
+Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: akode-pulseaudio.patch
+Patch2: akode-2.0.2-multilib.patch
+Patch3: akode-2.0.2-flac113-portable.patch
 
-#Conflicts: kdemultimedia < 6:3.5 
-
+%define _with_flac --with-flac
 %if 0%{?fedora} > 4
 %define _with_jack --with-jack
 %define _with_libsamplerate --with-libsamplerate
 %define _with_pulseaudio --with-pulseaudio
 %endif
 
-%if 0%{?fedora} > 6
-%define _with_pulseaudio --with-pulseaudio
-# pulseaudio is/will-be the F7 default, 
-Requires: %{name}-pulseaudio
-%endif
-
-BuildRequires: automake
+BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
-BuildRequires: flac-devel
-BuildRequires: speex-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libtool
+%{?_with_flac:BuildRequires: flac-devel}
 %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
 %{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
-%{?_with_pulseaudio:BuildRequires: pulseaudio-devel}
+BuildRequires: libvorbis-devel
+%{?_with_pulseaudio:BuildRequires: pulseaudio-lib-devel}
+BuildRequires: speex-devel
 
 %description
 aKode is a simple audio-decoding frame-work that provides a uniform
@@ -46,13 +41,13 @@
 * xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. 
 
 aKode also has the following audio outputs:
-* oss: Outputs to the OSS (Open Sound System)
 * alsa: Outputs to ALSA (dmix is recommended).
 
 %package devel
 Summary: Headers for developing programs that will use %{name} 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 %description devel
 %{summary}.
 
@@ -63,30 +58,33 @@
 %description jack 
 %{summary}.
 
-%package libsamplerate 
-Summary: Resampler based on (GPL) libsamplerate for %{name}
+%package pulseaudio
+Summary: Pulseaudio output backend for %{name}
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
-%description libsamplerate 
+%description pulseaudio
 %{summary}.
-Packaged separately to keep main/core %{akode} package LGPL-clean.
+Recommended for network transparent audio.
 
-%package pulseaudio 
-Summary: Pulseaudio output backend for %{name}
+# Packaged separately to keep main/core %{akode} package LGPL-clean.
+%package libsamplerate 
+Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
+License: GPLv2+
 Requires: %{name} = %{version}-%{release}
-%description pulseaudio 
+%description libsamplerate 
 %{summary}.
-Recommended for network transparent audio.
-
 
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .pulseaudio
+%patch2 -p1 -b .multilib
+%patch3 -p4 -b .flac113_portable
 
-[ ! -f configure ] && make -f Makefile.cvs
+#[ ! -f configure ] && \
+make -f Makefile.cvs
 
 
 %build
@@ -95,7 +93,8 @@
   --disable-debug --disable-warnings --disable-dependency-tracking \
   --without-libltdl \
   --with-alsa \
-  --with-flac \
+  --without-oss \
+  %{?_with_flac} %{!?_with_flac:--without-flac} \
   %{?_with_jack} %{!?_with_jack:--without-jack} \
   %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
   %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
@@ -108,12 +107,13 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
+#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so
 
 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
@@ -122,7 +122,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
 
 %post -p /sbin/ldconfig
@@ -136,7 +136,6 @@
 %{_bindir}/akodeplay
 %{_libdir}/libakode.so.*
 %{_libdir}/libakode_alsa_sink.so
-%{_libdir}/libakode_oss_sink.so
 %{_libdir}/libakode_mpc_decoder.so
 %{_libdir}/libakode_xiph_decoder.so
 
@@ -145,6 +144,7 @@
 %{_bindir}/akode-config
 %{_includedir}/*
 %{_libdir}/libakode.so
+%{_libdir}/pkgconfig/*.pc
 
 %if "%{?_with_jack:1}" == "1"
 %files jack 
@@ -152,6 +152,7 @@
 %{_libdir}/libakode_jack_sink.so
 %endif
 
+# License: GPLv2+
 %if "%{?_with_libsamplerate:1}" == "1"
 %files libsamplerate
 %defattr(-,root,root,-)
@@ -166,10 +167,35 @@
 
 
 %changelog
+* Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-4
+- -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio)
+
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-3
+- fix flac113 support
+
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-2
+- fix multilib conflicts (#340591)
+
+* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1
+- akode-2.0.2
+
+* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-9
+- BR: pulseaudio-libs-devel
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-8
+- -libsamplerate: License: GPLv2+
+- omit oss_sink
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-7
+- Requires: %%{name}-pulseaudio (f8+)
+- License: LGPLv2+
+
+* Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-6
+- respin (for flac, fc7+)
+
 * Mon Feb 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-5
-- enable pulseaudio support (fedora only)
+- enable pulseaudio support
 - Requires: akode-pulseaudio (f7+)
-- make libsamplerate support fedora only
 
 * Thu Dec 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-4
 - enable jack support (subpkg)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/akode/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Aug 2006 12:56:31 -0000	1.3
+++ sources	9 Jan 2008 04:45:06 -0000	1.4
@@ -1 +1 @@
-94a10e7729b20b669bc5c7721f62e162  30375-akode-2.0.1.tar.bz2
+659ced0c9c735cb3e55b9138ff02342c  30375-akode-2.0.2.tar.bz2