Jan Engelhardt 2011-05-31 22:54:51 +00:00 committed by Git OBS Bridge
parent b237df0556
commit cb2b55f98b
2 changed files with 28 additions and 27 deletions

View File

@ -4,6 +4,7 @@ Tue May 31 21:35:16 UTC 2011 - jengelh@medozas.de
- Correct installation path of tc modules - Correct installation path of tc modules
- Restore symbol lookup in m_xt.so (bnc#660554, bnc#679172) - Restore symbol lookup in m_xt.so (bnc#660554, bnc#679172)
- Add patches to make m_xt build with libxtables6 - Add patches to make m_xt build with libxtables6
- Run spec-beautifier
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 30 11:50:56 UTC 2011 - jengelh@medozas.de Mon May 30 11:50:56 UTC 2011 - jengelh@medozas.de

View File

@ -26,7 +26,7 @@ Version: 2.6.38
Release: 2 Release: 2
%define rversion 2.6.38 %define rversion 2.6.38
Summary: Advanced Routing Summary: Advanced Routing
Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
Source0: %name-%rversion.tar.bz2 Source0: %name-%rversion.tar.bz2
Patch0: %name-libdir-1.diff Patch0: %name-libdir-1.diff
Patch1: %name-HZ.diff Patch1: %name-HZ.diff
@ -34,8 +34,8 @@ Patch2: %name-pdfdoc.diff
Patch3: %name-memleak.diff Patch3: %name-memleak.diff
Patch4: iproute2-xt.diff Patch4: iproute2-xt.diff
Patch5: iproute2-libxtables6.diff Patch5: iproute2-libxtables6.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %_tmppath/%name-%version-build
BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel BuildRequires: bison, db-devel, flex, ghostscript-fonts-std, ghostscript-x11, libpng-devel, libtiff-devel, sgmltool, texlive-latex, xorg-x11-devel
%define with_xt 1 %define with_xt 1
%if 0%{?with_xt} %if 0%{?with_xt}
BuildRequires: iptables-devel BuildRequires: iptables-devel
@ -85,44 +85,44 @@ find . -name *.orig -print0 | xargs -r0 rm -v
%build %build
# build with -fPIC. For details see # build with -fPIC. For details see
# https://bugzilla.novell.com/show_bug.cgi?id=388021 # https://bugzilla.novell.com/show_bug.cgi?id=388021
make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS -Wstrict-prototypes -fPIC" make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC"
cd doc cd doc
make pdf make pdf
%install %install
install -d $RPM_BUILD_ROOT/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}} install -d %buildroot/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
install -d $RPM_BUILD_ROOT/{/usr/include,%_libdir,/usr/share} install -d %buildroot/{/usr/include,%_libdir,/usr/share}
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir \ make install DESTDIR=%buildroot LIBDIR=%_libdir \
MODDESTDIR="$RPM_BUILD_ROOT/%_libdir/tc" MODDESTDIR="%buildroot/%_libdir/tc"
# We have m_xt # We have m_xt
rm -f "$RPM_BUILD_ROOT/%_libdir/tc/m_ipt.so" rm -f "%buildroot/%_libdir/tc/m_ipt.so"
install lib/libnetlink.a $RPM_BUILD_ROOT/%_libdir install lib/libnetlink.a %buildroot/%_libdir
install include/libnetlink.h $RPM_BUILD_ROOT/usr/include install include/libnetlink.h %buildroot%_includedir
mv $RPM_BUILD_ROOT/usr/sbin/ip $RPM_BUILD_ROOT/sbin mv %buildroot%_sbindir/ip %buildroot/sbin
mkdir -p $RPM_BUILD_ROOT/bin mkdir -p %buildroot/bin
ln -sf /sbin/ip $RPM_BUILD_ROOT/bin/ip ln -sf /sbin/ip %buildroot/bin/ip
rm $RPM_BUILD_ROOT/usr/sbin/ifcfg rm %buildroot%_sbindir/ifcfg
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %buildroot
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README* RELNOTES %doc README* RELNOTES
/usr/sbin/* %_sbindir/*
/sbin/* /sbin/*
/bin/ip /bin/ip
%_mandir/man8/* %_mandir/man8/*
%dir /etc/iproute2 %dir %_sysconfdir/iproute2
%config(noreplace) /etc/iproute2/rt_dsfield %config(noreplace) %_sysconfdir/iproute2/rt_dsfield
%config(noreplace) /etc/iproute2/rt_protos %config(noreplace) %_sysconfdir/iproute2/rt_protos
%config(noreplace) /etc/iproute2/rt_scopes %config(noreplace) %_sysconfdir/iproute2/rt_scopes
%config(noreplace) /etc/iproute2/rt_realms %config(noreplace) %_sysconfdir/iproute2/rt_realms
%config(noreplace) /etc/iproute2/rt_tables %config(noreplace) %_sysconfdir/iproute2/rt_tables
%config(noreplace) /etc/iproute2/ematch_map %config(noreplace) %_sysconfdir/iproute2/ematch_map
%_libdir/tc %_libdir/tc
%dir /usr/share/tc %dir %_datadir/tc
%attr(644,root,root)/usr/share/tc/* %attr(644,root,root)%_datadir/tc/*
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
@ -132,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n libnetlink-devel %files -n libnetlink-devel
%defattr(-,root,root) %defattr(-,root,root)
/usr/include/* %_includedir/*
%_mandir/man3/libnetlink* %_mandir/man3/libnetlink*
%_libdir/lib* %_libdir/lib*