Index: spamassassin.spec
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/spamassassin.spec,v
retrieving revision 1.35
diff -u -p -r1.35 spamassassin.spec
--- spamassassin.spec	6 Jul 2003 19:51:53 -0000	1.35
+++ spamassassin.spec	3 Sep 2003 23:35:19 -0000
@@ -103,21 +103,13 @@ aplikacji do czytania poczty.
 %setup -q -n %{pdir}-%{pnam}-%{real_version}
 
 %build
-%{__perl} Makefile.PL INST_PREFIX=%{_prefix} INST_SYSCONFDIR=%{_sysconfdir} PREFIX=$RPM_BUILD_ROOT/%{_prefix} SYSCONFDIR=$RPM_BUILD_ROOT/%{_sysconfdir} < /dev/null
-# now override the PREFIX setting to not use %buildroot%. MakeMaker
-# does not have a better way to do this, it seems...
-%{__make} PREFIX=%{_prefix}
+%{__perl} Makefile.PL PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} DESTDIR=$RPM_BUILD_ROOT/%{_prefix} < /dev/null
+%{__make}
 %{__make} spamd/libspamc.so
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-%makeinstall PREFIX=%buildroot/%{_prefix} \
-        INSTALLMAN1DIR=%buildroot/%{_mandir}/man1 \
-	INSTALLMAN3DIR=%buildroot/%{_mandir}/man3 \
-	INSTALLSITEMAN1DIR=%buildroot/%{_mandir}/man1 \
-	INSTALLSITEMAN3DIR=%buildroot/%{_mandir}/man3 \
-	INSTALLVENDORMAN1DIR=%buildroot/%{_mandir}/man1 \
-	INSTALLVENDORMAN3DIR=%buildroot/%{_mandir}/man3
+%makeinstall
 install -d %buildroot/%{initdir}
 install -d %buildroot/%{_includedir}
 install -m 0755 spamd/redhat-rc-script.sh %buildroot/%{initdir}/spamassassin
@@ -178,6 +170,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Thu Sep 09 2003 Malte S. Stretz <spamassassin-contrib@msquadrat.de>
+- take advantage of the new simplified build system
+
 * Wed May 28 2003 Theo Van Dinter <felicity@kluge.net> 2.60-1
 - updated to 2.60
 
Index: debian/rules
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/debian/rules,v
retrieving revision 1.9
diff -u -p -r1.9 rules
--- debian/rules	21 Jun 2003 01:25:21 -0000	1.9
+++ debian/rules	3 Sep 2003 23:35:19 -0000
@@ -29,6 +29,9 @@ endif
 
 PERL = /usr/bin/perl
 
+PREFIX     = /usr
+SYSCONFDIR = /etc
+
 packagea = spamc
 packagei = spamassassin
 
@@ -40,13 +43,9 @@ configure-stamp:
 	dh_testdir
 
 	perl Makefile.PL INSTALLDIRS=vendor \
-	 PREFIX=$(CURDIR)/debian/$(packagei)/usr \
-	 VENDORPREFIX=$(CURDIR)/debian/$(packagei)/usr \
-	 SYSCONFDIR=$(CURDIR)/debian/$(packagei)/etc \
-	 INST_PREFIX=/usr INST_SYSCONFDIR=/etc \
-	 PKG_LOCAL_RULES_DIR=$(CURDIR)/debian/$(packagei)/etc/spamassassin \
-	 LOCAL_RULES_DIR=/etc/spamassassin RUN_RAZOR2_TESTS=n \
-	 CONTACT_ADDRESS="the administrator of that system"
+	  PREFIX=$(PREFIX) SYSCONFDIR=$(SYSCONFDIR) \
+	  LOCALRULESDIR=$(SYSCONFDIR)/spamassassin \
+	  DESTDIR=$(CURDIR)/debian/$(packagei) < /dev/null
 
 	touch configure-stamp