From 25d5769f38408c42b427250de8410d6ebf442e0b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:08:33 +0000 Subject: [PATCH 01/11] Initialize branch F-7 for wordpress --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 6a94b547138b65c632be43cd2114ffede7941dae Mon Sep 17 00:00:00 2001 From: John Berninger Date: Wed, 4 Jul 2007 22:43:27 +0000 Subject: [PATCH 02/11] update to 2.2.1 --- .cvsignore | 2 +- README.fedora.wordpress | 28 ++++++++++++++++++++++++++++ sources | 2 +- wordpress.spec | 26 ++++++++++++++++++-------- 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9a61071..c7edbfc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.1.3.tar.gz +wordpress-2.2.1.tar.gz diff --git a/README.fedora.wordpress b/README.fedora.wordpress index 8a4518d..469b6e0 100644 --- a/README.fedora.wordpress +++ b/README.fedora.wordpress @@ -1,6 +1,9 @@ Wordpress is a database driven blogging program designed to make it exceedingly easy to publish an online blog, sometimes also called a weblog or journal. + +CONFIGURING WORDPRESS FOR THE FIRST TIME +---------------------------------------- Once this package is installed, there are a few configuration items which need to be performed before the blog is usable. First, you need to establish a username and password to connect to your MySQL database as, and make both @@ -43,3 +46,28 @@ Once that's done and the database server and web server have been started, open a web browser to http://localhost/wordpress/wp-admin/install.php and follow the instructions given to you on the pages you see to set up the database tables and begin publishing your blog. + + +UPGRADING WORDPRESS +------------------- +In order to upgrade from a 2.1 series package, there are several steps you +will need to take. If you've already performed the 'yum update', all is not +lost, and you more than likely still be able to complete the upgrade +painlessly. + +First, you will want to back up your entire database. This is simply common +sense, but it is also mentioned explicitly in Wordpress's upgrade instructions. + +You should have disabled all your plugins. Having old plugins still active +could cause problems, as the old plugins may not be compatible with the new +version of Wordpress. + +Once all the plugins are disabled, run the actual yum update. Once this +completes, you should point a browser at +http:///wordpress/wp-admin/upgrade.php and follow the +instructions that appear in the browser window. Once this is completed, you +can begin reactivating plugins one at a time. + +If you need a more detailed upgrade document, or you run into problems, please +see the Wordpress upgrade documentation at +http://codex.wordpress.org/Upgrading_WordPress#Detailed_Instructions diff --git a/sources b/sources index 4a2a426..f815815 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d480bcaff18c4751eda572be878ef7bc wordpress-2.1.3.tar.gz +a2670e28b2ebfe165278ce03ff75fa06 wordpress-2.2.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index e05b496..5097632 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.1.3 +Version: 2.2.1 Group: Applications/Publishing Release: 1%{?dist} License: GPL @@ -12,7 +12,7 @@ Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, httpd, php-mysql +Requires: php >= 4.2.0, httpd, php-mysql BuildArch: noarch %description @@ -50,6 +50,7 @@ rm -rf ${RPM_BUILD_ROOT} %doc license.txt %doc readme.html %doc README.fedora +%{_datadir}/wordpress/wp-app.php %{_datadir}/wordpress/wp-atom.php %{_datadir}/wordpress/wp-blog-header.php %{_datadir}/wordpress/wp-comments-post.php @@ -73,7 +74,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog -* Mon Apr 16 2007 john Berninger - 2.1.3-1 +* Wed Jul 4 2007 John Berninger - 2.2.1-1 +- update to upstream 2.2.1 to fix various vulnerabilities + +* Mon Apr 16 2007 John Berninger - 2.1.3-1 - update to 2.1.3 final - bz235912 * Mon Mar 26 2007 John Berninger - 2.1.3-rc2 @@ -83,16 +87,22 @@ rm -rf ${RPM_BUILD_ROOT} - update to 2.1.2 - backdoor exploit introduced upstream in 2.1.1 - bz 230825 * Tue Feb 27 2007 John Berninger - 2.1.1-0 -- update to 2.1.1 to fix vuln in bz 229991 +- update to 2.1.1 for vuln fix - bz 229991 * Wed Jan 31 2007 John Berninger - 2.1-0 -- update to v2.1 to fix multiple bz/vuln's +- update to v 2.1 to fix multiple bz/vuln's -* Sun Dec 3 2006 John Berninger - 2.0.5-2 +* Wed Dec 27 2006 John Berninger - 2.0.5-1 +- ver 2.0.5 to fix bz 220818 + +* Sun Dec 3 2006 John Berninger - 2.0.4-4 +- Remove mysql-server dependency for real this time. + +* Sun Dec 3 2006 John Berninger - 2.0.4-3 - Remove mysql-server dependency -* Sun Dec 3 2006 John Berninger - 2.0.5-1 -- Update to upstream 2.0.5 to fix vuln in bz 213985 +* Sun Dec 3 2006 John Berninger - 2.0.4-2 +- Fix wp-db-backup.php vuln in BZ 213985 * Thu Oct 26 2006 John Berninger - 2.0.4-1 - Doc fix for BZ 207822 From 87e7ae387717271b6391797a3e7590dc2ec0738e Mon Sep 17 00:00:00 2001 From: John Berninger Date: Wed, 29 Aug 2007 14:54:39 +0000 Subject: [PATCH 03/11] update to upstream 2.2.2 and license tag update --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c7edbfc..af7c807 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.2.1.tar.gz +wordpress-2.2.2.tar.gz diff --git a/sources b/sources index f815815..7956b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2670e28b2ebfe165278ce03ff75fa06 wordpress-2.2.1.tar.gz +a87666c6fe6cb4db94e2ae0531e5b633 wordpress-2.2.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 5097632..35a8c19 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,10 +1,10 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.2.1 +Version: 2.2.2 Group: Applications/Publishing -Release: 1%{?dist} -License: GPL +Release: 0%{?dist} +License: GPLv2 # Source0 with name-version does not work for web retrieval, # latest.tar.gz does not work for build # Source0: http://wordpress.org/latest.tar.gz @@ -74,6 +74,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Aug 29 2007 John Berninger - 2.2.2-0 +- update to upstream 2.2.2 +- license tag update + * Wed Jul 4 2007 John Berninger - 2.2.1-1 - update to upstream 2.2.1 to fix various vulnerabilities From 1a0f4f2aa35712d1dc31be2ba5540b1d67648538 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 11 Sep 2007 16:35:36 +0000 Subject: [PATCH 04/11] - updated to 2.2.3 (security release) --- .cvsignore | 1 + sources | 1 + wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index af7c807..ba1cbea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ wordpress-2.2.2.tar.gz +wordpress-2.2.3.tar.gz diff --git a/sources b/sources index 7956b5e..667782e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a87666c6fe6cb4db94e2ae0531e5b633 wordpress-2.2.2.tar.gz +98c1e611f8533d4fe4e8f995b8d83110 wordpress-2.2.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 35a8c19..09221a1 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.2.2 +Version: 2.2.3 Group: Applications/Publishing Release: 0%{?dist} License: GPLv2 @@ -74,6 +74,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Sep 11 2007 Adrian Reber - 2.2.3-0 +- updated to 2.2.3 (security release) + * Wed Aug 29 2007 John Berninger - 2.2.2-0 - update to upstream 2.2.2 - license tag update From c0603f5d326ef7b5d141faabda612339b2e85f65 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 9 Nov 2007 15:24:03 +0000 Subject: [PATCH 05/11] - updated to 2.3.1 (bz 357731, wordpress XSS issue) --- .cvsignore | 3 +-- sources | 3 +-- wordpress.spec | 43 ++++++++++++++++++++----------------------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.cvsignore b/.cvsignore index ba1cbea..f06ed21 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -wordpress-2.2.2.tar.gz -wordpress-2.2.3.tar.gz +wordpress-2.3.1.tar.gz diff --git a/sources b/sources index 667782e..c4103cb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a87666c6fe6cb4db94e2ae0531e5b633 wordpress-2.2.2.tar.gz -98c1e611f8533d4fe4e8f995b8d83110 wordpress-2.2.3.tar.gz +bd53264cbe80e470c5a9bc2cf7aa85e4 wordpress-2.3.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 09221a1..549c614 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,18 +1,15 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.2.3 +Version: 2.3.1 Group: Applications/Publishing -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2 -# Source0 with name-version does not work for web retrieval, -# latest.tar.gz does not work for build -# Source0: http://wordpress.org/latest.tar.gz Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.2.0, httpd, php-mysql +Requires: php >= 4.1.0, httpd, php-mysql BuildArch: noarch %description @@ -21,6 +18,8 @@ almost trivial, to get information out to people on the web. %prep %setup -q -n wordpress +# disable-wordpress-core-update, updates are always installed via rpm +sed -i -e "s,add_action,#add_action,g" wp-includes/update.php %install mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress @@ -50,8 +49,8 @@ rm -rf ${RPM_BUILD_ROOT} %doc license.txt %doc readme.html %doc README.fedora -%{_datadir}/wordpress/wp-app.php %{_datadir}/wordpress/wp-atom.php +%{_datadir}/wordpress/wp-app.php %{_datadir}/wordpress/wp-blog-header.php %{_datadir}/wordpress/wp-comments-post.php %{_datadir}/wordpress/wp-commentsrss2.php @@ -74,6 +73,13 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Oct 30 2007 Adrian Reber - 2.3.1-1 +- updated to 2.3.1 (bz 357731, wordpress XSS issue) + +* Mon Oct 15 2007 Adrian Reber - 2.3-1 +- updated to 2.3 +- disabled wordpress-core-update + * Tue Sep 11 2007 Adrian Reber - 2.2.3-0 - updated to 2.2.3 (security release) @@ -81,10 +87,7 @@ rm -rf ${RPM_BUILD_ROOT} - update to upstream 2.2.2 - license tag update -* Wed Jul 4 2007 John Berninger - 2.2.1-1 -- update to upstream 2.2.1 to fix various vulnerabilities - -* Mon Apr 16 2007 John Berninger - 2.1.3-1 +* Mon Apr 16 2007 john Berninger - 2.1.3-1 - update to 2.1.3 final - bz235912 * Mon Mar 26 2007 John Berninger - 2.1.3-rc2 @@ -94,22 +97,16 @@ rm -rf ${RPM_BUILD_ROOT} - update to 2.1.2 - backdoor exploit introduced upstream in 2.1.1 - bz 230825 * Tue Feb 27 2007 John Berninger - 2.1.1-0 -- update to 2.1.1 for vuln fix - bz 229991 +- update to 2.1.1 to fix vuln in bz 229991 * Wed Jan 31 2007 John Berninger - 2.1-0 -- update to v 2.1 to fix multiple bz/vuln's +- update to v2.1 to fix multiple bz/vuln's -* Wed Dec 27 2006 John Berninger - 2.0.5-1 -- ver 2.0.5 to fix bz 220818 - -* Sun Dec 3 2006 John Berninger - 2.0.4-4 -- Remove mysql-server dependency for real this time. - -* Sun Dec 3 2006 John Berninger - 2.0.4-3 +* Sun Dec 3 2006 John Berninger - 2.0.5-2 - Remove mysql-server dependency -* Sun Dec 3 2006 John Berninger - 2.0.4-2 -- Fix wp-db-backup.php vuln in BZ 213985 +* Sun Dec 3 2006 John Berninger - 2.0.5-1 +- Update to upstream 2.0.5 to fix vuln in bz 213985 * Thu Oct 26 2006 John Berninger - 2.0.4-1 - Doc fix for BZ 207822 @@ -126,7 +123,7 @@ rm -rf ${RPM_BUILD_ROOT} * Tue Jun 20 2006 John Berninger - 2.0.3-2 - Remove use of installprefix macro -- %{_datadir}/wordpress/wp-config.php is not a config file +- %%{_datadir}/wordpress/wp-config.php is not a config file - Symlink is relative * Mon Jun 19 2006 John Berninger - 2.0.3-1 From 59f80b0d11a3b578fd16a5db6da635634b2988ff Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 30 Dec 2007 09:48:55 +0000 Subject: [PATCH 06/11] - updated to 2.3.2 (bz 426431, Draft Information Disclosure) --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f06ed21..51ba5b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.3.1.tar.gz +wordpress-2.3.2.tar.gz diff --git a/sources b/sources index c4103cb..ab843e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd53264cbe80e470c5a9bc2cf7aa85e4 wordpress-2.3.1.tar.gz +7489b5f2433f3b2096aa02bbca09b069 wordpress-2.3.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 549c614..af1e5a9 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.3.1 +Version: 2.3.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Sun Dec 30 2007 Adrian Reber - 2.3.2-1 +- updated to 2.3.2 (bz 426431, Draft Information Disclosure) + * Tue Oct 30 2007 Adrian Reber - 2.3.1-1 - updated to 2.3.1 (bz 357731, wordpress XSS issue) From d8ed4245ca6ea5a2c830f00aa099cd567d199a0f Mon Sep 17 00:00:00 2001 From: John Berninger Date: Sat, 9 Feb 2008 05:09:21 +0000 Subject: [PATCH 07/11] update to 2.3.3 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 51ba5b1..4ae8ebe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.3.2.tar.gz +wordpress-2.3.3.tar.gz diff --git a/sources b/sources index ab843e6..0d3293d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7489b5f2433f3b2096aa02bbca09b069 wordpress-2.3.2.tar.gz +19518de1117aa68f0c3de84b6858efc3 wordpress-2.3.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index af1e5a9..0d88a56 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,9 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.3.2 +Version: 2.3.3 Group: Applications/Publishing -Release: 1%{?dist} +Release: 0%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Fri Feb 8 2008 John Berninger - 2.3.3-0 +- update to 2.3.3 for security fixes - BZ 431547 + * Sun Dec 30 2007 Adrian Reber - 2.3.2-1 - updated to 2.3.2 (bz 426431, Draft Information Disclosure) From fc94e0a50c13dd49d8e0757ba0b487c961496ce7 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 26 Apr 2008 19:25:43 +0000 Subject: [PATCH 08/11] - updated to 2.5.1 --- .cvsignore | 2 +- sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ae8ebe..24e6943 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wordpress-2.3.3.tar.gz +wordpress-2.5.1.tar.gz diff --git a/sources b/sources index 0d3293d..bc725d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19518de1117aa68f0c3de84b6858efc3 wordpress-2.3.3.tar.gz +b1a40387006e54dcbd963d0cb5da0df4 wordpress-2.5.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 0d88a56..b9362c4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,7 +1,7 @@ Summary: WordPress blogging software URL: http://www.wordpress.org Name: wordpress -Version: 2.3.3 +Version: 2.5.1 Group: Applications/Publishing Release: 0%{?dist} License: GPLv2 @@ -73,6 +73,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Sat Apr 26 2008 Adrian Reber - 2.5.1-0 +- updated to 2.5.1 + * Fri Feb 8 2008 John Berninger - 2.3.3-0 - update to 2.3.3 for security fixes - BZ 431547 From c8a3a4027865a691c90900c80dbc828a29710389 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 27 Apr 2008 10:21:41 +0000 Subject: [PATCH 09/11] - updated to 2.5.1 for security fixes --- wordpress.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index b9362c4..16e3aeb 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -3,7 +3,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 2.5.1 Group: Applications/Publishing -Release: 0%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -73,8 +73,8 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog -* Sat Apr 26 2008 Adrian Reber - 2.5.1-0 -- updated to 2.5.1 +* Sat Apr 26 2008 Adrian Reber - 2.5.1-1 +- updated to 2.5.1 for security fixes * Fri Feb 8 2008 John Berninger - 2.3.3-0 - update to 2.3.3 for security fixes - BZ 431547 From ae10178c386b0b94caae40800c18933c329a9bad Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:06 +0000 Subject: [PATCH 10/11] 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 b7ae9bc..f25a67e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wordpress 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 dbc6817a6d919dc4b69ae55a7053da82f9c8a75f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:23:38 +0000 Subject: [PATCH 11/11] 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 f25a67e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wordpress -# $Id$ -NAME := wordpress -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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7