Jan Engelhardt 2011-07-10 23:07:58 +00:00 committed by Git OBS Bridge
parent c2990ae943
commit 1e31f54065
2 changed files with 33 additions and 32 deletions

View File

@ -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 * extend ebt_ip6 to allow matching on ipv6-icmp types/codes
* add --concurrent option, which enables using a file lock to * add --concurrent option, which enables using a file lock to
support concurrent scripts updating the ebtables kernel tables support concurrent scripts updating the ebtables kernel tables
- run spec-beautifier over specfile
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 6 11:18:31 UTC 2011 - puzel@novell.com Mon Jun 6 11:18:31 UTC 2011 - puzel@novell.com

View File

@ -22,12 +22,12 @@ Version: 2.0.10.1
Release: 1 Release: 1
License: GPLv2 License: GPLv2
Summary: Ethernet Bridge Tables Summary: Ethernet Bridge Tables
Url: http://ebtables.sourceforge.net/ URL: http://ebtables.sourceforge.net/
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
Source: %name-v2.0.10-1.tar.xz Source: %name-v2.0.10-1.tar.xz
Patch0: %{name}-v2.0.8-makefile.diff Patch0: %name-v2.0.8-makefile.diff
Patch1: %{name}-v2.0.8-initscript.diff Patch1: %name-v2.0.8-initscript.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %_tmppath/%name-%version-build
BuildRequires: xz BuildRequires: xz
%description %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_ip6.{h.save,h}
mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h} mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h}
make \ make \
CFLAGS="%{optflags}" \ CFLAGS="%optflags" \
CXXFLAGS="%{optflags}" \ CXXFLAGS="%optflags" \
LIBDIR=%{_libdir}/%{name} \ LIBDIR=%_libdir/%name \
MANDIR=%{_mandir} \ MANDIR=%_mandir \
BINDIR=%{_sbindir} \ BINDIR=%_sbindir \
ETCDIR=%{_sysconfdir} \ ETCDIR=%_sysconfdir \
INITDIR=%{_sysconfdir}/init.d \ INITDIR=%_sysconfdir/init.d \
SYSCONFIGDIR=%{_sysconfdir} SYSCONFIGDIR=%_sysconfdir
%install %install
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267] # The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
export SUSE_ASNEEDED=0 export SUSE_ASNEEDED=0
install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %buildroot%_sbindir
install -d -m 755 %{buildroot}%{_sysconfdir}/init.d install -d -m 755 %buildroot%_sysconfdir/init.d
make \ make \
DESTDIR=%{buildroot} \ DESTDIR=%buildroot \
LIBDIR=%{_libdir}/%{name} \ LIBDIR=%_libdir/%name \
MANDIR=%{_mandir} \ MANDIR=%_mandir \
BINDIR=%{_sbindir} \ BINDIR=%_sbindir \
ETCDIR=%{_sysconfdir} \ ETCDIR=%_sysconfdir \
INITDIR=%{_sysconfdir}/init.d \ INITDIR=%_sysconfdir/init.d \
SYSCONFIGDIR=%{_sysconfdir} \ SYSCONFIGDIR=%_sysconfdir \
install install
ln -sf %{_sysconfdir}/init.d/ebtables %{buildroot}%{_sbindir}/rcebtables ln -sf %_sysconfdir/init.d/ebtables %buildroot%_sbindir/rcebtables
# not used # not used
rm -f %{buildroot}%{_sysconfdir}/ebtables-config rm -f %buildroot%_sysconfdir/ebtables-config
%post %post
%fillup_and_insserv ebtables %fillup_and_insserv ebtables
@ -93,14 +93,14 @@ rm -f %{buildroot}%{_sysconfdir}/ebtables-config
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING ChangeLog %doc COPYING ChangeLog
%doc %{_mandir}/man8/ebtables.8* %doc %_mandir/man8/ebtables.8*
%config(noreplace) %{_sysconfdir}/ethertypes %config(noreplace) %_sysconfdir/ethertypes
%{_sysconfdir}/init.d/ebtables %_sysconfdir/init.d/ebtables
%dir %{_libdir}/%{name} %dir %_libdir/%name
%{_libdir}/%{name}/*.so %_libdir/%name/*.so
%{_sbindir}/ebtables %_sbindir/ebtables
%{_sbindir}/ebtables-restore %_sbindir/ebtables-restore
%{_sbindir}/ebtables-save %_sbindir/ebtables-save
%{_sbindir}/rcebtables %_sbindir/rcebtables
%changelog %changelog