[svn] r5468 - in trunk/rpms: . albumart cdlabelgen cfengine clamav libpixman mpd netscape3 nfswatch p7zip perl-DateTime-Util-Calc perl-IO-Prompt perl-Log-Dispatch-Config python-imaging shntool sketch xmame

Sun Jun 3 02:10:25 CEST 2007

Author: dag
Date: 2007-06-03 02:10:22 +0200 (Sun, 03 Jun 2007)
New Revision: 5468

Added:
   trunk/rpms/cdlabelgen/
   trunk/rpms/cdlabelgen/cdlabelgen.spec
   trunk/rpms/perl-IO-Prompt/
   trunk/rpms/perl-IO-Prompt/perl-IO-Prompt.spec
   trunk/rpms/perl-Log-Dispatch-Config/
   trunk/rpms/perl-Log-Dispatch-Config/perl-Log-Dispatch-Config.spec
Modified:
   trunk/rpms/albumart/albumart.spec
   trunk/rpms/cfengine/cfengine.spec
   trunk/rpms/clamav/clamav.spec
   trunk/rpms/libpixman/libpixman.spec
   trunk/rpms/mpd/mpd.spec
   trunk/rpms/netscape3/netscape3.spec
   trunk/rpms/nfswatch/nfswatch.spec
   trunk/rpms/p7zip/p7zip.spec
   trunk/rpms/perl-DateTime-Util-Calc/perl-DateTime-Util-Calc.spec
   trunk/rpms/python-imaging/python-imaging.spec
   trunk/rpms/shntool/shntool.spec
   trunk/rpms/sketch/sketch.spec
   trunk/rpms/xmame/xmame.spec
Log:
Updates

Modified: trunk/rpms/albumart/albumart.spec
===================================================================

--- trunk/rpms/albumart/albumart.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/albumart/albumart.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -1,5 +1,4 @@
 # $Id$
-
 # Authority: dag
 
 Summary: Downloads album cover images semi-automatically from the Internet
@@ -13,9 +12,9 @@
 Source: http://louhi.kempele.fi/~skyostil/projects/albumart/dist/albumart-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildArch: noarch
 BuildRequires: python, python-devel
 Requires: python, PyQt, python-imaging
-BuildArch: noarch
 
 %description
 Album Cover Art Downloader is a download utility for semi-automatically
@@ -34,11 +33,19 @@
 %{__rm} -rf %{buildroot}
 python setup.py install --root="%{buildroot}"
 
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{_docdir}
+
 %clean
 %{__rm} -rf %{buildroot}
 
-%files -f INSTALLED_FILES
+%files
 %defattr(-, root, root, 0755)
+%doc README TODO
+%{_bindir}/albumart-qt
+%{_datadir}/albumart/
+%{_datadir}/applnk/Multimedia/albumart.desktop
+%{_datadir}/pixmaps/albumart.png
 %{_libdir}/albumart/
 
 %changelog

Added: trunk/rpms/cdlabelgen/cdlabelgen.spec
===================================================================
--- trunk/rpms/cdlabelgen/cdlabelgen.spec	                        (rev 0)
+++ trunk/rpms/cdlabelgen/cdlabelgen.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -0,0 +1,48 @@
+# $Id$
+# Authority: dag
+# Upstream: Avinash Chopde <avinash$acm,org>
+
+Summary: Generates frontcards and traycards for inserting in CD jewelcases
+Name: cdlabelgen
+Version: 3.6.0
+Release: 1
+License: GPL
+Group: Applications/Publishing
+URL: http://www.aczoom.com/tools/cdinsert/
+
+Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+
+%description
+Cdlabelgen is a utility which generates frontcards and traycards
+(in PostScript(TM) format) for CD jewelcases.
+
+%prep
+%setup
+
+%build
+%{__make}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -Dp -m0755 cdlabelgen %{buildroot}%{_bindir}/cdlabelgen
+%{__install} -Dp -m0644 cdlabelgen.1 %{buildroot}%{_mandir}/man1/cdlabelgen.1
+
+%{__install} -d -m0755 %{buildroot}%{_datadir}/cdlabelgen/
+%{__install} -p -m0644 postscript/* %{buildroot}%{_datadir}/cdlabelgen/
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc cdlabelgen.html ChangeLog README
+%doc %{_mandir}/man1/*.1*
+%{_bindir}/cdlabelgen
+%{_datadir}/cdlabelgen/
+
+%changelog
+* Thu May 31 2007 Dag Wieers <dag at wieers.com> - 3.6.0-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/cdlabelgen/cdlabelgen.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/cfengine/cfengine.spec
===================================================================
--- trunk/rpms/cfengine/cfengine.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/cfengine/cfengine.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -10,7 +10,7 @@
 
 Summary: System administration tool for networks
 Name: cfengine
-Version: 2.2.0
+Version: 2.2.1
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -327,6 +327,9 @@
 %exclude %{_datadir}/cfengine/
 
 %changelog
+* Sat Jun 02 2007 Dag Wieers <dag at wieers.com> - 2.2.1-1
+- Updated to release 2.2.1.
+
 * Wed May 02 2007 Dag Wieers <dag at wieers.com> - 2.2.0-1
 - Updated to release 2.2.0.
 

Modified: trunk/rpms/clamav/clamav.spec
===================================================================
--- trunk/rpms/clamav/clamav.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/clamav/clamav.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -11,8 +11,8 @@
 
 Summary: Anti-virus software
 Name: clamav
-Version: 0.90.2
-Release: 2
+Version: 0.90.3
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://www.clamav.net/
@@ -122,7 +122,7 @@
 		s|^#(MaxThreads) .+$|$1 50|;
 		s|^#(ReadTimeout) .+$|$1 300|;
 		s|^#(User) .+$|$1 clamav|;
-		s|^#(AllowSupplementaryGroups)|$1|;
+		s|^#(AllowSupplementaryGroups).*$|$1 yes|;
 		s|^#(ScanPE) .+$|$1 yes|;
 		s|^#(ScanELF) .+$|$1 yes|;
 		s|^#(DetectBrokenExecutables)|$1|;
@@ -359,6 +359,9 @@
 %{_libdir}/pkgconfig/libclamav.pc
 
 %changelog
+* Thu May 31 2007 Dag Wieers <dag at wieers.com> - 0.90.3-1
+- Updated to release 0.90.3.
+
 * Fri Apr 27 2007 Dag Wieers <dag at wieers.com> - 0.90.2-2
 - Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen)
 

Modified: trunk/rpms/libpixman/libpixman.spec
===================================================================
--- trunk/rpms/libpixman/libpixman.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/libpixman/libpixman.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -1,10 +1,18 @@
 # $Id$
 # Authority: dag
 
+%{?dist: %{expand: %%define %dist 1}}
+
+%{!?dist:%define _with_modxorg 1}
+%{?fc7:  %define _with_modxorg 1}
+%{?el5:  %define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
+%{?fc5:  %define _with_modxorg 1}
+
 Summary: Merge of libpixregion and libic
 Name: libpixman
-Version: 0.1.2
-Release: 1.2
+Version: 0.1.6
+Release: 1
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.cairographics.org/
@@ -22,7 +30,9 @@
 Summary: Header files, libraries and development documentation for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libpixman-devel, XFree86-devel
+Requires: libpixman-devel
+%{!?_with_modxorg:Requires: XFree86-devel}
+%{?_with_modxorg:Requires: libX11-devel}
 
 %description devel
 This package contains the header files, static libraries and development
@@ -38,14 +48,11 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig 2>/dev/null
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -63,11 +70,12 @@
 %{_libdir}/pkgconfig/libpixman.pc
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.1.2-1.2
-- Rebuild for Fedora Core 5.
+* Thu May 31 2007 Dag Wieers <dag at wieers.com> - 0.1.6-1
+- Updated to release 0.1.6.
+- Fixed static dependency to XFree86-devel.
 
 * Sun Jan 02 2005 Dag Wieers <dag at wieers.com> - 0.1.2-1
-- Updated to release 0.1.1.
+- Updated to release 0.1.2.
 
 * Sun Jul 25 2004 Dag Wieers <dag at wieers.com> - 0.1.1-1
 - Updated to release 0.1.1.

Modified: trunk/rpms/mpd/mpd.spec
===================================================================
--- trunk/rpms/mpd/mpd.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/mpd/mpd.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -1,6 +1,13 @@
 # $Id$
 # Authority: matthias
 
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?el5:%define _without_pulseaudio 1}
+%{?el4:%define _without_pulseaudio 1}
+%{?el3:%define _without_pulseaudio 1}
+%{?el2:%define _without_pulseaudio 1}
+
 Summary: Music Player Daemon
 Name: mpd
 Version: 0.13.0
@@ -11,10 +18,10 @@
 Source: http://www.musicpd.org/uploads/files/mpd-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel
-BuildRequires: alsa-lib-devel, pulseaudio-devel, libshout-devel
+BuildRequires: alsa-lib-devel, libshout-devel, mikmod-devel
 BuildRequires: libid3tag-devel, libmad-devel, libogg-devel, libvorbis-devel
 BuildRequires: flac-devel, audiofile-devel, faad2-devel, libmpcdec-devel
-BuildRequires: mikmod-devel
+%{!?_without_pulseaudio:BuildRequires: pulseaudio-devel}
 
 %description
 Music Player Daemon (MPD) allows remote access for playing music and managing
@@ -35,7 +42,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR="%{buildroot}"
 %{__rm} -rf %{buildroot}%{_datadir}/doc/mpd/
 
 

Modified: trunk/rpms/netscape3/netscape3.spec
===================================================================
--- trunk/rpms/netscape3/netscape3.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/netscape3/netscape3.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -1,6 +1,8 @@
 # $Id$
 # Authority: dag
 
+# DistExclude: el5
+
 Summary: The Netscape standalone navigator
 Name: netscape3
 Version: 3.04

Modified: trunk/rpms/nfswatch/nfswatch.spec
===================================================================
--- trunk/rpms/nfswatch/nfswatch.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/nfswatch/nfswatch.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -3,7 +3,7 @@
 
 Summary: Command line tool to monitor NFS traffic
 Name: nfswatch
-Version: 4.99.8
+Version: 4.99.9
 Release: 1
 License: BSD
 Group: Applications/Internet
@@ -45,6 +45,9 @@
 %{_sbindir}/nfswatch
 
 %changelog
+* Sat Jun 02 2007 Dag Wieers <dag at wieers.com> - 4.99.9-1
+- Updated to release 4.99.9.
+
 * Sun Mar 18 2007 Dag Wieers <dag at wieers.com> - 4.99.8-1
 - Updated to release 4.99.8.
 

Modified: trunk/rpms/p7zip/p7zip.spec
===================================================================
--- trunk/rpms/p7zip/p7zip.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/p7zip/p7zip.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -34,12 +34,12 @@
 ### same directory as the binaries, and we don't want them in %{_bindir}.
 %{__cat} << 'EOF' > 7za.sh
 #!/bin/sh
-exec %{_libexecdir}/p7zip/7za $@
+exec %{_libexecdir}/p7zip/7za "$@"
 EOF
 
 %{__cat} << 'EOF' > 7z.sh
 #!/bin/sh
-exec %{_libexecdir}/p7zip/7z $@
+exec %{_libexecdir}/p7zip/7z "$@"
 EOF
 
 %build
@@ -74,9 +74,10 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc ChangeLog DOCS/* README TODO
+%doc ChangeLog README TODO DOCS/*
 %{_bindir}/7za
 %dir %{_libexecdir}/p7zip/
+%{_libexecdir}/p7zip/7z.so
 %{_libexecdir}/p7zip/7za
 %{_libexecdir}/p7zip/7zCon.sfx
 
@@ -87,7 +88,7 @@
 %dir %{_libexecdir}/p7zip/
 %{_libexecdir}/p7zip/7z
 %{_libexecdir}/p7zip/Codecs/
-%{_libexecdir}/p7zip/Formats/
+#%{_libexecdir}/p7zip/Formats/
 
 
 %changelog

Modified: trunk/rpms/perl-DateTime-Util-Calc/perl-DateTime-Util-Calc.spec
===================================================================
--- trunk/rpms/perl-DateTime-Util-Calc/perl-DateTime-Util-Calc.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/perl-DateTime-Util-Calc/perl-DateTime-Util-Calc.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -1,15 +1,15 @@
 # $Id$
 # Authority: dries
-# Upstream: Daisuke Maki <dmaki$cpan,org>
+# Upstream: Daisuke Maki <daisuke$endeworks,jp>
 
-%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
-%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 
 %define real_name DateTime-Util-Calc
 
 Summary: DateTime calculation utilities
 Name: perl-DateTime-Util-Calc
-Version: 0.11
+Version: 0.13002
 Release: 1
 License: Artistic/GPL
 Group: Applications/CPAN
@@ -19,8 +19,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch: noarch
-BuildRequires: perl, perl-Module-Build, perl-Math-BigInt-GMP
+BuildRequires: perl >= 1:5.6.1 
+BuildRequires: perl(Module::Build), perl(Math::BigInt::GMP)
+BuildRequires: perl(Math::BigInt::FastCalc)
 BuildRequires: perl(Math::Round), perl(DateTime)
+BuildRequires: perl(Test::More)
 
 %description
 A perl module with additional DateTime calculation utilities.
@@ -37,27 +40,27 @@
 %makeinstall
 
 ### Clean up buildroot
-%{__rm} -rf %{buildroot}%{perl_archlib} \
-		%{buildroot}%{perl_vendorarch}
+%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGES LICENSE
-%doc %{_mandir}/man3/*
+%doc CHANGES LICENSE MANIFEST META.yml
+%doc %{_mandir}/man3/DateTime::Util::Calc.3pm*
+#%doc %{_mandir}/man3/*
 %dir %{perl_vendorlib}/DateTime/
 %dir %{perl_vendorlib}/DateTime/Util/
 %{perl_vendorlib}/DateTime/Util/Calc.pm
 
 %changelog
+* Thu May 31 2007 Dag Wieers <dag at wieers.com> - 0.13002-1
+- Updated to release 0.13002.
+
 * Mon Sep 18 2006 Dries Verachtert <dries at ulyssis.org> - 0.11-1
 - Updated to release 0.11.
 
-* Wed Mar 22 2006 Dries Verachtert <dries at ulyssis.org> - 0.10-1.2
-- Rebuild for Fedora Core 5.
-
 * Sat Jan  7 2006 Dries Verachtert <dries at ulyssis.org> - 0.10-1
 - Updated to release 0.10.
 

Added: trunk/rpms/perl-IO-Prompt/perl-IO-Prompt.spec
===================================================================
--- trunk/rpms/perl-IO-Prompt/perl-IO-Prompt.spec	                        (rev 0)
+++ trunk/rpms/perl-IO-Prompt/perl-IO-Prompt.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -0,0 +1,56 @@
+# $Id$
+# Authority: dag
+# Upstream: Damian Conway <damian$conway,org>
+
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+%define real_name IO-Prompt
+%define real_version 0.099004
+
+Summary: Perl module to interactively prompt for user input.
+Name: perl-IO-Prompt
+Version: 0.99.4
+Release: 1
+License: Artistic/GPL
+Group: Applications/CPAN
+URL: http://search.cpan.org/dist/IO-Prompt/
+
+Source: http://www.cpan.org/modules/by-module/IO/IO-Prompt-v%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: perl
+
+%description
+IO-Prompt is a Perl module to interactively prompt for user input.
+
+%prep
+%setup -n %{real_name}-v%{version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%makeinstall
+
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc Changes MANIFEST META.yml README
+%doc %{_mandir}/man3/IO::Prompt.3pm*
+#%doc %{_mandir}/man3/*.3pm*
+%dir %{perl_vendorlib}/IO/
+#%{perl_vendorlib}/IO/Prompt/
+%{perl_vendorlib}/IO/Prompt.pm
+
+%changelog
+* Thu May 31 2007 Dag Wieers <dag at wieers.com> - 0.99.4-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/perl-IO-Prompt/perl-IO-Prompt.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Added: trunk/rpms/perl-Log-Dispatch-Config/perl-Log-Dispatch-Config.spec
===================================================================
--- trunk/rpms/perl-Log-Dispatch-Config/perl-Log-Dispatch-Config.spec	                        (rev 0)
+++ trunk/rpms/perl-Log-Dispatch-Config/perl-Log-Dispatch-Config.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -0,0 +1,59 @@
+# $Id$
+# Authority: dag
+# Upstream: Tatsuhiko Miyagawa <miyagawa$gmail,com>
+
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+%define real_name Log-Dispatch-Config
+
+Summary: Perl module that implements Log4j
+Name: perl-Log-Dispatch-Config
+Version: 1.01
+Release: 1
+License: Artistic
+Group: Applications/CPAN
+URL: http://search.cpan.org/dist/Log-Dispatch-Config/
+
+Source: http://www.cpan.org/modules/by-module/Log/Log-Dispatch-Config-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+BuildRequires: perl
+
+%description
+Log-Dispatch-Config is a Perl module that implements Log4j.
+
+%prep
+%setup -n %{real_name}-%{version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%makeinstall
+
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc Changes MANIFEST README
+%doc %{_mandir}/man3/Log::Dispatch::Config.3pm*
+%doc %{_mandir}/man3/Log::Dispatch::Configurator.3pm*
+%doc %{_mandir}/man3/Log::Dispatch::Configurator::AppConfig.3pm*
+%dir %{perl_vendorlib}/Log/
+%dir %{perl_vendorlib}/Log/Dispatch/
+%{perl_vendorlib}/Log/Dispatch/Config.pm
+%{perl_vendorlib}/Log/Dispatch/Configurator.pm
+%dir %{perl_vendorlib}/Log/Dispatch/Configurator/
+%{perl_vendorlib}/Log/Dispatch/Configurator/AppConfig.pm
+
+%changelog
+* Thu May 03 2007 Dag Wieers <dag at wieers.com> - 1.01-1
+- Initial package. (using DAR)


Property changes on: trunk/rpms/perl-Log-Dispatch-Config/perl-Log-Dispatch-Config.spec
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: trunk/rpms/python-imaging/python-imaging.spec
===================================================================
--- trunk/rpms/python-imaging/python-imaging.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/python-imaging/python-imaging.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -8,7 +8,7 @@
 
 Summary: Python's own image processing library
 Name: python-imaging
-Version: 1.1.5
+Version: 1.1.6
 Release: 1
 License: Distributable
 Group: Development/Libraries
@@ -40,21 +40,30 @@
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
 
+### Clean up buildroot
+for script in %{buildroot}%{_bindir}/*.py; do
+	%{__mv} -f $script %{buildroot}%{_bindir}/$(basename $script .py)
+done
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES* CONTENTS Images/ README Sane/ Scripts/
-%{_bindir}/pilconvert.py
-%{_bindir}/pildriver.py
-%{_bindir}/pilfile.py
-%{_bindir}/pilfont.py
-%{_bindir}/pilprint.py
+%{_bindir}/pilconvert
+%{_bindir}/pildriver
+%{_bindir}/pilfile
+%{_bindir}/pilfont
+%{_bindir}/pilprint
 %{python_sitearch}/PIL.pth
 %{python_sitearch}/PIL/
 
 %changelog
+* Thu May 31 2007 Dag Wieers <dag at wieers.com> - 1.1.6-1
+- Updated to release 1.1.6.
+- Rename the python scripts in %%{_bindir} without .py.
+
 * Mon Aug 14 2006 Dag Wieers <dag at wieers.com> - 1.1.5-1
 - Updated to release 1.1.5.
 

Modified: trunk/rpms/shntool/shntool.spec
===================================================================
--- trunk/rpms/shntool/shntool.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/shntool/shntool.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -3,7 +3,7 @@
 
 Summary: Multi-purpose WAVE data processing and reporting utility
 Name: shntool
-Version: 3.0.2
+Version: 3.0.3
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -44,6 +44,8 @@
 %{_bindir}/shnconv
 %{_bindir}/shncue
 %{_bindir}/shnfix
+%{_bindir}/shngen
+%{_bindir}/shnhash
 %{_bindir}/shninfo
 %{_bindir}/shnjoin
 %{_bindir}/shnlen
@@ -52,8 +54,12 @@
 %{_bindir}/shnsplit
 %{_bindir}/shnstrip
 %{_bindir}/shntool
+%{_bindir}/shntrim
 
 %changelog
+* Fri Jun 01 2007 Dag Wieers <dag at wieers.com> - 3.0.3-1
+- Updated to release 3.0.3.
+
 * Mon Feb 19 2007 Dag Wieers <dag at wieers.com> - 3.0.2-1
 - Updated to release 3.0.2.
 

Modified: trunk/rpms/sketch/sketch.spec
===================================================================
--- trunk/rpms/sketch/sketch.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/sketch/sketch.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -12,7 +12,7 @@
 Source: http://dl.sf.net/sketch/sketch-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: python-imaging-devel >= 1.1, python-devel, python
+BuildRequires: python-imaging >= 1.1, python-devel, python
 BuildRequires: tcl-devel, tk-devel
 Requires: python >= 1.5.1, python-imaging >= 1.1
 
@@ -23,10 +23,10 @@
 
 %prep
 %setup
-mv Pax/README Pax/README.pax
-mv Pax/COPYING Pax/COPYING.pax
-mv Filter/COPYING Filter/COPYING.filter
-mv Filter/README Filter/README.filter
+%{__mv} -vf Pax/README Pax/README.pax
+%{__mv} -vf Pax/COPYING Pax/COPYING.pax
+%{__mv} -vf Filter/COPYING Filter/COPYING.filter
+%{__mv} -vf Filter/README Filter/README.filter
 
 %build
 ./setup.py configure --with-nls
@@ -54,9 +54,6 @@
 %{_bindir}/skshow
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.6.14-1.2
-- Rebuild for Fedora Core 5.
-
 * Sat Jan 04 2003 Dag Wieers <dag at wieers.com> - 0.6.14-1
 - Updated to 0.6.14.
 

Modified: trunk/rpms/xmame/xmame.spec
===================================================================
--- trunk/rpms/xmame/xmame.spec	2007-06-01 19:43:59 UTC (rev 5467)
+++ trunk/rpms/xmame/xmame.spec	2007-06-03 00:10:22 UTC (rev 5468)
@@ -10,14 +10,16 @@
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
+%{?el5:%define _without_glide3 1}
 %{?el4:%define _without_glide3 1}
+%{?el3:%define _without_glide3 1}
+%{?el2:%define _without_glide3 1}
+
 %{?fc1:%define _without_alsa 1}
 %{?el3:%define _without_alsa 1}
-%{?el3:%define _without_glide3 1}
 %{?rh9:%define _without_alsa 1}
 %{?rh7:%define _without_alsa 1}
 %{?el2:%define _without_alsa 1}
-%{?el2:%define _without_glide3 1}
 
 #define rcver cvs
 %define targets %{?!_without_mame:mame} %{?!_without_mess:mess}

