From addd6c8ad625a454547b027b24641189515cf788 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 1 Aug 2007 19:07:01 +0000 Subject: [PATCH 01/13] Initialize branch EL-4 for python-lxml --- 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 c9a8a10eff0e2cc7a48a7467c32d3ab8f0d604da Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 22 Aug 2007 16:34:03 +0000 Subject: [PATCH 02/13] Bump release and rebuild. --- python-lxml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-lxml.spec b/python-lxml.spec index 9a95ed8..2a59995 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt Group: Development/Libraries @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/* %changelog +* Wed Aug 22 2007 Jeffrey C. Ollie - 1.3.3-2 +- Bump release and rebuild. + * Mon Jul 30 2007 Jeffrey C. Ollie - 1.3.3-1 - Update to 1.3.3 From 7872ca36d32e8506d04f1b63a936d2cf3fa44d48 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sat, 15 Dec 2007 23:54:37 +0000 Subject: [PATCH 03/13] Update to 1.3.6 --- .cvsignore | 2 +- python-lxml.spec | 58 ++++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.cvsignore b/.cvsignore index 531984d..52f7707 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-1.3.3.tgz +lxml-1.3.6.tgz diff --git a/python-lxml.spec b/python-lxml.spec index 2a59995..7cf1c2f 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,48 +1,42 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define srcname lxml - -Name: python-%{srcname} -Version: 1.3.3 -Release: 2%{?dist} +Name: python-lxml +Version: 1.3.6 +Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt Group: Development/Libraries License: BSD URL: http://codespeak.net/lxml/ -Source0: http://codespeak.net/lxml/%{srcname}-%{version}.tgz +Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel libxslt-devel python-setuptools -# Upstream now includes the generated .c file and the Pyrex shipped -# with FC (0.9.3.1) is broken for gcc >= 4.0 -#BuildRequires: Pyrex >= 0.9.4 +BuildRequires: python-devel +BuildRequires: libxslt-devel +BuildRequires: python-setuptools-devel %description -lxml provides a Python binding to the libxslt and libxml2 libraries. It -follows the ElementTree API as much as possible in order to provide a more -Pythonic interface to libxml2 and libxslt than the default bindings. In -particular, lxml deals with Python Unicode strings rather than encoded UTF-8 -and handles memory management automatically, unlike the default bindings. - +lxml provides a Python binding to the libxslt and libxml2 libraries. +It follows the ElementTree API as much as possible in order to provide +a more Pythonic interface to libxml2 and libxslt than the default +bindings. In particular, lxml deals with Python Unicode strings +rather than encoded UTF-8 and handles memory management automatically, +unlike the default bindings. %prep -%setup -q -n %{srcname}-%{version} +%setup -q -n lxml-%{version} chmod a-x doc/rest2html.py %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build - +CFLAGS="%{optflags}" %{__python} setup.py build %install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed - +rm -rf %{buildroot} +%{__python} setup.py install --skip-build --root %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT - +rm -rf %{buildroot} %files %defattr(-,root,root,-) @@ -50,8 +44,20 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/* %changelog -* Wed Aug 22 2007 Jeffrey C. Ollie - 1.3.3-2 -- Bump release and rebuild. +* Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 +- Update to 1.3.6. + +* Mon Oct 22 2007 Jeffrey C. Ollie - 1.3.5-1 +- Update to 1.3.5. + +* Thu Aug 30 2007 Jeffrey C. Ollie - 1.3.4-1 +- Update to 1.3.4. + +* Wed Aug 29 2007 Fedora Release Engineering - 1.3.3-3 +- Rebuild for selinux ppc32 issue. + +* Tue Aug 28 2007 Jeffrey C. Ollie - 1.3.3-2 +- BR python-setuptools-devel * Mon Jul 30 2007 Jeffrey C. Ollie - 1.3.3-1 - Update to 1.3.3 diff --git a/sources b/sources index 0346a9b..69fc08a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2baa9f8ad14aa6dcfb763cfa0ce3bbcb lxml-1.3.3.tgz +a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tgz From b3e0d7a26cba697b1bf7d2bdca1bc0c8e7a5bafa Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 4 Mar 2008 15:00:02 +0000 Subject: [PATCH 04/13] Update to 2.0.2 --- .cvsignore | 2 +- python-lxml.spec | 23 ++++++++++++++++++----- sources | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 52f7707..2f446de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-1.3.6.tgz +lxml-2.0.2.tgz diff --git a/python-lxml.spec b/python-lxml.spec index 7cf1c2f..fe07625 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 1.3.6 +Version: 2.0.2 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -11,9 +11,13 @@ URL: http://codespeak.net/lxml/ Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel BuildRequires: libxslt-devel -BuildRequires: python-setuptools-devel + +%if 0%{?fedora} >= 8 +BuildRequires: python-setuptools-devel +%else +BuildRequires: python-setuptools +%endif %description lxml provides a Python binding to the libxslt and libxml2 libraries. @@ -29,11 +33,11 @@ unlike the default bindings. chmod a-x doc/rest2html.py %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} %clean rm -rf %{buildroot} @@ -44,6 +48,15 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog +* Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 +- Update to 2.0.2 + +* Tue Feb 19 2008 Jeffrey C. Ollie - 2.0.1-1 +- Update to 2.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.3.6-2 +- Autorebuild for GCC 4.3 + * Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 - Update to 1.3.6. diff --git a/sources b/sources index 69fc08a..7c8b04e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tgz +ddfa5354726d4bb5de54a8685bdc87a2 lxml-2.0.2.tgz From d6c52a76be343706e2b31a7e0aa562ceefa7a63c Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 27 Mar 2008 04:40:13 +0000 Subject: [PATCH 05/13] - Update to 2.0.3 --- .cvsignore | 2 +- python-lxml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2f446de..0db85f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-2.0.2.tgz +lxml-2.0.3.tgz diff --git a/python-lxml.spec b/python-lxml.spec index fe07625..b3616f4 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -48,6 +48,9 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog +* Wed Mar 26 2008 Jeffrey C. Ollie - 2.0.3-1 +- Update to 2.0.3 + * Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 - Update to 2.0.2 diff --git a/sources b/sources index 7c8b04e..bcbd2cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddfa5354726d4bb5de54a8685bdc87a2 lxml-2.0.2.tgz +cdef802a5543571c167140efaf788b69 lxml-2.0.3.tgz From 9e36f6702f80c9fdad63494bdb1e21d4354fca38 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 8 May 2008 18:13:59 +0000 Subject: [PATCH 06/13] - Update to 2.0.5 --- .cvsignore | 2 +- python-lxml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0db85f8..de4c023 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-2.0.3.tgz +lxml-2.0.5.tgz diff --git a/python-lxml.spec b/python-lxml.spec index b3616f4..b00df90 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.3 +Version: 2.0.5 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -48,6 +48,9 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog +* Thu May 8 2008 Jeffrey C. Ollie - 2.0.5-1 +- Update to 2.0.5 + * Wed Mar 26 2008 Jeffrey C. Ollie - 2.0.3-1 - Update to 2.0.3 diff --git a/sources b/sources index bcbd2cf..3e5806b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cdef802a5543571c167140efaf788b69 lxml-2.0.3.tgz +2cc8caf84c3b55353d5513c6d668c090 lxml-2.0.5.tgz From 9a44a680a0c586a29bc8298f4e740920d220d7b8 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Sun, 1 Jun 2008 03:48:34 +0000 Subject: [PATCH 07/13] - Update to 2.0.6 --- .cvsignore | 2 +- python-lxml.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index de4c023..f15e41f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-2.0.5.tgz +lxml-2.0.6.tgz diff --git a/python-lxml.spec b/python-lxml.spec index b00df90..40f99f4 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.5 +Version: 2.0.6 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -48,6 +48,9 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog +* Sat May 31 2008 Jeffrey C. Ollie - 2.0.6-1 +- Update to 2.0.6 + * Thu May 8 2008 Jeffrey C. Ollie - 2.0.5-1 - Update to 2.0.5 diff --git a/sources b/sources index 3e5806b..72d3739 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cc8caf84c3b55353d5513c6d668c090 lxml-2.0.5.tgz +e6749a36142b44a969c25a589f51f755 lxml-2.0.6.tgz From 50cbaa080819bad1d2e6c59ae1b4057a7282d11e Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 23 Jun 2008 02:56:19 +0000 Subject: [PATCH 08/13] - Update to 2.0.7 - Update download URL --- .cvsignore | 2 +- python-lxml.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f15e41f..8ec0f13 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-2.0.6.tgz +lxml-2.0.7.tar.gz diff --git a/python-lxml.spec b/python-lxml.spec index 40f99f4..5cc9d6f 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,14 +1,15 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.6 +Version: 2.0.7 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt Group: Development/Libraries License: BSD URL: http://codespeak.net/lxml/ -Source0: http://codespeak.net/lxml/lxml-%{version}.tgz +Source0: http://cheeseshop.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz +#Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxslt-devel @@ -48,6 +49,10 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog +* Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 +- Update to 2.0.7 +- Update download URL + * Sat May 31 2008 Jeffrey C. Ollie - 2.0.6-1 - Update to 2.0.6 diff --git a/sources b/sources index 72d3739..7b44c80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6749a36142b44a969c25a589f51f755 lxml-2.0.6.tgz +f72a3ce319b286926ac08ae66d30cd31 lxml-2.0.7.tar.gz From fd5d4a9088b991ccfe5268f598c652de5e156c79 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 25 Jul 2008 15:13:36 +0000 Subject: [PATCH 09/13] - Update to 2.0.8 --- .cvsignore | 2 +- branch | 2 +- python-lxml.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8ec0f13..9b35909 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-2.0.7.tar.gz +lxml-2.0.8.tar.gz diff --git a/branch b/branch index 6ec5cef..1c26f78 100644 --- a/branch +++ b/branch @@ -1 +1 @@ -EL-4 +F-9 diff --git a/python-lxml.spec b/python-lxml.spec index 5cc9d6f..f6af847 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.7 +Version: 2.0.8 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -49,6 +49,9 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog +* Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 +- Update to 2.0.8 + * Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 - Update to 2.0.7 - Update download URL diff --git a/sources b/sources index 7b44c80..1de509c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f72a3ce319b286926ac08ae66d30cd31 lxml-2.0.7.tar.gz +f3e7ad6e0e4b66d596e8f301c6943b43 lxml-2.0.8.tar.gz From b1b8c9cb8cc7bfd8b9e9ddc515351c3d46ce01fc Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 25 Jul 2008 15:54:33 +0000 Subject: [PATCH 10/13] - Revert CVS back to a version of lxml that actually builds on EL-4. --- .cvsignore | 2 +- branch | 2 +- python-lxml.spec | 39 ++++++--------------------------------- sources | 2 +- 4 files changed, 9 insertions(+), 36 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9b35909..6803f34 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-2.0.8.tar.gz +lxml-1.3.6.tar.gz diff --git a/branch b/branch index 1c26f78..6ec5cef 100644 --- a/branch +++ b/branch @@ -1 +1 @@ -F-9 +EL-4 diff --git a/python-lxml.spec b/python-lxml.spec index f6af847..da7d371 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,24 +1,19 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-lxml -Version: 2.0.8 -Release: 1%{?dist} +Version: 1.3.6 +Release: 2%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt Group: Development/Libraries License: BSD URL: http://codespeak.net/lxml/ Source0: http://cheeseshop.python.org/packages/source/l/lxml/lxml-%{version}.tar.gz -#Source0: http://codespeak.net/lxml/lxml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python-devel BuildRequires: libxslt-devel - -%if 0%{?fedora} >= 8 -BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif +BuildRequires: python-setuptools %description lxml provides a Python binding to the libxslt and libxml2 libraries. @@ -49,30 +44,8 @@ rm -rf %{buildroot} %{python_sitearch}/* %changelog -* Fri Jul 25 2008 Jeffrey C. Ollie - 2.0.8-1 -- Update to 2.0.8 - -* Fri Jun 20 2008 Jeffrey C. Ollie - 2.0.7-1 -- Update to 2.0.7 -- Update download URL - -* Sat May 31 2008 Jeffrey C. Ollie - 2.0.6-1 -- Update to 2.0.6 - -* Thu May 8 2008 Jeffrey C. Ollie - 2.0.5-1 -- Update to 2.0.5 - -* Wed Mar 26 2008 Jeffrey C. Ollie - 2.0.3-1 -- Update to 2.0.3 - -* Sat Feb 23 2008 Jeffrey C. Ollie - 2.0.2-1 -- Update to 2.0.2 - -* Tue Feb 19 2008 Jeffrey C. Ollie - 2.0.1-1 -- Update to 2.0.1 - -* Tue Feb 19 2008 Fedora Release Engineering - 1.3.6-2 -- Autorebuild for GCC 4.3 +* Fri Jul 25 2008 Jeffrey C. Ollie - 1.3.6-2 +- Revert CVS back to a version of lxml that actually builds on EL-4. * Mon Nov 4 2007 Jeffrey C. Ollie - 1.3.6-1 - Update to 1.3.6. diff --git a/sources b/sources index 1de509c..180a451 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f3e7ad6e0e4b66d596e8f301c6943b43 lxml-2.0.8.tar.gz +a66f3b9669ee4fd2f98b6be920ac583c lxml-1.3.6.tar.gz From c25f65d829c01f948ddfcf7eacf9ebf1eb4b3d82 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 25 Jul 2008 16:02:46 +0000 Subject: [PATCH 11/13] Use setup.py directly. --- python-lxml.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-lxml.spec b/python-lxml.spec index da7d371..af5e8fa 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -29,11 +29,11 @@ unlike the default bindings. chmod a-x doc/rest2html.py %build -CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build +CFLAGS="%{optflags}" %{__python} setup.py build %install rm -rf %{buildroot} -%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} +%{__python} setup.py install --skip-build --root %{buildroot} %clean rm -rf %{buildroot} From b4113283b48ae3d15fad4eb3cabbf9ff66eb3c7c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:52:55 +0000 Subject: [PATCH 12/13] 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 2282443..af4fb17 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := python-lxml 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 8c86e265ca062c7c161ac22c3de333066f364c3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:28:56 +0000 Subject: [PATCH 13/13] 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 af4fb17..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-lxml -# $Id$ -NAME := python-lxml -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