From 51d299617db3811cb656015d33ae0d4df4160f56 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 04:52:42 +0000 Subject: [PATCH 01/12] Updated so plone provides the product 'Five' rather then Zope. Zope needed to provide Five in Plone 2.5. In Plone 2.5.1, Plone now provides Five. Fun. --- zope.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zope.spec b/zope.spec index 0b352cc..07e9f74 100644 --- a/zope.spec +++ b/zope.spec @@ -13,7 +13,7 @@ Name: zope Summary: Web application server for flexible content management applications Version: 2.9.4 -Release: 2%{?dist} +Release: 3%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ @@ -120,6 +120,9 @@ chmod 755 $RPM_BUILD_ROOT%{zope_home} # included in %%doc rm -rf $RPM_BUILD_ROOT%{zope_home}/doc +#now included with plone 2.5.1 version 1.3.7 +rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five + # write version.txt echo "Zope %{version}-%{release}" > \ "$RPM_BUILD_ROOT%{software_home}/version.txt" @@ -187,6 +190,10 @@ fi %changelog +* Tue Nov 21 2006 Jonathan Steffan 2.9.4-3 +- Removed Five from zope package (plone 2.5.1 now provides the needed + version.) + * Wed Aug 30 2006 Aurelien Bompard 2.9.4-2 - fix path on x86_64 From ae48007ee35e0357ab16fa90a4f04f79edbe8767 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 18:22:32 +0000 Subject: [PATCH 02/12] Updated to 2.9.5 --- .cvsignore | 2 +- sources | 2 +- zope-2.8.3-pythonwarning.patch | 13 ------------- zope.spec | 19 ++++++------------- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 zope-2.8.3-pythonwarning.patch diff --git a/.cvsignore b/.cvsignore index 7b0b3ec..7a648a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zope-2.9.4-final.tgz +Zope-2.9.5-final.tgz diff --git a/sources b/sources index 5d42a7d..4b963c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d7ffe62eabc84d0c438e450e344c29f Zope-2.9.4-final.tgz +17cd06a6974dbdd0e4982a343b79fb00 Zope-2.9.5-final.tgz diff --git a/zope-2.8.3-pythonwarning.patch b/zope-2.8.3-pythonwarning.patch deleted file mode 100644 index 4cb8e0d..0000000 --- a/zope-2.8.3-pythonwarning.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./lib/python/App/dtml/zope_quick_start.dtml.pythonwarning 2005-10-25 15:23:22.000000000 +0200 -+++ ./lib/python/App/dtml/zope_quick_start.dtml 2005-10-25 15:35:55.000000000 +0200 -@@ -134,5 +134,10 @@ - - - -+

-+WARNING: you are running Zope 2.8.X with python 2.4.X, this is not a supported -+combination. Don't file bugreports or ask for support on zope.org. -+

-+ - - diff --git a/zope.spec b/zope.spec index 07e9f74..772fcef 100644 --- a/zope.spec +++ b/zope.spec @@ -12,13 +12,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.9.4 -Release: 3%{?dist} +Version: 2.9.5 +Release: 1%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz -#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz +Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -28,7 +27,6 @@ Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in Patch0: zope-2.7.3-config.patch -Patch1: zope-2.8.3-pythonwarning.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} @@ -46,18 +44,11 @@ systems. After starting Zope, you can access it by pointing your browser to http://localhost:8080 -WARNING: this zope package has been built on python 2.4.X, which is not -supported ! Do not file bugreports or ask for support on zope.org if you -choose to use this package. - - %prep %setup -q -n Zope-%{version}-final %patch0 -p2 -b .config # remove the backup, or we'll install it too... rm -f skel/etc/zope.conf.in.config -# Warning on the default index_html about python 2.4 & zope 2.8 -#%patch1 -p1 -b .pythonwarning chmod -x skel/import/README.txt install -pm 644 %{SOURCE4} README.Fedora @@ -188,8 +179,10 @@ fi %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc - %changelog +* Tue Nov 22 2006 Jonathan Steffan 2.9.5-1 +- Updated to 2.9.5 and removed not needed patches + * Tue Nov 21 2006 Jonathan Steffan 2.9.4-3 - Removed Five from zope package (plone 2.5.1 now provides the needed version.) From 65f1f6eb696bb3e5d63a9b4748423e5058373301 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 19:57:32 +0000 Subject: [PATCH 03/12] Added configure script patch for python 2.4.4 --- zope.configure-2.9.5.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 zope.configure-2.9.5.patch diff --git a/zope.configure-2.9.5.patch b/zope.configure-2.9.5.patch new file mode 100644 index 0000000..52883be --- /dev/null +++ b/zope.configure-2.9.5.patch @@ -0,0 +1,19 @@ +*** configure 2006-11-22 12:54:48.000000000 -0700 +--- configure.orig 2006-11-22 12:52:19.000000000 -0700 +*************** TARGET="2.4.3" +*** 18,24 **** + # sys.version) below in "best" to "worst" order, not including the + # target version. Up to six acceptable python versions are allowed. + # Do not include the target version number in this list! +! ACCEPTABLE="2.4.2 2.4.4" + + # provide the executable names for all the acceptable versions + # (and the target version) below +--- 18,24 ---- + # sys.version) below in "best" to "worst" order, not including the + # target version. Up to six acceptable python versions are allowed. + # Do not include the target version number in this list! +! ACCEPTABLE="2.4.2" + + # provide the executable names for all the acceptable versions + # (and the target version) below From 419bc0d781ed301cbce850b7632482435adb1569 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 21:55:01 +0000 Subject: [PATCH 04/12] Added patch to enable support for python 2.4.4 --- zope.configure-2.9.5.patch | 30 +++++++++++------------------- zope.spec | 2 ++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/zope.configure-2.9.5.patch b/zope.configure-2.9.5.patch index 52883be..b695b42 100644 --- a/zope.configure-2.9.5.patch +++ b/zope.configure-2.9.5.patch @@ -1,19 +1,11 @@ -*** configure 2006-11-22 12:54:48.000000000 -0700 ---- configure.orig 2006-11-22 12:52:19.000000000 -0700 -*************** TARGET="2.4.3" -*** 18,24 **** - # sys.version) below in "best" to "worst" order, not including the - # target version. Up to six acceptable python versions are allowed. - # Do not include the target version number in this list! -! ACCEPTABLE="2.4.2 2.4.4" - - # provide the executable names for all the acceptable versions - # (and the target version) below ---- 18,24 ---- - # sys.version) below in "best" to "worst" order, not including the - # target version. Up to six acceptable python versions are allowed. - # Do not include the target version number in this list! -! ACCEPTABLE="2.4.2" - - # provide the executable names for all the acceptable versions - # (and the target version) below +--- Zope-2.9.5-final.orig/configure 2006-10-02 09:53:36.000000000 -0600 ++++ Zope-2.9.5-final/configure 2006-11-22 14:28:48.000000000 -0700 +@@ -18,7 +18,7 @@ + # sys.version) below in "best" to "worst" order, not including the + # target version. Up to six acceptable python versions are allowed. + # Do not include the target version number in this list! +-ACCEPTABLE="2.4.2" ++ACCEPTABLE="2.4.2 2.4.4" + + # provide the executable names for all the acceptable versions + # (and the target version) below diff --git a/zope.spec b/zope.spec index 772fcef..f54da66 100644 --- a/zope.spec +++ b/zope.spec @@ -27,6 +27,7 @@ Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in Patch0: zope-2.7.3-config.patch +Patch1: zope.configure-2.9.5.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} @@ -47,6 +48,7 @@ http://localhost:8080 %prep %setup -q -n Zope-%{version}-final %patch0 -p2 -b .config +%patch1 -p1 # remove the backup, or we'll install it too... rm -f skel/etc/zope.conf.in.config From ba997cc6eb026e6be2d4457606ac344b14e132da Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sat, 6 Jan 2007 06:44:22 +0000 Subject: [PATCH 05/12] updated to 2.9.6 and added Five back to zope --- .cvsignore | 2 +- sources | 2 +- zope.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7a648a7..08ddf14 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zope-2.9.5-final.tgz +Zope-2.9.6-final.tgz diff --git a/sources b/sources index 4b963c3..d38d248 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17cd06a6974dbdd0e4982a343b79fb00 Zope-2.9.5-final.tgz +a87008a9e78248072ea5908e1006b269 Zope-2.9.6-final.tgz diff --git a/zope.spec b/zope.spec index f54da66..12da08e 100644 --- a/zope.spec +++ b/zope.spec @@ -12,12 +12,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.9.5 +Version: 2.9.6 Release: 1%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz +Source0: http://www.zope.org/Products/Zope/2.9.6/Zope-2.9.6-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -27,7 +27,7 @@ Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in Patch0: zope-2.7.3-config.patch -Patch1: zope.configure-2.9.5.patch +#Patch1: zope.configure-2.9.5.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} @@ -48,7 +48,7 @@ http://localhost:8080 %prep %setup -q -n Zope-%{version}-final %patch0 -p2 -b .config -%patch1 -p1 +#%patch1 -p1 # remove the backup, or we'll install it too... rm -f skel/etc/zope.conf.in.config @@ -113,9 +113,6 @@ chmod 755 $RPM_BUILD_ROOT%{zope_home} # included in %%doc rm -rf $RPM_BUILD_ROOT%{zope_home}/doc -#now included with plone 2.5.1 version 1.3.7 -rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five - # write version.txt echo "Zope %{version}-%{release}" > \ "$RPM_BUILD_ROOT%{software_home}/version.txt" @@ -182,6 +179,9 @@ fi %changelog +* Fri Jan 5 2007 Jonathan Steffan 2.9.6-1 +- Updated to 2.9.6 added Five back into Zope (#221252) + * Tue Nov 22 2006 Jonathan Steffan 2.9.5-1 - Updated to 2.9.5 and removed not needed patches From 57233c74db6626754582efd3e8c0c5bbbe4a1294 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sat, 6 Jan 2007 07:26:03 +0000 Subject: [PATCH 06/12] Needed to add back the configure patch --- zope.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zope.spec b/zope.spec index 12da08e..bada861 100644 --- a/zope.spec +++ b/zope.spec @@ -27,7 +27,7 @@ Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in Patch0: zope-2.7.3-config.patch -#Patch1: zope.configure-2.9.5.patch +Patch1: zope.configure-2.9.5.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} @@ -48,7 +48,7 @@ http://localhost:8080 %prep %setup -q -n Zope-%{version}-final %patch0 -p2 -b .config -#%patch1 -p1 +%patch1 -p1 # remove the backup, or we'll install it too... rm -f skel/etc/zope.conf.in.config From 133aa12998f3b06d744cb9c110e084aecc86ac70 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 21 Mar 2007 22:12:32 +0000 Subject: [PATCH 07/12] added hotfix 20070320 --- .cvsignore | 1 + sources | 1 + zope.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08ddf14..b84b1eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ Zope-2.9.6-final.tgz +Hotfix_20070320.tgz diff --git a/sources b/sources index d38d248..9d0de2d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a87008a9e78248072ea5908e1006b269 Zope-2.9.6-final.tgz +80806d50d9b88d0d0db9cc22255617bd Hotfix_20070320.tgz diff --git a/zope.spec b/zope.spec index bada861..82db37d 100644 --- a/zope.spec +++ b/zope.spec @@ -13,7 +13,7 @@ Name: zope Summary: Web application server for flexible content management applications Version: 2.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ @@ -26,6 +26,7 @@ Source3: zope.zopectl.in Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in +Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz Patch0: zope-2.7.3-config.patch Patch1: zope.configure-2.9.5.patch @@ -105,7 +106,7 @@ perl -pi -e 's,<>,%{_sysconfdir},g; make install # Hotfix -#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products +tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products chmod 700 $RPM_BUILD_ROOT%{instance_home} chmod 755 $RPM_BUILD_ROOT%{zope_home} @@ -179,6 +180,9 @@ fi %changelog +* Wed Mar 21 2007 Jonathan Steffan 2.9.6-2 +- Added hotfix 20070320 (#233378) + * Fri Jan 5 2007 Jonathan Steffan 2.9.6-1 - Updated to 2.9.6 added Five back into Zope (#221252) From ca46f3a7058a1bfa40f9bd1fc5c13364922e9c6e Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sun, 8 Apr 2007 04:20:17 +0000 Subject: [PATCH 08/12] Updated to 2.9.7 --- .cvsignore | 3 +-- sources | 3 +-- zope.spec | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index b84b1eb..696f3c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -Zope-2.9.6-final.tgz -Hotfix_20070320.tgz +Zope-2.9.7-final.tgz diff --git a/sources b/sources index 9d0de2d..de1b0b6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a87008a9e78248072ea5908e1006b269 Zope-2.9.6-final.tgz -80806d50d9b88d0d0db9cc22255617bd Hotfix_20070320.tgz +f7d900c00fe95d4cce0bc5854bc842b4 Zope-2.9.7-final.tgz diff --git a/zope.spec b/zope.spec index 82db37d..7cde275 100644 --- a/zope.spec +++ b/zope.spec @@ -12,12 +12,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.9.6 -Release: 2%{?dist} +Version: 2.9.7 +Release: 1%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.9.6/Zope-2.9.6-final.tgz +Source0: http://www.zope.org/Products/Zope/2.9.7/Zope-2.9.7-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -26,9 +26,9 @@ Source3: zope.zopectl.in Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in -Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz +#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz Patch0: zope-2.7.3-config.patch -Patch1: zope.configure-2.9.5.patch +#Patch1: zope.configure-2.9.5.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} @@ -49,7 +49,7 @@ http://localhost:8080 %prep %setup -q -n Zope-%{version}-final %patch0 -p2 -b .config -%patch1 -p1 +#%patch1 -p1 # remove the backup, or we'll install it too... rm -f skel/etc/zope.conf.in.config @@ -106,7 +106,7 @@ perl -pi -e 's,<>,%{_sysconfdir},g; make install # Hotfix -tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products +#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products chmod 700 $RPM_BUILD_ROOT%{instance_home} chmod 755 $RPM_BUILD_ROOT%{zope_home} @@ -180,6 +180,11 @@ fi %changelog +* Mon Apr 2 2007 Jonathan Steffan 2.9.7-1 +- Removed hotfix 20070320 +- Updated to 2.9.7 +- Removed no longer needed patch for acceptable python version + * Wed Mar 21 2007 Jonathan Steffan 2.9.6-2 - Added hotfix 20070320 (#233378) From 0f609a20865ed2e88df1c4684add9ebde6da8220 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 23 May 2007 20:58:09 +0000 Subject: [PATCH 09/12] Added zope.pth --- zope.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/zope.spec b/zope.spec index 7cde275..ba89894 100644 --- a/zope.spec +++ b/zope.spec @@ -1,5 +1,7 @@ %define python_minver 2.4.2 +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + %define zope_user zope %define zope_group %{zope_user} @@ -13,7 +15,7 @@ Name: zope Summary: Web application server for flexible content management applications Version: 2.9.7 -Release: 1%{?dist} +Release: 2%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ @@ -75,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT # Create all required additional directories for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \ %{_sysconfdir}/sysconfig %{_bindir}; do - mkdir -p $RPM_BUILD_ROOT$dir + install -d $RPM_BUILD_ROOT$dir done @@ -118,6 +120,11 @@ rm -rf $RPM_BUILD_ROOT%{zope_home}/doc echo "Zope %{version}-%{release}" > \ "$RPM_BUILD_ROOT%{software_home}/version.txt" +# write zope.pth +install -d $RPM_BUILD_ROOT%{python_sitearch} +echo "%{software_home}" > \ + "$RPM_BUILD_ROOT%{python_sitearch}/zope.pth" + # Compile .pyc %{__python} -c "import compileall; \ compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \ @@ -177,9 +184,13 @@ fi %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc +%{python_sitearch}/zope.pth %changelog +* Wed May 23 2007 Jonathan Steffan 2.9.7-2 +- Added zope.pth to fix misc. zope scripts including some zeo stuff + * Mon Apr 2 2007 Jonathan Steffan 2.9.7-1 - Removed hotfix 20070320 - Updated to 2.9.7 From a0b6b7ce82e87bec0481f8f308dc30b50091a5ca Mon Sep 17 00:00:00 2001 From: Mike McGrath Date: Thu, 24 May 2007 02:31:32 +0000 Subject: [PATCH 10/12] Initialize branch EL-4 for zope --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 019604fec74fe363ad2e8372babee8c6b71d8ae3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:59 +0000 Subject: [PATCH 11/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2d94525..54c9132 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := zope SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5c69f0694337f2b650cca43d5c6a9f17f0bcbea9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:32:43 +0000 Subject: [PATCH 12/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 54c9132..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zope -# $Id$ -NAME := zope -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4