dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ebtables
-# $Id$
-NAME := ebtables
-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
-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)

ebtables.spec

@@ -1,17 +1,17 @@
-Name:		ebtables
-Version:	2.0.8
-Release:	6%{?dist}
-Summary:	Ethernet Bridge frame table administration tool
-License:	GPLv2+
-Group:		System Environment/Base
-URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-2.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-PreReq:		/sbin/chkconfig
-PreReq:		/sbin/service
-Patch0:         ebtables-2.0.8-norootinst.patch
-Patch1:         ebtables-2.0.8-cflags.patch
-Patch2:         ebtables-2.0.8-buildid.patch
+Name:			ebtables
+Version:		2.0.9
+Release:		1%{?dist}
+Summary:		Ethernet Bridge frame table administration tool
+License:		GPLv2+
+Group:			System Environment/Base
+URL:			http://ebtables.sourceforge.net/
+Source0:		http://dl.sf.net/ebtables/ebtables-v%{version}-1.tar.gz
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(pre):		/sbin/chkconfig
+Requires(postun):	/sbin/service
+Patch0:			ebtables-2.0.8-norootinst.patch
+Patch1:			ebtables-2.0.8-cflags.patch
+Patch2:			ebtables-2.0.8-buildid.patch
 
 %description
 Ethernet bridge tables is a firewalling tool to transparently filter network
@@ -25,11 +25,14 @@ The ebtables tool can be used together with the other Linux filtering tools,
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -q -n ebtables-v%{version}-2
+%setup -q -n ebtables-v%{version}-1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
+# Convert to UTF-8
+f=THANKS; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
+
 %build
 MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'`
 make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" LIBDIR="%{_libdir}/ebtables" BINDIR="/sbin" MANDIR="%{_mandir}"
@@ -76,6 +79,12 @@ fi
 %ghost %{_sysconfdir}/sysconfig/ebtables.broute
 
 %changelog
+* Mon Jul 27 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.9-1
+- update to 2.0.9
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -148,9 +157,9 @@ fi
 * Fri Jul  1 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-4
 - remove INSTALL file
 - add some text to description, correct typos
-- fix %postun
+- fix %%postun
 - add PreReqs
-- add %ghost config files
+- add %%ghost config files
 
 * Tue May 31 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.6-3
 - reworked for Fedora Extras

sources

@@ -1 +1 @@
-66bcbcb2dcf3b981ad4e86e1720e796e  ebtables-v2.0.8-2.tar.gz
+0e0c20adf2bba6d91dbd0b74a1a38c33  ebtables-v2.0.9-1.tar.gz