rpms/iproute/devel iproute2-backwardcompat.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 iproute.spec, 1.78, 1.79 sources, 1.23, 1.24

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7216

Modified Files:
	.cvsignore iproute.spec sources 
Added Files:
	iproute2-backwardcompat.patch 
Log Message:
- rebuild without tetex files. It isn't working in rawhide yet. Added
    new source for ps files.
- #431179 backward compatibility for previous iproute versions



iproute2-backwardcompat.patch:

--- NEW FILE iproute2-backwardcompat.patch ---
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -107,7 +107,8 @@ static int accept_msg(const struct sockaddr_nl *who,
 {
 	struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(n);
 
-	if (n->nlmsg_type == NLMSG_ERROR && err->error == -EOPNOTSUPP)
+	if (n->nlmsg_type == NLMSG_ERROR &&
+	    (err->error == -EOPNOTSUPP || err->error == -EINVAL))
 		have_rtnl_newlink = 0;
 	else
 		have_rtnl_newlink = 1;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	31 Oct 2007 13:56:07 -0000	1.23
+++ .cvsignore	6 Feb 2008 15:08:41 -0000	1.24
@@ -1 +1,2 @@
 iproute2-2.6.23.tar.bz2
+iproute-doc-2.6.22.tar.gz


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- iproute.spec	1 Feb 2008 10:57:18 -0000	1.78
+++ iproute.spec	6 Feb 2008 15:08:41 -0000	1.79
@@ -7,18 +7,20 @@
 Release: 3%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
+Source1: iproute-doc-2.6.22.tar.gz
 URL:	http://linux-net.osdl.org/index.php/Iproute2
 Patch1: iproute2-2.6.9-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute2-2.6.16-ip_resolve_crash.patch
 Patch4: iproute-ip-man.patch
 Patch5: iproute2-movelib.patch
+Patch6: iproute2-tex.patch
+Patch7: iproute2-backwardcompat.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
-BuildRequires: flex linux-atm-libs-devel
-Conflicts: kernel < 2.6.23
+#BuildRequires: tetex-latex tetex-dvips linuxdoc-tools
+BuildRequires: flex linux-atm-libs-devel psutils db4-devel bison
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
@@ -32,13 +34,16 @@
 %patch3 -p1 -b .ip_resolve
 %patch4 -p1
 %patch5 -p1 -b .movelib
+#remove tex for the while
+%patch6 -p1 -b .wotex
+%patch7 -p1 -b .backw
 
 %build
 export LIBDIR=%{_libdir}
 
 cd iproute2-%{version}
 make %{?_smp_mflags}
-make -C doc
+#make -C doc
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -66,6 +71,15 @@
 cp -f etc/iproute2/* $RPM_BUILD_ROOT/%{_sysconfdir}/iproute2
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
 
+#copy the tex file from source
+
+tar -xvzf %{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}
+pwd
+cd %{name}-doc-2.6.22
+pwd
+cp -pR *.ps ../doc
+
 #create example avpkt file
 cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/cbq-0000.example
 DEVICE=eth0,10Mbit,1Mbit
@@ -86,7 +100,8 @@
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/iproute2
 %doc iproute2-%{version}/README.decnet iproute2-%{version}/README.iproute2+tc iproute2-%{version}/RELNOTES iproute2-%{version}/examples/README.cbq
-%doc iproute2-%{version}/doc/*.ps iproute2-%{version}/examples
+%doc iproute2-%{version}/doc/*.ps 
+%doc iproute2-%{version}/examples
 /sbin/*
 %{_mandir}/man8/*
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
@@ -99,8 +114,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
-* Fri Feb  1 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.23-3
-- iproute doesn't cooperate with lower kernel->add Conflicts
+* Wed Feb  6 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.23-3
+- rebuild without tetex files. It isn't working in rawhide yet. Added
+	new source for ps files. 
+- #431179 backward compatibility for previous iproute versions
 
 * Mon Jan 21 2008 Marcela Maslanova <mmaslano at redhat.com> - 2.6.23-2
 - rebuild with fix tetex and linuxdoc-tools -> manual pdf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	31 Oct 2007 13:56:07 -0000	1.23
+++ sources	6 Feb 2008 15:08:41 -0000	1.24
@@ -1 +1,2 @@
 2e59da739ef19990408cf0a5cb0cae3e  iproute2-2.6.23.tar.bz2
+cb9cbad7f77d93284112e6adf62587a2  iproute-doc-2.6.22.tar.gz