Hello community, here is the log from the commit of package ebtables for openSUSE:Factory checked in at 2014-10-01 11:23:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ebtables (Old) and /work/SRC/openSUSE:Factory/.ebtables.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ebtables" Changes: -------- --- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes 2014-03-20 07:04:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2014-10-01 11:23:35.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 15:28:21 UTC 2014 - jengelh@inai.de + +- Remove support for old distros from specfile + (prjconf can do substitutions instead) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ebtables.spec ++++++ --- /var/tmp/diff_new_pack.1TPyHD/_old 2014-10-01 11:23:37.000000000 +0200 +++ /var/tmp/diff_new_pack.1TPyHD/_new 2014-10-01 11:23:37.000000000 +0200 @@ -24,21 +24,14 @@ Group: Productivity/Networking/Security Url: http://ebtables.sf.net/ +#Git-Clone: git://git.netfilter.org/ebtables Source: %name-v2.0.10-4.tar.xz Patch0: %name-v2.0.8-makefile.diff Patch1: %name-v2.0.8-initscript.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: linux-glibc-devel >= 2.6.20 BuildRequires: sed BuildRequires: xz -%if 0%{?suse_version} >= 1140 -BuildRequires: linux-glibc-devel >= 2.6.20 -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: linux-kernel-headers >= 2.6.20 -%endif -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -BuildRequires: kernel-headers >= 2.6.20 -%endif %description A firewalling tool to transparently filter network traffic passing a @@ -48,14 +41,8 @@ iptables. There are no incompatibility issues. %prep -%if 0%{?__xz:1} %setup -q -n %name-v2.0.10-4 -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn %name-v2.0.10-4 -%endif -%patch0 -%patch1 +%patch -P 0 -P 1 -p0 %build # The way ebtables is built requires ASNEEDED=0 forever [bnc#567267] @@ -70,30 +57,29 @@ make \ CFLAGS="%optflags" \ CXXFLAGS="%optflags" \ - LIBDIR=%_libdir/%name \ - MANDIR=%_mandir \ - BINDIR=%_sbindir \ - ETCDIR=%_sysconfdir \ - INITDIR=%_sysconfdir/init.d \ - SYSCONFIGDIR=%_sysconfdir + LIBDIR="%_libdir/%name" \ + MANDIR="%_mandir" \ + BINDIR="%_sbindir" \ + ETCDIR="%_sysconfdir" \ + INITDIR="%_sysconfdir/init.d" \ + SYSCONFIGDIR="%_sysconfdir" %install # The way ebtables is built requires ASNEEDED=0 forever [bnc#567267] export SUSE_ASNEEDED=0 -install -d -m 755 %buildroot%_sbindir -install -d -m 755 %buildroot%_sysconfdir/init.d +mkdir -p "%buildroot/%_sysconfdir/init.d" make \ - DESTDIR=%buildroot \ - LIBDIR=%_libdir/%name \ - MANDIR=%_mandir \ - BINDIR=%_sbindir \ - ETCDIR=%_sysconfdir \ - INITDIR=%_sysconfdir/init.d \ - SYSCONFIGDIR=%_sysconfdir \ + DESTDIR="%buildroot" \ + LIBDIR="%_libdir/%name" \ + MANDIR="%_mandir" \ + BINDIR="%_sbindir" \ + ETCDIR="%_sysconfdir" \ + INITDIR="%_sysconfdir/init.d" \ + SYSCONFIGDIR="%_sysconfdir" \ install -ln -sf %_sysconfdir/init.d/ebtables %buildroot%_sbindir/rcebtables +ln -sf "%_initddir/ebtables" "%buildroot/%_sbindir/rcebtables" # not used -rm -f %buildroot%_sysconfdir/ebtables-config +rm -f "%buildroot/%_sysconfdir/ebtables-config" %post %fillup_and_insserv ebtables @@ -110,7 +96,7 @@ %doc COPYING ChangeLog %doc %_mandir/man8/ebtables.8* %config(noreplace) %_sysconfdir/ethertypes -%_sysconfdir/init.d/ebtables +%_initddir/ebtables %dir %_libdir/%name %_libdir/%name/*.so %_sbindir/ebtables -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org