From 3d18a965e0d15a4be605cddd39393efcb1ba73ba Mon Sep 17 00:00:00 2001 From: morcego Date: Thu, 25 Apr 2002 19:13:57 +0000 Subject: [PATCH] Removed RPM release number declaration on configure.in Changed makefile to use given value for RPM_PACKAGEV when on uploading targets (will produce an error, explaining who to do it, if no value if provided). --- GNUmakefile.in | 34 ++++++++++++++++++++-------------- acconfig.h | 8 +++----- configure.in | 13 ++++++++----- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 10d57c1a..b40d7c69 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.86 2002/04/15 04:30:27 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.87 2002/04/23 14:10:59 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -42,9 +42,7 @@ VERSION_MINOR = @VERSION_MINOR@ VERSION_POINT = @VERSION_POINT@ CODE_STATUS = @CODE_STATUS@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) -# will automatically be postfixed with -$(RPM_PACKAGEV) in the SPECfile RPM_VERSION = $(VERSION) -RPM_PACKAGEV = @VERSION_RPM_PACKAGE@ ############################################################################# @@ -286,22 +284,27 @@ rpm-stuff: dist-check clean clobber # redhat distribution alpha and x86 ############################################################################# redhat-dist: rpm-stuff - TMPFILE=$$(mktemp -q /tmp/$(PROGRAM).XXXXXX); \ - if $(SED) -e 's/^\(Version:\).*/\1 $(RPM_VERSION)/g' \ - -e 's/^\(Release:\).*/\1 $(RPM_PACKAGEV)/g' \ - privoxy-rh.spec > $$TMPFILE ; then \ - $(MV) -f $$TMPFILE privoxy-rh.spec; \ - else \ - $(ECHO) "Could not set version info in specfile."; \ - exit 1;\ - fi $(TAR) --exclude ".cvsignore" --exclude "CVS" --exclude "privoxy-suse.spec" -czf $(TAR_ARCH) . $(RPM) --clean -ta $(TAR_ARCH) if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi +check-release: + @if [ "$(RPM_PACKAGEV)" = "" ]; then \ + echo ; \ + echo " ERROR: NO RPM_PACKAGEV VALUE"; \ + echo " No value given for RPM_PACKAGEV. Please use:"; \ + echo " make dist-upload RPM_PACKAGEV=release"; \ + echo " where \"release\" is the release number you want to and"; \ + echo " where \"dist\" is the name of the distro \(redhat or suse\)"; \ + echo ; \ + echo " Ex: make redhat-upload RPM_PACKAGEV=1"; \ + echo ; \ + exit 1; \ + fi + # anonymously ncftps the rpms to sourceforge -redhat-upload: +redhat-upload: check-release ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm # better should use `arch` here instead of ix86 to support other platforms too ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @@ -331,7 +334,7 @@ suse-dist: rpm-stuff if [ -f $(TAR_ARCH) ]; then $(RM) $(TAR_ARCH); fi # anonymously ncftps the rpms to sourceforge -suse-upload: +suse-upload: check-release ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/SRPMS/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).src.rpm # better should use `arch` here instead of ix86 to support other platforms too ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming $(RPM_BASE)/RPMS/*/privoxy-suse-$(RPM_VERSION)-$(RPM_PACKAGEV).*.rpm @@ -795,6 +798,9 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.87 2002/04/23 14:10:59 swa +# now create pdf documents +# # Revision 1.86 2002/04/15 04:30:27 hal9 # Missed two -pi.bak's on perl/cygwin problem. # diff --git a/acconfig.h b/acconfig.h index 28ab8e1b..fa6706b5 100644 --- a/acconfig.h +++ b/acconfig.h @@ -37,6 +37,9 @@ * * Revisions : * $Log: acconfig.h,v $ + * Revision 1.26 2002/04/11 11:00:21 oes + * Applied Moritz' fix for socklen_t on Solaris + * * Revision 1.25 2002/04/06 20:38:01 jongfoster * Renaming VC++ versions of config.h * @@ -216,11 +219,6 @@ */ #undef VERSION_POINT -/* - * Version number - RPM-release - */ -#undef VERSION_RPM_PACKAGE - /* * Version number, as a string */ diff --git a/configure.in b/configure.in index 655de55b..227ecdfb 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.63 2002/04/11 11:00:21 oes Exp $ +dnl $Id: configure.in,v 1.64 2002/04/22 16:32:31 morcego Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,12 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.64 2002/04/22 16:32:31 morcego +dnl configure.in, *.spec: Bumping release to 2 (2.9.14-2) +dnl -rh.spec: uid and gid are now macros +dnl -suse.spec: Changing the header Copyright to License (Copyright is +dnl deprecable) +dnl dnl Revision 1.63 2002/04/11 11:00:21 oes dnl Applied Moritz' fix for socklen_t on Solaris dnl @@ -347,7 +353,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.63 $) +AC_REVISION($Revision: 1.64 $) AC_INIT(jcc.c) if test ! -f config.h.in; then @@ -394,7 +400,6 @@ dnl ================================================================= VERSION_MAJOR=2 VERSION_MINOR=9 VERSION_POINT=14 -VERSION_RPM_PACKAGE=2 CODE_STATUS="beta" dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be @@ -407,14 +412,12 @@ dnl ================================================================= AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_POINT) -AC_SUBST(VERSION_RPM_PACKAGE) AC_SUBST(CODE_STATUS) dnl AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR}) AC_DEFINE_UNQUOTED(VERSION_MINOR,${VERSION_MINOR}) AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT}) -AC_DEFINE_UNQUOTED(VERSION_RPM_PACKAGE,${VERSION_RPM_PACKAGE}) AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}") AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}") -- 2.39.2