From: swa <swa@users.sourceforge.net>
Date: Thu, 7 Mar 2002 18:25:56 +0000 (+0000)
Subject: synced redhat and suse build process
X-Git-Tag: v_2_9_12~122
X-Git-Url: http://www.privoxy.org/gitweb/faq/static/user-manual/@default-cgi@send-stylesheet?a=commitdiff_plain;h=c52eabc717dba7a4c84aa2d1edd8194a85daa9cd;p=privoxy.git
synced redhat and suse build process
---
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 452ef366..b377f0a5 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.12 2002/03/07 15:28:27 swa Exp $
+# $Id: GNUmakefile.in,v 1.13 2002/03/07 17:17:56 oes Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
@@ -28,6 +28,9 @@
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: GNUmakefile.in,v $
+# Revision 1.13 2002/03/07 17:17:56 oes
+# (Hopefully) fixed for older make versions
+#
# Revision 1.12 2002/03/07 15:28:27 swa
# more informative
#
@@ -469,19 +472,31 @@ solaris-dist:
#############################################################################
suse-dist:
- @make clobber
-# verify that i'm root needs to be done
- rm -f ../ijbswa.tar.gz
-# verify all version strings, FLAGS, etc. in the spec file
- sed 's/^\(Version:\).*/\1: $(RPM_VERSION)/g; \
- s/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' junkbuster-suse.spec > $(TMPFILE) && mv -f $(TMPFILE) junkbuster-suse.spec
- tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz .
-# verify all files in their correct location needs to be done
-# never use buildroot to define the location inside the spec
-# file or suse will fuck up the build process.
- cd .. && rpm -ta --buildroot /tmp/xxx ijbswa.tar.gz
- chmod a+r /usr/src/packages/SRPMS/*
- chmod a+r /usr/src/packages/RPMS/i386/*
+ for dir in RPMS SRPMS BUILD SOURCES SPECS; do \
+ if [ ! -w $(RPM_BASE)/$$dir ]; then \
+ $(ECHO) "$(RPM_BASE)/$$dir is not writable for you. Maybe try as root."; \
+ $(ECHO) "Or add a suitable path to .rpmmacros like."; \
+ $(ECHO) "%_topdir /home/foo/rpm-build"; \
+ exit 1; \
+ fi; \
+ done; \
+
+ $(MAKE) clobber
+ if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
+
+ TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \
+ if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \
+ -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \
+ junkbuster-suse.spec > $$TMPFILE ; then \
+ $(MV) -f $$TMPFILE junkbuster-suse.spec; \
+ else \
+ $(ECHO) "Could not set version info in specfile."; \
+ exit 1;\
+ fi
+
+ $(TAR) --exclude "CVS" --exclude "junkbuster-rh.spec" -czf $(TAR_ARCH) .
+ $(RPM) --clean -ta $(TAR_ARCH)
+ if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi
#
# anonymously ncftps the rpms to sourceforge
diff --git a/junkbuster-suse.spec b/junkbuster-suse.spec
index 7c7b25bb..5609b357 100644
--- a/junkbuster-suse.spec
+++ b/junkbuster-suse.spec
@@ -1,4 +1,4 @@
-# $Id: junkbuster-suse.spec,v 1.11 2001/12/02 10:29:26 swa Exp $
+# $Id: junkbuster-suse.spec,v 1.12 2002/03/02 15:50:04 swa Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
@@ -26,6 +26,9 @@
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: junkbuster-suse.spec,v $
+# Revision 1.12 2002/03/02 15:50:04 swa
+# 2.9.11 version. more input for docs.
+#
# Revision 1.11 2001/12/02 10:29:26 swa
# New version made these changes necessary.
#
@@ -67,11 +70,12 @@
# neededforbuild -ijb
# usedforbuild -ijb aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib db devs diffutils e2fsprogs file fileutils findutils flex gawk gcc gdbm gdbm-devel gettext glibc glibc-devel gpm gppshare groff gzip kbd less libtool libz lx_suse make mktemp modutils ncurses ncurses-devel net-tools netcfg nkitb pam pam-devel patch perl pgp ps rcs rpm sendmail sh-utils shadow strace syslogd sysvinit texinfo textutils timezone unzip util-linux vim xdevel xf86 xshared
+%define ijbconf %{_sysconfdir}/%{name}
+
Vendor: http://ijbswa.sourceforge.net
Distribution: defineme
Name: junkbuster-suse
Packager: Stefan Waldherr <stefan@waldherr.org>
-
Copyright: GPL
# buildroot does not work under f*cking suse :-(
#BuildRoot: /tmp/junkbuster-rpmbuild
@@ -82,7 +86,7 @@ Autoreqprov: on
Version: 2.9.11
Release: 1
Summary: The Internet Junkbuster
-Source: http://www.waldherr.org/junkbuster/ijbswa.tar.gz
+Source: http://www.waldherr.org/%{name}/ijbswa-%{version}.tar.gz
#
# -----------------------------------------------------------------------------