SPECS: ebtables.spec - relup friendly release - use %service, deps...

[glen]

Author: glen                         Date: Tue Dec 19 08:10:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- relup friendly release
- use %service, deps
- unify, adapter

---- Files affected:
SPECS:
   ebtables.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/ebtables.spec
diff -u SPECS/ebtables.spec:1.14 SPECS/ebtables.spec:1.15
--- SPECS/ebtables.spec:1.14	Tue Dec 19 07:12:24 2006
+++ SPECS/ebtables.spec	Tue Dec 19 09:10:00 2006
@@ -4,17 +4,21 @@
 #	- initscripts stuff - move save/restore dumps to /etc/sysconfig & more
 #	- review llh patch
 #
+%define		_rel	1
+%define		_pre	rc3
 Summary:	Ethernet Bridge Tables
 Summary(pl):	Ethernet Bridge Tables - filtrowanie i translacja adresów dla Ethernetu
 Name:		ebtables
 Version:	2.0.8
-%define		_pre	rc3
-Release:	0.%{_pre}.1
+Release:	0.%{_pre}.%{_rel}
 License:	GPL
 Group:		Networking/Daemons
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-v%{version}-%{_pre}.tar.gz
+Source0:	http://dl.sourceforge.net/ebtables/%{name}-v%{version}-%{_pre}.tar.gz
 # Source0-md5:	92f0dd5107b92a744e104f50f9b2dd2d
 URL:		http://ebtables.sourceforge.net/
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,7 +41,8 @@
 %setup -q -n %{name}-v%{version}-%{_pre}
 
 %build
-%{__make} CC="%{__cc}"
+%{__make} \
+	CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,8 +69,6 @@
 install ebtables.sysv		$RPM_BUILD_ROOT/etc/rc.d/init.d/ebtables
 sed -i "s/__SYSCONFIG__/$__iets2/g" ebtables-config
 install ebtables-config		$RPM_BUILD_ROOT/etc/sysconfig
-unset __iets
-unset __iets2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,7 +78,7 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service ebtables stop &>/dev/null || :
+	%service ebtables stop
 	/sbin/chkconfig --del ebtables
 fi
 
@@ -96,6 +99,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/12/19 08:10:00  glen
+- relup friendly release
+- use %service, deps
+- unify, adapter
+
 Revision 1.14  2006/12/19 06:12:24  shadzik
 - 2.0.8-rc3
 - patch0 no longer needed (already upstream)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ebtables.spec?r1=1.14&r2=1.15&f=u