[Zope-Checkins] CVS: Zope/inst - Makefile.in:1.1.2.8 Zope.spec.in:1.1.2.2 configure.py:1.1.2.12 file_from_infile.py:1.1.2.3 install.py:1.1.2.3 versions.py:1.1.2.2

[Chris McDonough]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv8648/inst

Modified Files:
      Tag: chrism-install-branch
	Makefile.in Zope.spec.in configure.py file_from_infile.py 
	install.py versions.py 
Log Message:
Minor changes to RPM versioning strategy.


=== Zope/inst/Makefile.in 1.1.2.7 => 1.1.2.8 ===
--- Zope/inst/Makefile.in:1.1.2.7	Sat Oct 12 02:40:24 2002
+++ Zope/inst/Makefile.in	Sat Oct 12 03:47:37 2002
@@ -6,7 +6,8 @@
 NAME=Zope
 MAJOR_VERSION=<<ZOPE_MAJOR_VERSION>>
 MINOR_VERSION=<<ZOPE_MINOR_VERSION>>
-PACKAGE_NAME=${NAME}-${MAJOR_VERSION}
+RELEASE_TAG=<<VERSION_RELEASE_TAG>>
+PACKAGE_NAME=${NAME}-${MAJOR_VERSION}.${MINOR_VERSION}-${RELEASE_TAG}
 
 # change this to your RPM source dir as necessary
 RPM_SRC_DIR=${HOME}/software/rpms/Zope


=== Zope/inst/Zope.spec.in 1.1.2.1 => 1.1.2.2 ===
--- Zope/inst/Zope.spec.in:1.1.2.1	Sat Oct 12 02:40:24 2002
+++ Zope/inst/Zope.spec.in	Sat Oct 12 03:47:37 2002
@@ -1,12 +1,11 @@
 %define name Zope
-%define version <<ZOPE_MAJOR_VERSION>>
+%define majorversion <<ZOPE_MAJOR_VERSION>>
 %define minorversion <<ZOPE_MINOR_VERSION>>
-%define release <<VERSION_RELEASE_NUM>>
-%define branch <<ZOPE_BRANCH_NAME>>
-%define longversion %{version}.%{minorversion}_%{branch}
-%define package_name %{name}-%{version}
+%define release <<VERSION_RELEASE_TAG>>
+%define version %{majorversion}.%{minorversion}
+%define package_name %{name}-%{version}-%{release}
 %define buildroot %{_tmppath}/%{package_name}-buildroot
-%define target_dir /opt/%{package_name}
+%define target_dir /opt/%{name}-%{majorversion}
 
 Summary: Zope, the open source web application server
 Name: %{name}
@@ -24,7 +23,9 @@
 Requires: python2 >= 2.2.1
 
 %description
-Test release of Zope 2.7-chrism-installer-branch.
+Zope is an application server framework that enables developers to quickly
+build web applications such as intranets, portals, and content management
+systems.
 
 %prep
 rm -rf $RPM_BUILD_DIR/%{package_name}


=== Zope/inst/configure.py 1.1.2.11 => 1.1.2.12 ===
--- Zope/inst/configure.py:1.1.2.11	Sat Oct 12 02:40:24 2002
+++ Zope/inst/configure.py	Sat Oct 12 03:47:37 2002
@@ -70,6 +70,7 @@
         '<<OPT_FLAGS>>':OPT_FLAGS,
         '<<ZOPE_MAJOR_VERSION>>':versions.ZOPE_MAJOR_VERSION,
         '<<ZOPE_MINOR_VERSION>>':versions.ZOPE_MINOR_VERSION,
+        '<<VERSION_RELEASE_TAG>>':versions.VERSION_RELEASE_TAG,
         }
     for k,v in idata.items():
         MAKEFILE = MAKEFILE.replace(k, v)


=== Zope/inst/file_from_infile.py 1.1.2.2 => 1.1.2.3 ===
--- Zope/inst/file_from_infile.py:1.1.2.2	Sat Oct 12 02:40:24 2002
+++ Zope/inst/file_from_infile.py	Sat Oct 12 03:47:37 2002
@@ -26,7 +26,7 @@
     'ZOPE_MAJOR_VERSION'  : versions.ZOPE_MAJOR_VERSION,
     'ZOPE_MINOR_VERSION'  : versions.ZOPE_MINOR_VERSION,
     'ZOPE_BRANCH_NAME'    : versions.ZOPE_BRANCH_NAME,
-    'VERSION_RELEASE_NUM' : versions.VERSION_RELEASE_NUM,
+    'VERSION_RELEASE_TAG' : versions.VERSION_RELEASE_TAG,
     }
 
 def main(source, dest, map, force):


=== Zope/inst/install.py 1.1.2.2 => 1.1.2.3 ===
--- Zope/inst/install.py:1.1.2.2	Sat Oct 12 02:40:24 2002
+++ Zope/inst/install.py	Sat Oct 12 03:47:37 2002
@@ -18,7 +18,7 @@
 """
 import sys, getopt, os, stat, glob, re
 from shutil import copy2, rmtree
-default_omitpattern = r'(^.*~$|^CVS$|^\.svn$|\.cvsignore|^\.\#.*$)'
+default_omitpattern = r'(^.*~$|^CVS$|^\.svn$|^\.cvsignore$|^\.\#.*$)'
 
 def main(src, dst, symlinks=1, dirmode=0755, fmode=0644,
          omitpattern=default_omitpattern, retain_xbit=1):


=== Zope/inst/versions.py 1.1.2.1 => 1.1.2.2 ===
--- Zope/inst/versions.py:1.1.2.1	Sat Oct 12 02:40:24 2002
+++ Zope/inst/versions.py	Sat Oct 12 03:47:37 2002
@@ -1,4 +1,7 @@
 ZOPE_MAJOR_VERSION  = '2.7'
 ZOPE_MINOR_VERSION  = '0'
 ZOPE_BRANCH_NAME    = '$Name$'[6:] or 'no-branch'
-VERSION_RELEASE_NUM = '1'
+
+# always start prerelease branches with '0' to avoid upgrade
+# issues in RPMs
+VERSION_RELEASE_TAG = '0test'