SPECS: iptables.spec - -libs conflict before split, %{rel} macro cleanup (n...

[glen]

Author: glen                         Date: Thu Mar 26 11:15:31 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -libs conflict before split, %{rel} macro cleanup (no longer needed); rel 4

---- Files affected:
SPECS:
   iptables.spec (1.265 -> 1.266) 

---- Diffs:

================================================================
Index: SPECS/iptables.spec
diff -u SPECS/iptables.spec:1.265 SPECS/iptables.spec:1.266
--- SPECS/iptables.spec:1.265	Thu Mar 26 10:19:08 2009
+++ SPECS/iptables.spec	Thu Mar 26 12:15:25 2009
@@ -16,8 +16,6 @@
 %define		netfilter_snap		20070806
 %define		llh_version		7:2.6.22.1
 %define		name6			ip6tables
-#
-%define		rel 3
 Summary:	Extensible packet filtering system && extensible NAT system
 Summary(pl.UTF-8):	System filtrowania pakietów oraz system translacji adresów (NAT)
 Summary(pt_BR.UTF-8):	Ferramenta para controlar a filtragem de pacotes no kernel-2.6.x
@@ -26,7 +24,7 @@
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		iptables
 Version:	1.4.3
-Release:	%{rel}
+Release:	4
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -108,6 +106,7 @@
 Summary:	iptables libraries
 Summary(pl.UTF-8):	Biblioteki iptables
 Group:		Development/Libraries
+Conflicts:	iptables < 1.4.3-1
 
 %description libs
 iptables libraries.
@@ -144,7 +143,6 @@
 %package init
 Summary:	Iptables init (RedHat style)
 Summary(pl.UTF-8):	Iptables init (w stylu RedHata)
-Release:	%{rel}
 Group:		Networking/Admin
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}
@@ -397,6 +395,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.266  2009/03/26 11:15:25  glen
+- -libs conflict before split, %{rel} macro cleanup (no longer needed); rel 4
+
 Revision 1.265  2009/03/26 09:19:08  zbyniu
 - old modules now should work; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iptables.spec?r1=1.265&r2=1.266&f=u