[svn] r4845 - in trunk/rpms: mpg123 rsstool yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-10-22 01:31:54 +0200 (Sun, 22 Oct 2006)
New Revision: 4845

Modified:
   trunk/rpms/mpg123/mpg123.spec
   trunk/rpms/rsstool/rsstool.spec
   trunk/rpms/yam/yam.spec
Log:
Updates

Modified: trunk/rpms/mpg123/mpg123.spec
===================================================================
--- trunk/rpms/mpg123/mpg123.spec	2006-10-21 22:52:01 UTC (rev 4844)
+++ trunk/rpms/mpg123/mpg123.spec	2006-10-21 23:31:54 UTC (rev 4845)
@@ -3,9 +3,46 @@
 
 %{!?audio:%define audio alsa}
 
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?el4:%define _without_jack 1}
+%{?el4:%define _without_nas 1}
+
+%{?fc3:%define _without_jack 1}
+%{?fc3:%define _without_nas 1}
+
+%{?fc2:%define _without_jack 1}
+%{?fc2:%define _without_nas 1}
+
+%{?fc1:%define audio esd}
+%{?fc1:%define _without_alsa 1}
+%{?fc1:%define _without_jack 1}
+%{?fc1:%define _without_nas 1}
+
+%{?el3:%define audio esd}
+%{?el3:%define _without_alsa 1}
+%{?el3:%define _without_jack 1}
+%{?el3:%define _without_nas 1}
+
+%{?rh9:%define audio esd}
+%{?rh9:%define _without_alsa 1}
+%{?rh9:%define _without_jack 1}
+%{?rh9:%define _without_nas 1}
+
+%{?rh7:%define audio esd}
+%{?rh7:%define _without_alsa 1}
+%{?rh7:%define _without_jack 1}
+%{?rh7:%define _without_nas 1}
+
+%{?el2:%define audio oss}
+%{?el2:%define _without_alsa 1}
+%{?el2:%define _without_esound 1}
+%{?el2:%define _without_jack 1}
+%{?el2:%define _without_nas 1}
+
 Summary: MPEG audio player
 Name: mpg123
-Version: 0.60
+Version: 0.61
 Release: 1
 License: GPL/LGPL
 Group: Applications/Multimedia
@@ -13,13 +50,13 @@
 Source: http://mpg123.org/download/mpg123-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
-# We actually only need one, but it doesn't hurt to have them all
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: esound-devel
 BuildRequires: SDL-devel
-BuildRequires: nas-devel
 BuildRequires: portaudio-devel
-BuildRequires: alsa-lib-devel
+# We actually only need one, but it doesn't hurt to have them all
+%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{!?_without_esound:BuildRequires: esound-devel}
+%{!?_without_nas:BuildRequires: nas-devel}
+%{!?_without_alsa:BuildRequires: alsa-lib-devel}
 Obsoletes: mpg321 <= 0.2.10-9
 
 %description
@@ -35,14 +72,15 @@
 
 %build
 %configure \
-    --enable-gapless=yes \
-    --with-audio=%{audio}
+    --program-prefix="%{?_program_prefix}" \
+    --enable-gapless="yes" \
+    --with-audio="%{audio}"
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
 
 %clean
@@ -57,6 +95,9 @@
 
 
 %changelog
+* Sun Oct 22 2006 Dag Wieers <dag at wieers.com> - 0.61-1
+- Updated to release 0.61.
+
 * Mon Sep  4 2006 Matthias Saou <http://freshrpms.net/> 0.60-1
 - Update to 0.60 final.
 - Add support for all available compatible outputs, unfortunately it's a build
@@ -66,4 +107,3 @@
 * Tue Jul 25 2006 Matthias Saou <http://freshrpms.net/> 0.60-0.1.beta2
 - Initial RPM release, now that mpg123 is maintained again and went GPL/LGPL.
 - Audio output type is not (yet?) plugin-based, so use libao (for ALSA).
-

Modified: trunk/rpms/rsstool/rsstool.spec
===================================================================
--- trunk/rpms/rsstool/rsstool.spec	2006-10-21 22:52:01 UTC (rev 4844)
+++ trunk/rpms/rsstool/rsstool.spec	2006-10-21 23:31:54 UTC (rev 4845)
@@ -4,7 +4,7 @@
 
 Summary: Read, parse, merge and write RSS (and Atom) feeds
 Name: rsstool
-Version: 0.9.5
+Version: 0.9.6
 Release: 1
 License: GPL
 Group: Applications/Text
@@ -41,6 +41,9 @@
 %{_bindir}/rsstool
 
 %changelog
+* Sat Oct 21 2006 Dag Wieers <dag at wieers.com> - 0.9.6-1
+- Updated to release 0.9.6.
+
 * Sun Oct 15 2006 Dag Wieers <dag at wieers.com> - 0.9.5-1
 - Updated to release 0.9.5.
 

Modified: trunk/rpms/yam/yam.spec
===================================================================
--- trunk/rpms/yam/yam.spec	2006-10-21 22:52:01 UTC (rev 4844)
+++ trunk/rpms/yam/yam.spec	2006-10-21 23:31:54 UTC (rev 4845)
@@ -5,7 +5,7 @@
 Summary: Tool to set up a Yum/Apt mirror from various sources (ISO, RHN, rsync, http, ftp, ...)
 Name: yam
 Version: 0.8.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/yam/
@@ -15,7 +15,7 @@
 
 BuildArch: noarch
 BuildRequires: /usr/bin/python2
-Requires: python >= 2.0, createrepo >= 0.4.6
+Requires: python >= 2.0, createrepo
 
 %description
 Yam builds a local Apt/Yum RPM repository from local ISO files,
@@ -89,7 +89,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING README THANKS TODO WISHLIST config/* docs/
+%doc AUTHORS ChangeLog COPYING README THANKS TODO WISHLIST config/*.conf config/dists/ docs/
 %config(noreplace) %{_sysconfdir}/cron.d/yam
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/yam.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/yam
@@ -105,6 +105,9 @@
 %{_localstatedir}/yam/
 
 %changelog
+* Sat Oct 21 2006 Dag Wieers <dag at wieers.com> - 0.8.3-2
+- Get rid of specific createrepo version now that Yam works with upstream.
+
 * Sun Oct 15 2006 Dag Wieers <dag at wieers.com> - 0.8.3-1
 - Updated to release 0.8.3.