packages (AC-branch): xtables-addons/xtables-addons-geoip-dbpath.patch, xta...

[glen]

Author: glen                         Date: Mon Sep 20 12:44:40 2010 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- use FHS path, fix manpage; rel 15

---- Files affected:
packages/xtables-addons:
   xtables-addons-geoip-dbpath.patch (1.2 -> 1.2.2.1) , xtables-addons.spec (1.50.2.3 -> 1.50.2.4) 

---- Diffs:

================================================================
Index: packages/xtables-addons/xtables-addons-geoip-dbpath.patch
diff -u packages/xtables-addons/xtables-addons-geoip-dbpath.patch:1.2 packages/xtables-addons/xtables-addons-geoip-dbpath.patch:1.2.2.1
--- packages/xtables-addons/xtables-addons-geoip-dbpath.patch:1.2	Wed Feb 18 20:51:31 2009
+++ packages/xtables-addons/xtables-addons-geoip-dbpath.patch	Mon Sep 20 14:44:35 2010
@@ -5,7 +5,7 @@
  #include <xtables.h>
  #include "xt_geoip.h"
 -#define GEOIP_DB_DIR "/var/geoip"
-+#define GEOIP_DB_DIR "/var/lib/geoip"
++#define GEOIP_DB_DIR "/usr/share/xt_geoip"
  
  static void geoip_help(void)
  {
@@ -16,7 +16,7 @@
  The extra files you will need is the binary database files. They are generated
  from a country-subnet database with the geoip_csv_iv0.pl tool, available at
 -http://jengelh.hopto.org/files/geoip/ . The files MUST be moved to /var/geoip/
-+http://jengelh.hopto.org/files/geoip/ . The files MUST be moved to /var/lib/geoip/
++http://jengelh.hopto.org/files/geoip/ . The files MUST be moved to /usr/share/xt_geoip/
  as the shared library is statically looking for this pathname (e.g.
 -/var/geoip/LE/de.iv0).
-+/var/lib/geoip/LE/de.iv0).
++/usr/share/xt_geoip/LE/de.iv0).

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.50.2.3 packages/xtables-addons/xtables-addons.spec:1.50.2.4
--- packages/xtables-addons/xtables-addons.spec:1.50.2.3	Mon Sep 20 14:18:02 2010
+++ packages/xtables-addons/xtables-addons.spec	Mon Sep 20 14:44:35 2010
@@ -20,7 +20,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	14
+%define		rel	15
 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
@@ -82,6 +82,7 @@
 Summary(pl.UTF-8):	Moudły jądra dla xtables addons
 Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
+Conflicts:	xtables-geoip < 20090901-2
 # VERSION only dependency is intentional, for allowing multiple kernel pkgs and
 # single userspace package installs.
 Requires:	%{name} = %{version}
@@ -118,7 +119,7 @@
 %endif
 
 %if %{with userspace}
-%{__make} -C extensions
+%{__make}
 %endif
 
 %install
@@ -136,11 +137,8 @@
 %{__make} -C extensions install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cd extensions
-for m in $(cat .manpages.lst); do
-	cp -a libxt_$m.man $RPM_BUILD_ROOT%{_mandir}/man8/libxt_$m.8
-done
-cd ..
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a xtables-addons.8 $RPM_BUILD_ROOT%{_mandir}/man8
 %endif
 
 %clean
@@ -156,7 +154,7 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xtables/libxt_*.so
-%{_mandir}/man8/libxt_*.*
+%{_mandir}/man8/xtables-addons.8*
 %endif
 
 %if %{with kernel}
@@ -172,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50.2.4  2010/09/20 12:44:35  glen
+- use FHS path, fix manpage; rel 15
+
 Revision 1.50.2.3  2010/09/20 12:18:02  glen
 - release 14
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons-geoip-dbpath.patch?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.50.2.3&r2=1.50.2.4&f=u