[svn] r3070 - in trunk/rpms: dansguardian ifplugd oorexx perl-RPM-Specfile perl-Template-Toolkit spamassassin zvbi

svn-commits at lists.rpmforge.net svn-commits at lists.rpmforge.net
Fri Apr 1 14:38:45 CEST 2005


Author: dag
Date: 2005-04-01 14:38:40 +0200 (Fri, 01 Apr 2005)
New Revision: 3070

Modified:
   trunk/rpms/dansguardian/dansguardian.spec
   trunk/rpms/ifplugd/ifplugd.spec
   trunk/rpms/oorexx/oorexx.spec
   trunk/rpms/perl-RPM-Specfile/perl-RPM-Specfile.spec
   trunk/rpms/perl-Template-Toolkit/perl-Template-Toolkit.spec
   trunk/rpms/spamassassin/spamassassin.spec
   trunk/rpms/zvbi/zvbi.spec
Log:
Updates

Modified: trunk/rpms/dansguardian/dansguardian.spec
===================================================================
--- trunk/rpms/dansguardian/dansguardian.spec	2005-03-31 20:11:24 UTC (rev 3069)
+++ trunk/rpms/dansguardian/dansguardian.spec	2005-04-01 12:38:40 UTC (rev 3070)
@@ -6,7 +6,7 @@
 
 Summary: Content filtering web proxy
 Name: dansguardian
-Version: 2.8.0.2
+Version: 2.8.0.4
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -27,7 +27,6 @@
 %prep
 %setup
 
-
 ### FIXME: Add a default dansguardian.httpd for Apache. (Please fix upstream)
 %{__cat} <<EOF >dansguardian.httpd
 ### You may need to include conf.d/dansguardian.conf to make it work.
@@ -201,6 +200,9 @@
 %{_localstatedir}/log/dansguardian/
 
 %changelog
+* Thu Mar 31 2005 Dag Wieers <dag at wieers.com> - 2.8.0.4-1
+- Updated to release 2.8.0.4.
+
 * Fri Jul 30 2004 Dag Wieers <dag at wieers.com> - 2.8.0.2-1
 - Updated to release 2.8.0.2.
 

Modified: trunk/rpms/ifplugd/ifplugd.spec
===================================================================
--- trunk/rpms/ifplugd/ifplugd.spec	2005-03-31 20:11:24 UTC (rev 3069)
+++ trunk/rpms/ifplugd/ifplugd.spec	2005-04-01 12:38:40 UTC (rev 3070)
@@ -7,7 +7,7 @@
 
 Summary: Activates network interfaces on cable plug
 Name: ifplugd
-Version: 0.26
+Version: 0.27
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -66,6 +66,9 @@
 %{_sbindir}/ifplug*
 
 %changelog
+* Thu Mar 31 2005 Dag Wieers <dag at wieers.com> - 0.27-1
+- Updated to release 0.27.
+
 * Mon Dec 20 2004 Dag Wieers <dag at wieers.com> - 0.26-1
 - Updated to release 0.26.
 

Modified: trunk/rpms/oorexx/oorexx.spec
===================================================================
--- trunk/rpms/oorexx/oorexx.spec	2005-03-31 20:11:24 UTC (rev 3069)
+++ trunk/rpms/oorexx/oorexx.spec	2005-04-01 12:38:40 UTC (rev 3070)
@@ -1,5 +1,6 @@
 # $Id$
 # Authority: dag
+# Upstream: <oorexx-devel$lists,sourceforge,net>
 
 %define real_name ooRexx
 

Modified: trunk/rpms/perl-RPM-Specfile/perl-RPM-Specfile.spec
===================================================================
--- trunk/rpms/perl-RPM-Specfile/perl-RPM-Specfile.spec	2005-03-31 20:11:24 UTC (rev 3069)
+++ trunk/rpms/perl-RPM-Specfile/perl-RPM-Specfile.spec	2005-04-01 12:38:40 UTC (rev 3070)
@@ -1,6 +1,6 @@
 # $Id$
 # Authority: matthias
-# ExcludeDist: fc2
+# ExclusiveDist: el2 rh7 rh9 el3 fc1
 
 Summary: Perl module for creating rpm packages of other perl modules
 Name: perl-RPM-Specfile

Modified: trunk/rpms/perl-Template-Toolkit/perl-Template-Toolkit.spec
===================================================================
--- trunk/rpms/perl-Template-Toolkit/perl-Template-Toolkit.spec	2005-03-31 20:11:24 UTC (rev 3069)
+++ trunk/rpms/perl-Template-Toolkit/perl-Template-Toolkit.spec	2005-04-01 12:38:40 UTC (rev 3070)
@@ -35,22 +35,20 @@
 %build
 %{__perl} Makefile.PL TT_DBI=n TT_XS_ENABLE=y TT_ACCEPT=y INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
 %{__make} %{?_smp_mflags} \
-	TT_PREFIX=/usr/share/tt2
+	TT_PREFIX="%{_datadir}/tt2"
 
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall \
-	DESTDIR=%{buildroot} \
-	TT_PREFIX=%{buildroot}/usr/share/tt2
-#	PREFIX=%{buildroot}/usr \
+	PREFIX="%{buildroot}%{_prefix}" \
+	TT_PREFIX="%{buildroot}%{_datadir}/tt2"
 #	PERLPREFIX=%{buildroot}/usr \
 #	SITEPREFIX=%{buildroot}/usr \
 #	VENDORPREFIX=%{buildroot}/usr \
 
-
 ### Clean up buildroot
 %{__rm} -rf %{buildroot}%{perl_archlib} \
-		%{buildroot}%{perl_vendorarch}
+		%{buildroot}%{perl_vendorarch}/auto/*{,/*{,/*}}/.packlist
 
 %clean
 %{__rm} -rf %{buildroot}

Modified: trunk/rpms/spamassassin/spamassassin.spec
===================================================================
--- trunk/rpms/spamassassin/spamassassin.spec	2005-03-31 20:11:24 UTC (rev 3069)
+++ trunk/rpms/spamassassin/spamassassin.spec	2005-04-01 12:38:40 UTC (rev 3070)
@@ -3,6 +3,10 @@
 
 # ExcludeDist: fc3 el4
 
+%{?rh8:%define _with_perl_5_6 1}
+%{?rh7:%define _with_perl_5_6 1}
+%{?el2:%define _with_perl_5_6 1}
+
 %define perl_vendorlib  %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
 %define perl_vendorarch  %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
@@ -11,17 +15,12 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.0.2
-Release: 1
+Release: 2
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 
 Source: http://www.apache.org/dist/spamassassin/Mail-SpamAssassin-%{version}.tar.bz2
-Source2: redhat_local.cf
-Source3: spamassassin-default.rc
-Source4: spamassassin-spamc.rc
-Source5: spamassassin.sysconfig
-Source10: spamassassin-helper.sh
 Source99: filter-requires-spamassassin.sh
 Patch3: spamassassin-3.0.2-krb5-backcompat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -65,11 +64,44 @@
 %setup -n %{real_name}-%{version}
 %patch3 -p0
 
+%{__cat} <<EOF >local.cf		### SOURCE2
+# These values can be overridden by editing ~/.spamassassin/user_prefs.cf 
+# (see spamassassin(1) for details)
+
+# These should be safe assumptions and allow for simple visual sifting
+# without risking lost emails.
+
+required_hits 5
+report_safe 0
+rewrite_header Subject [SPAM]
+EOF
+
+%{__cat} <<EOF >spamassassin-default.rc	### SOURCE3
+### send mail through spamassassin
+:0fw
+| /usr/bin/spamassassin
+EOF
+
+%{__cat} <<EOF >spamassassin-spamc.rc	### SOURCE4
+# send mail through spamassassin
+:0fw
+| /usr/bin/spamc
+EOF
+
+%{__cat} <<EOF >spamassassin.sysconfig		### SOURCE5
+# Options to spamd
+SPAMDOPTIONS="-d -c -m5 -H"
+EOF
+
+%{__cat} <<EOF >spamassassin-helper.sh		### SOURCE10
+#!/bin/sh
+/usr/bin/spamassassin -e
+EOF
+
 %build
 export CFLAGS="%{optflags} -fPIC"
-
 %{__perl} Makefile.PL \
-		PREFIX="%{buildroot}%{_prefix}" \
+%{!?_with_perl_5_6:DESTDIR="%{buildroot}"} \
 		SYSCONFDIR="%{_sysconfdir}" \
 		INSTALLDIRS="vendor" \
 		ENABLE_SSL="yes" </dev/null
@@ -81,6 +113,7 @@
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall \
+	PREFIX="%{buildroot}%{_prefix}" \
 	INSTALLMAN1DIR="%{buildroot}%{_mandir}/man1" \
 	INSTALLMAN3DIR="%{buildroot}%{_mandir}/man3" \
 	LOCAL_RULES_DIR="%{buildroot}%{_sysconfdir}/mail/spamassassin"
@@ -89,11 +122,11 @@
 %{__install} -Dp -m0644 spamc/libspamc.so %{buildroot}%{_libdir}/libspamc.so
 %{__install} -Dp -m0644 spamc/libspamc.h %{buildroot}%{_includedir}/libspamc.h
 
-%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/mail/spamassassin/local.cf
-%{__install} -Dp -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/spamassassin
-%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/mail/spamassassin/spamassassin-default.rc
-%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/mail/spamassassin/spamassassin-spamc.rc
-%{__install} -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/mail/spamassassin/spamassassin-helper.sh
+%{__install} -Dp -m0644 local.cf %{buildroot}%{_sysconfdir}/mail/spamassassin/local.cf
+%{__install} -Dp -m0644 spamassassin.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamassassin
+%{__install} -Dp -m0644 spamassassin-default.rc %{buildroot}%{_sysconfdir}/mail/spamassassin/spamassassin-default.rc
+%{__install} -Dp -m0644 spamassassin-spamc.rc %{buildroot}%{_sysconfdir}/mail/spamassassin/spamassassin-spamc.rc
+%{__install} -Dp -m0644 spamassassin-helper.sh %{buildroot}%{_sysconfdir}/mail/spamassassin/spamassassin-helper.sh
 
 ### Clean up buildroot
 %{__rm} -rf %{buildroot}%{perl_archlib}
@@ -148,6 +181,10 @@
 %doc sql/ tools/ masses/ contrib/
 
 %changelog
+* Thu Mar 31 2005 Dag Wieers <dag at wieers.com> - 3.0.2-2
+- Removed accidental %%{buildroot} from scripts. (Robert Evans)
+- Reinserted perl(Mail::SpamAssassin) provides. (Josh Kelley)
+
 * Fri Mar 25 2005 Dag Wieers <dag at wieers.com> - 3.0.2-1
 - Updated to release 3.0.2.
 

Modified: trunk/rpms/zvbi/zvbi.spec
===================================================================
--- trunk/rpms/zvbi/zvbi.spec	2005-03-31 20:11:24 UTC (rev 3069)
+++ trunk/rpms/zvbi/zvbi.spec	2005-04-01 12:38:40 UTC (rev 3070)
@@ -3,7 +3,7 @@
 
 Summary: Raw VBI, Teletext and Closed Caption decoding library
 Name: zvbi
-Version: 0.2.13
+Version: 0.2.15
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Mar 31 2005 Dag Wieers <dag at wieers.com> - 0.2.15-1
+- Updated to release 0.2.15.
+
 * Sun Feb 20 2005 Matthias Saou <http://freshrpms.net/> 0.2.13-1
 - Update to 0.2.13.
 - Added X and libpng build requirements.




More information about the commits mailing list