[cvs] bogofilter Makefile.am, 1.177, 1.178 bogofilter.spec.in, 1.93, 1.94

[Matthias Andree]

David Relson <relson at users.sourceforge.net> writes:

> Modified Files:
> 	Makefile.am bogofilter.spec.in 
> Log Message:
> Divide rpm build into rpm, rpm-source, rpm-binary, and rpm-static targets.
>
> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/bogofilter/bogofilter/Makefile.am,v
> retrieving revision 1.177
> retrieving revision 1.178
> diff -u -d -r1.177 -r1.178
> --- Makefile.am	29 Dec 2005 16:25:08 -0000	1.177
> +++ Makefile.am	30 Dec 2005 16:20:24 -0000	1.178
> @@ -32,21 +32,25 @@
>  SQPFX=/opt/sqlite-3-lean
>  DBLIB=$(DBPFX)/lib/libdb.a
>  SQLIB=$(SQPFX)/lib/libsqlite3.a
> +DEF_DB42=--define 'with_db42 1'
>  DEF_SQLITE=--define 'with_sqlite 1'
>  DEF_STATIC=--define 'bogostatic 1'
>  
> -# BF_ZAP_LIBDB is a magic variable we check from configure.ac
> -rpm:	dist
> -	if test ! -f $(DBLIB) || test ! -f $(SQLIB) || objdump -t $(SQLIB) | grep -q __ctype_b_loc ; then \
> -	  echo >&2 "Please run the install-staticdblibs.sh script first." ; exit 1 ; fi
> -	BF_ZAP_LIBDB=zap CPPFLAGS="-D__NO_CTYPE -I$(DBPFX)/include" LIBS=$(DBLIB) $(RPMBUILD) --sign -ta $(distdir).tar.gz
> -	BF_ZAP_LIBDB=zap CPPFLAGS="-D__NO_CTYPE -I$(SQPFX)/include" LIBS=$(SQLIB) $(RPMBUILD) $(DEF_SQLITE) --sign -tb $(distdir).tar.gz
> +rpm:	rpm-source rpm-binary rpm-static
>  
> -rpm-static:	dist
> +rpm-source: dist
> +	$(RPMBUILD) --sign -ts $(distdir).tar.gz

Now that you're touching it, we don't actually need to build .src.rpms -
we can just gpg -ba --sign to create a detached ASCII signature for the
.tar.gz, since the .tar.gz effectively *is* our source tarball. It makes
no difference to the user if he uses --rebuild on the .src.rpm or -tb on
the .tar.gz, and he'll get the same results. Perhaps we should just kill
the source RPM -- at least for 1.1 we should.

-- 
Matthias Andree