[svn] r6135 - in trunk/rpms: amavisd-new autocutsel drupal5 freedup mpg123 nload ocaml perl-MIME-tools perl-XML-SAX shake syslinux unison

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Feb 6 23:04:35 CET 2008 

Author: dag
Date: 2008-02-06 23:04:28 +0100 (Wed, 06 Feb 2008)
New Revision: 6135

Modified:
   trunk/rpms/amavisd-new/amavisd-new.spec
   trunk/rpms/autocutsel/autocutsel.spec
   trunk/rpms/drupal5/drupal5.spec
   trunk/rpms/freedup/freedup.spec
   trunk/rpms/mpg123/mpg123.spec
   trunk/rpms/nload/nload.spec
   trunk/rpms/ocaml/ocaml.spec
   trunk/rpms/perl-MIME-tools/perl-MIME-tools.spec
   trunk/rpms/perl-XML-SAX/perl-XML-SAX.spec
   trunk/rpms/shake/shake.spec
   trunk/rpms/syslinux/syslinux.spec
   trunk/rpms/unison/unison.spec
Log:
Updates

Modified: trunk/rpms/amavisd-new/amavisd-new.spec
===================================================================
--- trunk/rpms/amavisd-new/amavisd-new.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/amavisd-new/amavisd-new.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -12,7 +12,7 @@
 Summary: Mail virus-scanner
 Name: amavisd-new
 Version: 2.5.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.ijs.si/software/amavisd/
@@ -34,6 +34,8 @@
 Requires: perl(Net::Cmd) >= 2.24
 
 Obsoletes: amavisd
+Obsoletes: amavisd-new-utils <= %{version}-%{release}
+Provides: amavisd-new-utils = %{version}-%{release}
 
 %description
 AMaViS is a program that interfaces a mail transfer agent (MTA) with
@@ -72,6 +74,18 @@
 /usr/sbin/tmpwatch 720 %{_localstatedir}/virusmails/
 EOF
 
+%{__perl} -pi.orig -e '
+        s|^(my\(\$db_home\))\s*=.*$|$1 = "%{_localstatedir}/amavis/db";|;
+    ' amavisd-nanny
+
+%{__perl} -pi.orig -e '
+        s|/var/amavis/db|%{_localstatedir}/amavis/db|;
+    ' amavisd-agent
+
+%{__perl} -pi.orig -e '
+        s|^(\s\$socketname)\s*=.*$|$1 = "%{_localstatedir}/amavis/amavisd.sock";|;
+    ' amavisd-release
+
 %{__cat} <<'EOF' >amavisd.sysconfig
 ### Uncomment this if you want to use amavis with sendmail milter interface.
 ### See README.milter for details.
@@ -227,6 +241,10 @@
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/amavis/{db,tmp,var}/
 
 %{__install} -Dp -m0755 amavisd %{buildroot}%{_sbindir}/amavisd
+%{__install} -Dp -m0755 amavisd-agent %{buildroot}%{_sbindir}/amavisd-agent
+%{__install} -Dp -m0755 amavisd-nanny %{buildroot}%{_sbindir}/amavisd-nanny
+%{__install} -Dp -m0755 amavisd-release %{buildroot}%{_sbindir}/amavisd-release
+%{__install} -Dp -m0755 p0f-analyzer.pl %{buildroot}%{_sbindir}/p0f-analyzer
 %{__install} -Dp -m0755 amavisd.sysv %{buildroot}%{_initrddir}/amavisd
 %{__install} -Dp -m0700 amavisd.conf %{buildroot}%{_sysconfdir}/amavisd.conf
 %{__install} -Dp -m0644 LDAP.schema %{buildroot}%{_sysconfdir}/openldap/schema/amavisd-new.schema
@@ -294,6 +312,10 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/amavisd
 %config(noreplace) %{_sysconfdir}/cron.daily/amavisd
 %{_sbindir}/amavisd
+%{_sbindir}/amavisd-agent
+%{_sbindir}/amavisd-nanny
+%{_sbindir}/amavisd-release
+%{_sbindir}/p0f-analyzer
 
 %defattr(0640, root, amavis, 0755)
 %config(noreplace) %{_sysconfdir}/amavisd.conf
@@ -313,6 +335,9 @@
 %{_sbindir}/amavis-milter
 
 %changelog
+* Mon Jan 28 2008 Dag Wieers <dag at wieers.com> - 2.5.3-2
+- Added missing amavisd helper-utils. (Ralph Angenendt)
+
 * Mon Dec 31 2007 Dag Wieers <dag at wieers.com> - 2.5.3-1
 - Updated to release 2.5.3.
 

Modified: trunk/rpms/autocutsel/autocutsel.spec
===================================================================
--- trunk/rpms/autocutsel/autocutsel.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/autocutsel/autocutsel.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -17,7 +17,7 @@
 Group: Applications/System
 URL: http://www.nongnu.org/autocutsel/
 
-Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
+Source: http://savannah.nongnu.org/download/autocutsel/autocutsel-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %{!?_without_modxorg:BuildRequires: libX11-devel, libXaw-devel, libXext-devel, libXt-devel}
@@ -46,7 +46,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/autocutsel
 %{_bindir}/cutsel
 

Modified: trunk/rpms/drupal5/drupal5.spec
===================================================================
--- trunk/rpms/drupal5/drupal5.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/drupal5/drupal5.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -5,7 +5,7 @@
 
 Summary: Drupal CMS
 Name: drupal5
-Version: 5.6
+Version: 5.7
 Release: 1
 License: GPL
 Group: Development/Languages
@@ -57,6 +57,9 @@
 %{_localstatedir}/www/drupal-%{version}/
 
 %changelog
+* Mon Feb 04 2008 Dag Wieers <dag at wieers.com> - 5.7-1
+- Updated to release 5.7.
+
 * Mon Jan 14 2008 Dag Wieers <dag at wieers.com> - 5.6-1
 - Updated to release 5.6.
 

Modified: trunk/rpms/freedup/freedup.spec
===================================================================
--- trunk/rpms/freedup/freedup.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/freedup/freedup.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -3,8 +3,8 @@
 
 Summary: Reclaim space on your drive
 Name: freedup
-%define real_version 1.4-3
-Version: 1.4.3
+%define real_version 1.5-1
+Version: 1.5.1
 Release: 1
 License: GPL
 Group: Applications/File
@@ -24,7 +24,7 @@
 content.
 
 %prep
-%setup -n %{name}-1.4
+%setup -n %{name}-1.5
 
 %build
 %{__make} %{?_smp_mflags} freedup
@@ -44,6 +44,9 @@
 %{_bindir}/freedup
 
 %changelog
+* Sun Feb 03 2008 Dag Wieers <dag at wieers.com> - 1.5.1-1
+- Updated to release 1.5-1.
+
 * Fri Dec 28 2007 Dag Wieers <dag at wieers.com> - 1.4.3-1
 - Updated to release 1.4-3.
 

Modified: trunk/rpms/mpg123/mpg123.spec
===================================================================
--- trunk/rpms/mpg123/mpg123.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/mpg123/mpg123.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -1,7 +1,7 @@
 # $Id$
 # Authority: dag
 
-%{!?audio:%define audio alsa}
+%{!?audio:%define audio alsa esd oss sdl}
 
 %{?dtag: %{expand: %%define %dtag 1}}
 
@@ -17,22 +17,22 @@
 %{?fc2:%define _without_jack 1}
 %{?fc2:%define _without_nas 1}
 
-%{?fc1:%define audio esd}
+%{?fc1:%define audio esd oss}
 %{?fc1:%define _without_alsa 1}
 %{?fc1:%define _without_jack 1}
 %{?fc1:%define _without_nas 1}
 
-%{?el3:%define audio esd}
+%{?el3:%define audio esd oss sdl}
 %{?el3:%define _without_alsa 1}
 %{?el3:%define _without_jack 1}
 %{?el3:%define _without_nas 1}
 
-%{?rh9:%define audio esd}
+%{?rh9:%define audio esd oss sdl}
 %{?rh9:%define _without_alsa 1}
 %{?rh9:%define _without_jack 1}
 %{?rh9:%define _without_nas 1}
 
-%{?rh7:%define audio esd}
+%{?rh7:%define audio esd oss sdl}
 %{?rh7:%define _without_alsa 1}
 %{?rh7:%define _without_jack 1}
 %{?rh7:%define _without_nas 1}
@@ -45,7 +45,7 @@
 
 Summary: MPEG audio player
 Name: mpg123
-Version: 1.1.0
+Version: 1.2.0
 Release: 1
 License: GPL/LGPL
 Group: Applications/Multimedia
@@ -84,6 +84,8 @@
 %setup
 
 %build
+export SDL_CFLAGS="$(sdl-config --cflags)"
+export SDL_LIBS="$(sdl-config --libs)"
 %configure \
     --program-prefix="%{?_program_prefix}" \
     --enable-gapless="yes" \
@@ -100,11 +102,11 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING NEWS README doc/
+%doc %{_mandir}/man1/mpg123.1*
 %{_bindir}/mpg123
-%{_mandir}/man1/mpg123.1*
 %{_libdir}/libmpg123.so.*
 %{_libdir}/mpg123/
-%exclude %{_libdir}/mpg123/*.la
+#exclude %{_libdir}/mpg123/*.la
 
 %files devel
 %defattr(-, root, root, 0755)
@@ -114,6 +116,9 @@
 %exclude %{_libdir}/libmpg123.la
 
 %changelog
+* Sun Feb 03 2008 Dag Wieers <dag at wieers.com> - 1.2.0-1
+- Updated to release 1.2.0.
+
 * Fri Jan 18 2008 Dag Wieers <dag at wieers.com> - 1.1.0-1
 - Updated to release 1.1.0.
 

Modified: trunk/rpms/nload/nload.spec
===================================================================
--- trunk/rpms/nload/nload.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/nload/nload.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -41,11 +41,8 @@
 %{_bindir}/nload
 
 %changelog
-* Sun Jan  3 2008 Dries Verachtert <dries at ulyssis.org> - 0.7.0-1
+* Sun Feb 03 2008 Dag Wieers <dag at wieers.com> - 0.7.0-1
 - Updated to release 0.7.0.
 
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.6.0-1.2
-- Rebuild for Fedora Core 5.
-
 * Fri Jan 27 2006 Dag Wieers <dag at wieers.com> - 0.6.0-1
 - Initial package. (using DAR)

Modified: trunk/rpms/ocaml/ocaml.spec
===================================================================
--- trunk/rpms/ocaml/ocaml.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/ocaml/ocaml.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -40,7 +40,7 @@
 %{?_without_modxorg:BuildRequires: XFree86-devel}
 %{!?_without_tcltk_devel:BuildRequires: tcl-devel >= 8.3, tk-devel}
 %{?_without_tcltk_devel:BuildRequires: tcl >= 8.3, tk}
-Obsoletes: ocaml-ocamldoc, labltk, camlp4
+Obsoletes: ocaml-ocamldoc <= %{version}-%{release}
 
 %description
 Objective Caml is the latest implementation of the Caml dialect of ML. It
@@ -54,7 +54,7 @@
 Summary: Tk bindings for Objective Caml
 Group: Development/Languages
 Requires: ocaml = %{version}-%{release}
-Obsoletes: labltk <= %{version}
+Obsoletes: labltk <= %{version}-%{release}
 
 %description labltk
 A library for interfacing Objective Caml with the scripting language
@@ -64,7 +64,7 @@
 Group: Development/Languages
 Summary: Pre-Processor-Pretty-Printer for OCaml
 Requires: ocaml = %{version}-%{release}
-Obsoletes: camlp4 <= %{version}
+Obsoletes: camlp4 <= %{version}-%{release}
 
 %description camlp4
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
@@ -86,12 +86,16 @@
 %{__cp} -v %{SOURCE2} refman.ps.gz
 
 %build
-./configure -verbose -cc "%{__cc} %{optflags}" -with-pthread \
-	-bindir "%{_bindir}" \
-	-libdir "%{_libdir}/ocaml" \
-	-mandir "%{_mandir}" \
-	-prefix "%{_prefix}" \
-	-x11lib "%{_prefix}/X11R6/%{_lib}"
+./configure \
+    -cc "%{__cc} %{optflags}" \
+    -bindir "%{_bindir}" \
+    -libdir "%{_libdir}/ocaml" \
+    -mandir "%{_mandir}" \
+    -prefix "%{_prefix}" \
+    -verbose \
+    -with-pthread \
+%{!?_without_modxorg:-x11lib "%{_libdir}"} \
+%{?_without_modxorg:-x11lib "%{_prefix}/X11/%{_lib}"}
 #%{__make} %{?_smp_mflags} world bootstrap opt opt.opt
 %{__make} world bootstrap opt opt.opt
 %{__make} -C emacs ocamltags
@@ -167,9 +171,6 @@
 %{_datadir}/emacs/site-lisp/*.elc
 
 %changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 3.09.1-1.2
-- Rebuild for Fedora Core 5.
-
 * Wed Jan 04 2006 Dries Verachtert <dries at ulyssis.org> - 3.09.1-1
 - Updated to release 3.09.1.
 

Modified: trunk/rpms/perl-MIME-tools/perl-MIME-tools.spec
===================================================================
--- trunk/rpms/perl-MIME-tools/perl-MIME-tools.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/perl-MIME-tools/perl-MIME-tools.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -4,6 +4,8 @@
 # Upstream: David F. Skoll <dfs$roaringpenguin,com>
 # Upstream: Dave O'Neill <dmo$roaringpenguin,com>
 
+# Tag: test
+
 %{?dtag: %{expand: %%define %dtag 1}}
 
 %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)

Modified: trunk/rpms/perl-XML-SAX/perl-XML-SAX.spec
===================================================================
--- trunk/rpms/perl-XML-SAX/perl-XML-SAX.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/perl-XML-SAX/perl-XML-SAX.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -16,7 +16,6 @@
 URL: http://search.cpan.org/dist/XML-SAX/
 
 Source: http://www.cpan.org/modules/by-module/XML/XML-SAX-%{version}.tar.gz
-Source1: ParserDetails.ini
 #Patch0: perl-XML-SAX-parsers.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -34,8 +33,18 @@
 
 %prep
 %setup -n %{real_name}-%{version}
-#patch
 
+%{__cat} <<EOF >ParserDetails.ini
+[XML::SAX::PurePerl]
+http://xml.org/sax/features/namespaces = 1
+
+[XML::LibXML::SAX::Parser]
+http://xml.org/sax/features/namespaces = 1
+
+[XML::LibXML::SAX]
+http://xml.org/sax/features/namespaces = 1
+EOF
+
 %build
 echo "N" | %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
 %{__make} %{?_smp_mflags}
@@ -44,6 +53,8 @@
 %{__rm} -rf %{buildroot}
 %{__make} pure_install
 
+#%{__install} -Dp -m0644 ParserDetails.ini %{buildroot}%{perl_vendorlib}/XML/SAX/ParserDetails.ini
+
 ### Clean up buildroot
 find %{buildroot} -name .packlist -exec %{__rm} {} \;
 
@@ -53,12 +64,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc Changes LICENSE MANIFEST META.yml README
-%doc %{_mandir}/man3/*.3pm*
+%doc %{_mandir}/man3/XML::SAX.3pm*
+%doc %{_mandir}/man3/XML::SAX*.3pm*
+%dir %{perl_vendorlib}/XML/
+%{perl_vendorlib}/XML/SAX/
 %{perl_vendorlib}/XML/SAX.pm
-%{perl_vendorlib}/XML/SAX/
 
 %changelog
-* Sun Aug 05 2007 Dag Wieers <dag at wieers.com>> - 0.16-1
+* Sun Aug 05 2007 Dag Wieers <dag at wieers.com> - 0.16-1
 - Updated to release 0.16.
 
 * Sun Apr 29 2007 Dries Verachtert <dries at ulyssis.org> - 0.15-1

Modified: trunk/rpms/shake/shake.spec
===================================================================
--- trunk/rpms/shake/shake.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/shake/shake.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -3,7 +3,7 @@
 
 Summary: Userspace filesystem defragmenter
 Name: shake
-Version: 0.26
+Version: 0.30
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -12,10 +12,11 @@
 Source: http://download.savannah.nongnu.org/releases/shake/shake-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires: cmake
 BuildRequires: libattr-devel
 
 %description
- Shake is a defragmenter that runs in userspace, without the need of patching
+Shake is a defragmenter that runs in userspace, without the need of patching
 the kernel and while the systems is used. There is nothing magic in that:
 it just works by rewriting fragmented files. But it has some heuristics that
 could make it more efficient than other tools, including defrag and, maybe,
@@ -25,28 +26,32 @@
 %setup
 
 %build
-%{__make} %{?_smp_mflags}
+cd build/
+cmake ..
 
 %install
 %{__rm} -rf %{buildroot}
-#%{__make} install DESTDIR="%{buildroot}"
-%{__install} -D -m0755 shake %{buildroot}%{_bindir}/shake
-%{__install} -D -m0755 unattr %{buildroot}%{_bindir}/unattr
-%{__install} -D -m0644 doc/shake.8 %{buildroot}%{_mandir}/man8/shake.8
-%{__install} -D -m0644 doc/unattr.8 %{buildroot}%{_mandir}/man8/unattr.8
+%{__make} install DESTDIR="%{buildroot}"
+#%{__install} -D -m0755 shake %{buildroot}%{_bindir}/shake
+#%{__install} -D -m0755 unattr %{buildroot}%{_bindir}/unattr
+#%{__install} -D -m0644 doc/shake.8 %{buildroot}%{_mandir}/man8/shake.8
+#%{__install} -D -m0644 doc/unattr.8 %{buildroot}%{_mandir}/man8/unattr.8
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changelog COPYING
+%doc COPYING GPL.txt INSTALL NEWS
 %doc %{_mandir}/man8/shake.8*
 %doc %{_mandir}/man8/unattr.8*
 %{_bindir}/shake
 %{_bindir}/unattr
 
 %changelog
+* Sun Feb 03 2008 Dag Wieers <dag at wieers.com> - 0.30-1
+- Updated to release 0.30.
+
 * Tue Aug 29 2006 Dag Wieers <dag at wieers.com> - 0.26-1
 - Updated to release 0.26.
 

Modified: trunk/rpms/syslinux/syslinux.spec
===================================================================
--- trunk/rpms/syslinux/syslinux.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/syslinux/syslinux.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -8,13 +8,14 @@
 
 Summary: Kernel bootloader for FAT or ISO9660 filesystems or PXE networks
 Name: syslinux
-Version: 3.60
+Version: 3.61
 Release: 1
 License: GPL
 Group: Applications/System
 URL: http://syslinux.zytor.com/
 
 Source: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/syslinux-%{version}.tar.bz2
+Patch0: syslinux-3.61-extlinux.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 ExclusiveArch: i386 x86_64
@@ -32,6 +33,7 @@
 
 %prep
 %setup
+%patch0 -p0
 
 %build
 export CFLAGS="-Werror -Wno-unused -finline-limit=2000"
@@ -74,6 +76,9 @@
 %{_sbindir}/extlinux
 
 %changelog
+* Mon Feb 04 2008 Dag Wieers <dag at wieers.com> - 3.61-1
+- Updated to release 3.61.
+
 * Fri Jan 18 2008 Dag Wieers <dag at wieers.com> - 3.60-1
 - Updated to release 3.60.
 

Modified: trunk/rpms/unison/unison.spec
===================================================================
--- trunk/rpms/unison/unison.spec	2008-02-05 15:02:47 UTC (rev 6134)
+++ trunk/rpms/unison/unison.spec	2008-02-06 22:04:28 UTC (rev 6135)
@@ -11,8 +11,8 @@
 
 Summary: File-synchronization tool
 Name: unison
-Version: 2.13.16
-Release: 1.2
+Version: 2.27.57
+Release: 1
 License: GPL
 Group: Applications/File
 URL: http://www.cis.upenn.edu/~bcpierce/unison/
@@ -79,6 +79,9 @@
 %{_datadir}/pixmaps/unison.png
 
 %changelog
+* Sun Feb 03 2008 Dag Wieers <dag at wieers.com> - 2.27.57-1
+- Updated to release 2.27.57.
+
 * Fri Dec 02 2005 Dag Wieers <dag at wieers.com> - 2.13.16-1
 - Updated to release 2.13.16.

More information about the svn-commits mailing list