Hello community, here is the log from the commit of package amavisd-new for openSUSE:12.1 checked in at 2011-10-27 13:47:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/amavisd-new (Old) and /work/SRC/openSUSE:12.1/.amavisd-new.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amavisd-new", Maintainer is "varkoly@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/amavisd-new/amavisd-new.changes 2011-10-24 12:27:09.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.amavisd-new.new/amavisd-new.changes 2011-10-28 15:35:48.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Oct 26 08:58:10 UTC 2011 - wr@rosenauer.org + +- obsolete amavisd-milter package + +------------------------------------------------------------------- +Thu Oct 13 13:11:20 UTC 2011 - varkoly@suse.com + +- Integrate amavisd-milter + +------------------------------------------------------------------- New: ---- amavisd-milter.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.iAigwy/_old 2011-10-28 15:35:48.000000000 +0200 +++ /var/tmp/diff_new_pack.iAigwy/_new 2011-10-28 15:35:48.000000000 +0200 @@ -31,7 +31,6 @@ Requires: perl-Convert-TNEF perl-Archive-Zip perl-Net-Server perl-spamassassin Requires: perl-BerkeleyDB perl-Mail-DKIM Requires: smtp_daemon -Requires: amavisd-milter %if 0%{?suse_version} < 1120 Requires: lha %endif @@ -42,13 +41,16 @@ Recommends: perl-Authen-SASL Recommends: perl-Mail-ClamAV Recommends: %{name}-docs = %{version} +Provides: amavisd-milter = 1.5.0 +Obsoletes: amavisd-milter <= 1.5.0 PreReq: coreutils net-tools sed pwdutils PreReq: %insserv_prereq PreReq: util-linux Source0: amavisd-new.tar.bz2 Source1: sysconfig.amavis Source2: rc.amavis -Source5: amavisd-new-rpmlintrc +Source3: amavisd-new-rpmlintrc +Source4: amavisd-milter.tar.bz2 Patch1: activate_virus_scanner.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define avspool /var/spool/amavis @@ -65,11 +67,10 @@ following MTAs: - postfix - - sendmail (sendmail-milter) - - exim + %package docs Summary: Documentation for the High-Performance E-Mail Virus Scanner Group: Documentation/Other @@ -84,11 +85,13 @@ This package contains the documentation and Relase-Notes. %prep -%setup -q +%setup -q -a 4 %patch1 -for i in $(ls amavisd*); do +for i in $(find -maxdepth 1 -name "amavisd*" | sed s#./##); do + if [[ $i == *patch ]] ; then continue; fi if [[ $i == *patch ]] ; then continue; fi if [[ $i == *spec ]] ; then continue; fi + if [[ $i == amavisd-milter ]] ; then continue; fi sed -i "s|\$daemon_user = 'vscan';|\$daemon_user = '%{avuser}';|g; \ s|\$daemon_group = 'vscan';|\$daemon_group = '%{avgroup}';|g; \ s|^# \$MYHOME =.*|\$MYHOME = '%{avspool}';|g; \ @@ -97,9 +100,14 @@ s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g; \ s|/var/run/clamav/clamd|/var/lib/clamav/clamd-socket|g" $i done + # --------------------------------------------------------------------------- %build +cd amavisd-milter +%configure --localstatedir="/var/spool/amavis" +make + # --------------------------------------------------------------------------- %install @@ -123,6 +131,8 @@ ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis install -m 644 LDAP.schema $RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm +cd amavisd-milter +make install DESTDIR="$RPM_BUILD_ROOT" %pre /usr/sbin/groupadd -r %{avgroup} 2> /dev/null || : @@ -178,12 +188,13 @@ %dir %{avquarantine} %files docs -%defattr(-,root,root) +%defattr(0644,root,root,0755) %doc RELEASE_NOTES %doc README_FILES %doc test-messages %doc amavisd.conf-* %doc MANIFEST TODO %doc test-messages +%doc %{_mandir}/man8/amavisd-milter* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org