diff --git a/ebtables.changes b/ebtables.changes index 607210b..c01bf84 100644 --- a/ebtables.changes +++ b/ebtables.changes @@ -10,6 +10,7 @@ Sun Jul 10 23:03:57 UTC 2011 - jengelh@medozas.de * extend ebt_ip6 to allow matching on ipv6-icmp types/codes * add --concurrent option, which enables using a file lock to support concurrent scripts updating the ebtables kernel tables +- run spec-beautifier over specfile ------------------------------------------------------------------- Mon Jun 6 11:18:31 UTC 2011 - puzel@novell.com diff --git a/ebtables.spec b/ebtables.spec index c2a9b21..999358c 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -22,12 +22,12 @@ Version: 2.0.10.1 Release: 1 License: GPLv2 Summary: Ethernet Bridge Tables -Url: http://ebtables.sourceforge.net/ +URL: http://ebtables.sourceforge.net/ Group: Productivity/Networking/Security Source: %name-v2.0.10-1.tar.xz -Patch0: %{name}-v2.0.8-makefile.diff -Patch1: %{name}-v2.0.8-initscript.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: %name-v2.0.8-makefile.diff +Patch1: %name-v2.0.8-initscript.diff +BuildRoot: %_tmppath/%name-%version-build BuildRequires: xz %description @@ -53,32 +53,32 @@ rm -f include/linux/netfilter_bridge/*.h mv include/linux/netfilter_bridge/ebt_ip6.{h.save,h} mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h} make \ - CFLAGS="%{optflags}" \ - CXXFLAGS="%{optflags}" \ - LIBDIR=%{_libdir}/%{name} \ - MANDIR=%{_mandir} \ - BINDIR=%{_sbindir} \ - ETCDIR=%{_sysconfdir} \ - INITDIR=%{_sysconfdir}/init.d \ - SYSCONFIGDIR=%{_sysconfdir} + CFLAGS="%optflags" \ + CXXFLAGS="%optflags" \ + 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 +install -d -m 755 %buildroot%_sbindir +install -d -m 755 %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 %_sysconfdir/init.d/ebtables %buildroot%_sbindir/rcebtables # not used -rm -f %{buildroot}%{_sysconfdir}/ebtables-config +rm -f %buildroot%_sysconfdir/ebtables-config %post %fillup_and_insserv ebtables @@ -93,14 +93,14 @@ rm -f %{buildroot}%{_sysconfdir}/ebtables-config %files %defattr(-,root,root) %doc COPYING ChangeLog -%doc %{_mandir}/man8/ebtables.8* -%config(noreplace) %{_sysconfdir}/ethertypes -%{_sysconfdir}/init.d/ebtables -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/*.so -%{_sbindir}/ebtables -%{_sbindir}/ebtables-restore -%{_sbindir}/ebtables-save -%{_sbindir}/rcebtables +%doc %_mandir/man8/ebtables.8* +%config(noreplace) %_sysconfdir/ethertypes +%_sysconfdir/init.d/ebtables +%dir %_libdir/%name +%_libdir/%name/*.so +%_sbindir/ebtables +%_sbindir/ebtables-restore +%_sbindir/ebtables-save +%_sbindir/rcebtables %changelog