--- a/dnsbl.spec.in	Sat Feb 02 12:32:59 2008 -0800
+++ b/dnsbl.spec.in	Tue Mar 04 21:42:51 2008 -0800
@@ -1,17 +1,14 @@
 %define localstatedir   /var/lib
 
-Summary:            @PACKAGE@ Sendmail Milter
+Summary:            Sendmail milter for spam control
 Name:               @PACKAGE@
 Version:            @VERSION@
-Release:            %{?custom_release}%{!?custom_release:1}
-License:            GPL
+Release:            1%{?dist}
+License:            GPLv3+
 Group:              System Environment/Daemons
-Source:             http://www.five-ten-sg.com/@PACKAGE@/packages/@PACKAGE@-@VERSION@.tar.gz
-BuildRoot:          %{_tmppath}/%{name}-%{version}-buildroot
-URL:                http://www.five-ten-sg.com/@PACKAGE@/
-Vendor:             510 Software Group
-Packager:           510 Software Group
-AutoReqProv:        no
+Source:             http://www.five-ten-sg.com/%{name}/packages/%{name}-%{version}.tar.gz
+BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+URL:                http://www.five-ten-sg.com/%{name}/
 
 Requires(pre):          /usr/sbin/useradd
 Requires(pre):          /usr/bin/getent
@@ -22,124 +19,122 @@
 Requires:               sendmail >= 8.12.1
 Requires:               sendmail-cf
 Requires:               spamassassin
-Requires:               libc.so.6, libgcc_s.so.1, libm.so.6, libpthread.so.0, libstdc++.so.6
 
 
 %description
-We present here a mechanism whereby the backup mail server can use the correct set of DNSBLs for each recipient for each message. As a side-effect, it gives us the ability to customize the set of DNSBLs on a per-recipient basis, so that fred@example.com could use LOCAL and the SBL, where all other users @example.com use only the SBL.
+We present here a mechanism whereby the backup mail server can use the
+correct set of DNSBLs for each recipient for each message. As a
+side-effect, it gives us the ability to customize the set of DNSBLs on
+a per-recipient basis, so that fred@example.com could use LOCAL and
+the SBL, where all other users @example.com use only the SBL.
 
-This milter will also decode (base64, mime, html entity, url encodings) and scan for HTTP and HTTPS URLs and bare hostnames in the body of the mail. If any of those host names have A or NS records on the SBL (or a single configurable DNSBL), the mail will be rejected unless previously whitelisted. This milter also counts the number of invalid HTML tags, and can reject mail if that count exceeds your specified limit.
+This milter will also decode (base64, mime, html entity, url
+encodings) and scan for HTTP and HTTPS URLs and bare hostnames in the
+body of the mail. If any of those host names have A or NS records on
+the SBL (or a single configurable DNSBL), the mail will be rejected
+unless previously whitelisted. This milter also counts the number of
+invalid HTML tags, and can reject mail if that count exceeds your
+specified limit.
 
-The DNSBL milter reads a text configuration file (dnsbl.conf) on startup, and whenever the config file (or any of the referenced include files) is changed. The entire configuration file is case insensitive.
+The DNSBL milter reads a text configuration file (dnsbl.conf) on
+startup, and whenever the config file (or any of the referenced
+include files) is changed. The entire configuration file is case
+insensitive.
 
 
 %prep
-
-
-%setup
-
+%setup -q
 
 %build
-./configure --prefix=%{_prefix} \
-    --bindir=%{_bindir} --mandir=%{_mandir} \
-    --localstatedir=%{localstatedir} --libdir=%{_libdir} \
-    --datadir=%{_datadir} --includedir=%{_includedir} \
-    --sysconfdir=%{_sysconfdir}
-make
-
+%configure
+make %{?_smp_mflags}
 
 %install
-if [ "$RPM_BUILD_ROOT" = "/" -o -z "$RPM_BUILD_ROOT" ] ; then
-        echo sorry, you probably do not want me to delete the old buildroot at $RPM_BUILD_ROOT
-        exit 1
-fi
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} libdir=$RPM_BUILD_ROOT%{_libdir} \
-    localstatedir=$RPM_BUILD_ROOT%{localstatedir} \
-    datadir=$RPM_BUILD_ROOT%{_datadir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} install
+make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/@PACKAGE@-@VERSION@
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/@PACKAGE@/@PACKAGE@     $RPM_BUILD_ROOT/etc/rc.d/init.d
-mv AUTHORS COPYING ChangeLog NEWS README                    $RPM_BUILD_ROOT%{_datadir}/doc/@PACKAGE@-@VERSION@
-mkdir -p %{buildroot}/var/run/@PACKAGE@
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/@PACKAGE@/autowhite
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/@PACKAGE@/.spamassassin
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name} $RPM_BUILD_ROOT/etc/rc.d/init.d
+mkdir -p %{buildroot}/var/run/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/autowhite
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/.spamassassin
 
 
 %pre
-/usr/bin/getent passwd @PACKAGE@ >/dev/null || /usr/sbin/useradd -r -d %{_sysconfdir}/@PACKAGE@ -M -c "@PACKAGE@ pseudo-user" -s /sbin/nologin @PACKAGE@ >/dev/null
+/usr/bin/getent passwd %{name} >/dev/null || /usr/sbin/useradd -r -d %{_sysconfdir}/%{name} -M -c "%{name} pseudo-user" -s /sbin/nologin %{name} >/dev/null
 
 
 %post
-/sbin/chkconfig --add @PACKAGE@
-echo Remember to edit %{_sysconfdir}/@PACKAGE@/@PACKAGE@.conf and add the following line to your sendmail.mc:
+/sbin/chkconfig --add %{name}
+echo Remember to edit %{_sysconfdir}/%{name}/%{name}.conf and add the following line to your sendmail.mc:
 echo "INPUT_MAIL_FILTER(\`dnsbl', \`S=local:/var/run/dnsbl/dnsbl.sock, F=T, T=C:30s;S:5m;R:5m;E:5m')"
 echo
 
 
 %preun
-[ $1 = 0 ] && /sbin/service @PACKAGE@ stop || :
+[ $1 = 0 ] && /sbin/service %{name} stop || :
 
 
 %postun
-[ $1 = 0 ] && /sbin/chkconfig --del @PACKAGE@
-[ $1 = 0 ] && userdel @PACKAGE@ || :
+[ $1 = 0 ] && /sbin/chkconfig --del %{name}
+[ $1 = 0 ] && userdel %{name} || :
 
 
 %clean
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_sbindir}/*
-%doc %{_mandir}/*
-%docdir %{_datadir}/doc/@PACKAGE@-@VERSION@
-%{_datadir}/doc/@PACKAGE@-@VERSION@
-%config(noreplace) %{_sysconfdir}/@PACKAGE@
-/etc/rc.d/init.d/@PACKAGE@
-%dir %attr(0750,@PACKAGE@,root) /var/run/@PACKAGE@
-%dir %attr(0750,@PACKAGE@,root) %{_sysconfdir}/@PACKAGE@/autowhite
-%dir %attr(0750,@PACKAGE@,root) %{_sysconfdir}/@PACKAGE@/.spamassassin
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%doc AUTHORS COPYING ChangeLog NEWS README
+%docdir %{_datadir}/doc/%{name}-%{version}
+%{_datadir}/doc/%{name}-%{version}
+%config(noreplace) %{_sysconfdir}/%{name}
+/etc/rc.d/init.d/%{name}
+%dir %attr(0750,%{name},root) /var/run/%{name}
+%dir %attr(0750,%{name},root) %{_sysconfdir}/%{name}/autowhite
+%dir %attr(0750,%{name},root) %{_sysconfdir}/%{name}/.spamassassin
 
 
 %changelog
-* Thu Aug 30 2007 Carl Byington 6.07
+* Tue Mar 04 2008 Carl Byington <carl@five-ten-sg.com> - 6.17
+- changes for Fedora packaging guidelines
+
+* Thu Aug 30 2007 Carl Byington <carl@five-ten-sg.com> - 6.07
 - Add generic rdns filtering, fix pre/post scripts
 
-* Sun Aug 26 2007 Carl Byington 6.04
+* Sun Aug 26 2007 Carl Byington <carl@five-ten-sg.com> - 6.04
 - require spamassassin
 
-* Sat Jul 07 2007 Carl Byington 6.01
+* Sat Jul 07 2007 Carl Byington <carl@five-ten-sg.com> - 6.01
 - GPL3, auto whitelisting
 
-* Wed Aug 02 2006 Carl Byington 5.20
+* Wed Aug 02 2006 Carl Byington <carl@five-ten-sg.com> - 5.20
 - http://www.rpm.org/max-rpm/s1-rpm-inside-scripts.html help with postun
 
-* Thu Mar 16 2006 Carl Byington 5.16
-- use @PACKAGE@ in more places
+* Thu Mar 16 2006 Carl Byington <carl@five-ten-sg.com> - 5.16
+- use %{name} in more places
 
-* Fri Mar 10 2006 Carl Byington 5.13
+* Fri Mar 10 2006 Carl Byington <carl@five-ten-sg.com> - 5.13
 - remove redundant entry in files section
 
-* Sun Dec 18 2005 Carl Byington 5.11
+* Sun Dec 18 2005 Carl Byington <carl@five-ten-sg.com> - 5.11
 - use autoconf and http://www.fedora.us/docs/rpm-packaging-guidelines.html
 
-* Tue Jan 03 2005 Carl Byington 4.0
+* Tue Jan 03 2005 Carl Byington <carl@five-ten-sg.com> - 4.0
 - added hosts-ignore conf file
 - see RELEASE_NOTES
 
-* Thu Jul 15 2004 John Gunkel <antispam@boing.ca> 1.3
+* Thu Jul 15 2004 John Gunkel <antispam@boing.ca> - 1.3
 - patch to rc file no longer needed
 - see RELEASE_NOTES
 
-* Mon Jul 05 2004 John Gunkel <jgunkel@palliser.ca> 1.2
+* Mon Jul 05 2004 John Gunkel <jgunkel@palliser.ca> - 1.2
 - Fixed some typos
 - removed patch into separate file
 - added config migration as suggested by Carl
 - Added reminder to edit sendmail.mc
 
-* Wed Jun 30 2004 John Gunkel <jgunkel@palliser.ca> 1.1
+* Wed Jun 30 2004 John Gunkel <jgunkel@palliser.ca> - 1.1
 - Initial revision of spec file. Need to add a better description, docs and a sendmail.mc message