Hello community, here is the log from the commit of package ebtables for openSUSE:Factory checked in at 2017-04-17 10:20:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ebtables (Old) and /work/SRC/openSUSE:Factory/.ebtables.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ebtables" Mon Apr 17 10:20:48 2017 rev:38 rq:483896 version:2.0.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes 2016-06-07 23:47:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2017-04-17 10:20:49.516829998 +0200 @@ -1,0 +2,7 @@ +Thu Mar 23 15:14:46 UTC 2017 - [email protected] + +- cleanup with spec-cleaner +- get rid of %{name} macros in the patch names +- remove sysvinit support + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ebtables.spec ++++++ --- /var/tmp/diff_new_pack.LUTP2R/_old 2017-04-17 10:20:50.272722946 +0200 +++ /var/tmp/diff_new_pack.LUTP2R/_new 2017-04-17 10:20:50.276722379 +0200 @@ -1,7 +1,7 @@ # # spec file for package ebtables # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,11 @@ Group: Productivity/Networking/Security Url: http://ebtables.sf.net/ #Git-Clone: git://git.netfilter.org/ebtables -Source: %{name}-v2.0.10-4.tar.xz -Source1: %{name}.service -Source2: %{name}.systemd -Patch0: %{name}-v2.0.8-makefile.diff -Patch1: %{name}-v2.0.8-initscript.diff +Source: ebtables-v2.0.10-4.tar.xz +Source1: ebtables.service +Source2: ebtables.systemd +Patch0: ebtables-v2.0.8-makefile.diff +Patch1: ebtables-v2.0.8-initscript.diff # PATCH-FIX-UPSTREAM bnc#934680 [email protected] -- audit patch for CC certification Patch2: ebtables-v2.0.10-4-audit.patch # PATCH-FIX-UPSTREAM @@ -37,16 +37,11 @@ Patch4: include-linux-if.patch BuildRequires: linux-glibc-devel >= 2.6.20 BuildRequires: sed -BuildRequires: xz -%if 0%{?suse_version} > 1210 BuildRequires: systemd-rpm-macros +BuildRequires: xz Requires(pre): %fillup_prereq -%{?systemd_requires} -%else -BuildRequires: sysvinit -Requires(pre): %insserv_prereq -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description A firewalling tool to transparently filter network traffic passing a @@ -97,66 +92,43 @@ INITDIR="%{_sysconfdir}/init.d" \ SYSCONFIGDIR="%{_sysconfdir}" \ install -%if 0%{?suse_version} > 1210 -mkdir -p %{buildroot}/var/adm/fillup-templates +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_unitdir} install -p %{SOURCE1} %{buildroot}%{_unitdir}/ chmod -x %{buildroot}%{_unitdir}/*.service mkdir -p %{buildroot}%{_libexecdir} install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} -touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.filter -touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.nat -touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.broute +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter +touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat +touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute rm -rf %{buildroot}%{_initrddir} -%else -ln -sf "%{_initddir}/ebtables" "%{buildroot}/%{_sbindir}/rcebtables" -%endif # not used rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config" -%if 0%{?suse_version} > 1210 %pre %service_add_pre %{name}.service -%endif %post -%if 0%{?suse_version} > 1210 %service_add_post %{name}.service %fillup_only -%else -%fillup_and_insserv ebtables -%endif %preun -%if 0%{?suse_version} > 1210 %service_del_preun %{name}.service -%else -%stop_on_removal ebtables -%endif %postun -%if 0%{?suse_version} > 1210 %service_del_postun %{name}.service -%else -%restart_on_update ebtables -%insserv_cleanup -%endif %files %defattr(-,root,root) %doc COPYING ChangeLog %{_mandir}/man8/ebtables.8* %config(noreplace) %{_sysconfdir}/ethertypes -%if 0%{?suse_version} > 1210 %{_libexecdir}/%{name} %{_unitdir}/%{name}.service -%ghost /var/adm/fillup-templates/sysconfig.%{name}.filter -%ghost /var/adm/fillup-templates/sysconfig.%{name}.nat -%ghost /var/adm/fillup-templates/sysconfig.%{name}.broute -%else -%{_initddir}/ebtables -%endif +%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter +%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat +%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %{_sbindir}/ebtables
