From b0f23a5a70ce533854f9cd7245b3e9708d76584e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:53:09 +0000 Subject: [PATCH 01/16] Initialize branch F-10 for libnetfilter_conntrack --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 28c7c78e417d7ec71da4356610610c3a006a9ebe Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:04:58 +0000 Subject: [PATCH 02/16] Initialize branch F-11 for libnetfilter_conntrack --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From ae3135f7c8e88e75789bb49feb868d60f190c2c3 Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: Fri, 1 May 2009 11:54:18 +0000 Subject: [PATCH 03/16] libnetfilter_conntrack-0.0.99-2 --- .cvsignore | 2 +- libnetfilter_conntrack.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 63a537b..d2cd32e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libnetfilter_conntrack-0.0.97.tar.bz2 +libnetfilter_conntrack-0.0.99.tar.bz2 diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index eef7cac..cca70fb 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -2,8 +2,8 @@ # %define basever 0.0.82 Name: libnetfilter_conntrack -Version: 0.0.97 -Release: 1%{?dist} +Version: 0.0.99 +Release: 2%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPLv2+ @@ -61,6 +61,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.0.99-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 13 2009 Paul P. Komkoff Jr - 0.0.99-1 +- new upstream version + * Sun Oct 26 2008 Paul P. Komkoff Jr - 0.0.97-1 - new upstream version diff --git a/sources b/sources index 8b98b50..23cea39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25b341b6ae14e0c40e9cf5088fd7ae09 libnetfilter_conntrack-0.0.97.tar.bz2 +960c3d347d7f4e3fe7437aa198f36e6e libnetfilter_conntrack-0.0.99.tar.bz2 From d6618f377b91430ffd9c8387be8cc0ec881baa25 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:21:30 +0000 Subject: [PATCH 04/16] Initialize branch F-12 for libnetfilter_conntrack --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From c3d8c3b50e5554d63bf90155a632d44abd445420 Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: Sun, 8 Nov 2009 17:55:28 +0000 Subject: [PATCH 05/16] libnetfilter_conntrack-0.0.100-1 --- .cvsignore | 2 +- libnetfilter_conntrack.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index d2cd32e..676a27a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libnetfilter_conntrack-0.0.99.tar.bz2 +libnetfilter_conntrack-0.0.100.tar.bz2 diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index cca70fb..f80866f 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -1,9 +1,6 @@ -# %define rev 7356 -# %define basever 0.0.82 - Name: libnetfilter_conntrack -Version: 0.0.99 -Release: 2%{?dist} +Version: 0.0.100 +Release: 1%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPLv2+ @@ -12,7 +9,7 @@ Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.t Patch0: libnetfilter_conntrack-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libnfnetlink-devel >= 0.0.39, pkgconfig, kernel-headers +BuildRequires: libnfnetlink-devel >= 1.0.0, pkgconfig, kernel-headers %description libnetfilter_conntrack is a userspace library providing a programming @@ -21,7 +18,7 @@ interface (API) to the in-kernel connection tracking state table. %package devel Summary: Netfilter conntrack userspace library Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 0.0.39 +Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.0 Requires: kernel-headers %description devel @@ -61,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Mon Sep 28 2009 Paul P. Komkoff Jr - 0.0.100-1 +- new upstream version + +* Fri Jul 24 2009 Fedora Release Engineering - 0.0.99-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.99-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 23cea39..419bff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -960c3d347d7f4e3fe7437aa198f36e6e libnetfilter_conntrack-0.0.99.tar.bz2 +c047cea509621cf2abed0718cb210972 libnetfilter_conntrack-0.0.100.tar.bz2 From 525e00774dcde9b11755f5453a46a50876334d71 Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: Sun, 8 Nov 2009 17:55:29 +0000 Subject: [PATCH 06/16] libnetfilter_conntrack-0.0.100-1 --- .cvsignore | 2 +- libnetfilter_conntrack.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index d2cd32e..676a27a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libnetfilter_conntrack-0.0.99.tar.bz2 +libnetfilter_conntrack-0.0.100.tar.bz2 diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index cca70fb..f80866f 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -1,9 +1,6 @@ -# %define rev 7356 -# %define basever 0.0.82 - Name: libnetfilter_conntrack -Version: 0.0.99 -Release: 2%{?dist} +Version: 0.0.100 +Release: 1%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPLv2+ @@ -12,7 +9,7 @@ Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.t Patch0: libnetfilter_conntrack-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libnfnetlink-devel >= 0.0.39, pkgconfig, kernel-headers +BuildRequires: libnfnetlink-devel >= 1.0.0, pkgconfig, kernel-headers %description libnetfilter_conntrack is a userspace library providing a programming @@ -21,7 +18,7 @@ interface (API) to the in-kernel connection tracking state table. %package devel Summary: Netfilter conntrack userspace library Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 0.0.39 +Requires: %{name} = %{version}-%{release}, libnfnetlink-devel >= 1.0.0 Requires: kernel-headers %description devel @@ -61,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Mon Sep 28 2009 Paul P. Komkoff Jr - 0.0.100-1 +- new upstream version + +* Fri Jul 24 2009 Fedora Release Engineering - 0.0.99-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 0.0.99-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 23cea39..419bff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -960c3d347d7f4e3fe7437aa198f36e6e libnetfilter_conntrack-0.0.99.tar.bz2 +c047cea509621cf2abed0718cb210972 libnetfilter_conntrack-0.0.100.tar.bz2 From 68699eb18034e1840081b79f72eee21510ddf3e5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:51:00 +0000 Subject: [PATCH 07/16] 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 dec111e..eff25e1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libnetfilter_conntrack 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 97dfcb49e2ddfc34a55cdabdc7abf2a123dc7d5a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:51:00 +0000 Subject: [PATCH 08/16] 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 dec111e..eff25e1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libnetfilter_conntrack 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 018ffcf3c657828b12b33785b4eb054c64edaa48 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:51:01 +0000 Subject: [PATCH 09/16] 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 dec111e..eff25e1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libnetfilter_conntrack 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 8f84787fa1b49c82dd391343b3e7ed18b024d0ae Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: Wed, 20 Jan 2010 14:41:31 +0000 Subject: [PATCH 10/16] New upstream version --- .cvsignore | 2 +- libnetfilter_conntrack.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 676a27a..88ecdfb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libnetfilter_conntrack-0.0.100.tar.bz2 +libnetfilter_conntrack-0.0.101.tar.bz2 diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index f80866f..bc178ba 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -1,5 +1,5 @@ Name: libnetfilter_conntrack -Version: 0.0.100 +Version: 0.0.101 Release: 1%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Wed Jan 20 2010 Paul P. Komkoff Jr - 0.0.101-1 +- new upstream version + * Mon Sep 28 2009 Paul P. Komkoff Jr - 0.0.100-1 - new upstream version diff --git a/sources b/sources index 419bff4..1312271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c047cea509621cf2abed0718cb210972 libnetfilter_conntrack-0.0.100.tar.bz2 +3c4b4048c914f2694c3ca6de2bb457dc libnetfilter_conntrack-0.0.101.tar.bz2 From 8292c40a2fae6f4ae2338574f861b43a8cd5c255 Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: Wed, 20 Jan 2010 14:41:31 +0000 Subject: [PATCH 11/16] New upstream version --- .cvsignore | 2 +- libnetfilter_conntrack.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 676a27a..88ecdfb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libnetfilter_conntrack-0.0.100.tar.bz2 +libnetfilter_conntrack-0.0.101.tar.bz2 diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index f80866f..bc178ba 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -1,5 +1,5 @@ Name: libnetfilter_conntrack -Version: 0.0.100 +Version: 0.0.101 Release: 1%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Wed Jan 20 2010 Paul P. Komkoff Jr - 0.0.101-1 +- new upstream version + * Mon Sep 28 2009 Paul P. Komkoff Jr - 0.0.100-1 - new upstream version diff --git a/sources b/sources index 419bff4..1312271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c047cea509621cf2abed0718cb210972 libnetfilter_conntrack-0.0.100.tar.bz2 +3c4b4048c914f2694c3ca6de2bb457dc libnetfilter_conntrack-0.0.101.tar.bz2 From 8a128c4c979f37e5789ceba2052980799d3aa2f3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:53:42 +0000 Subject: [PATCH 12/16] Initialize branch F-13 for libnetfilter_conntrack --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 70265dd22b1a4482e5ef020e8db5411a8a1c5f54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:21:11 +0000 Subject: [PATCH 13/16] 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 eff25e1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libnetfilter_conntrack -# $Id$ -NAME := libnetfilter_conntrack -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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From e971d1b1d71d3ade69eae16038e58bcebc11bd95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:21:12 +0000 Subject: [PATCH 14/16] 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 eff25e1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libnetfilter_conntrack -# $Id$ -NAME := libnetfilter_conntrack -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From d0c3bc195e48d58b43cb53467fbea3de1b88c851 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:21:13 +0000 Subject: [PATCH 15/16] 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 eff25e1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libnetfilter_conntrack -# $Id$ -NAME := libnetfilter_conntrack -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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10 From e1424d8da616da468f76d010ddc253a162aeb488 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 21:21:17 +0000 Subject: [PATCH 16/16] 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 eff25e1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libnetfilter_conntrack -# $Id$ -NAME := libnetfilter_conntrack -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11