rpms/iproute/F-10 iproute2-sharepath.patch, NONE, 1.1 iproute.spec, 1.91, 1.92

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21381

Modified Files:
	iproute.spec 
Added Files:
	iproute2-sharepath.patch 
Log Message:
* Wed Feb  4 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.28-2
- 483484 install distribution files into /usr/share and also fixed
 install paths in spec


iproute2-sharepath.patch:

--- NEW FILE iproute2-sharepath.patch ---
diff -up iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c.movelib iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c
--- iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c.movelib	2009-01-15 21:25:04.000000000 +0100
+++ iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c	2009-02-04 08:58:36.000000000 +0100
@@ -24,8 +24,8 @@
 #include "utils.h"
 #include "tc_util.h"
 
-#ifndef LIBDIR
-#define LIBDIR "/usr/lib/"
+#ifndef SHAREDIR
+#define SHAREDIR "/usr/share/"
 #endif
 
 const char *get_tc_lib(void)
@@ -34,7 +34,7 @@ const char *get_tc_lib(void)
 
 	lib_dir = getenv("TC_LIB_DIR");
 	if (!lib_dir)
-		lib_dir = LIBDIR "/tc/";
+		lib_dir = SHAREDIR "/tc/";
 
 	return lib_dir;
 }


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/F-10/iproute.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- iproute.spec	19 Jan 2009 13:21:36 -0000	1.91
+++ iproute.spec	4 Feb 2009 08:24:27 -0000	1.92
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.28
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 #Source1: iproute-doc-2.6.22.tar.gz
@@ -13,6 +13,7 @@
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute-ip-man.patch
 Patch4: iproute2-2.6.25-segfault.patch
+Patch5: iproute2-sharepath.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +31,7 @@
 %patch2 -p1 -b .opt_flags
 %patch3 -p1
 %patch4 -p1 -b .seg
+%patch5 -p1 -b .share
 
 %build
 export LIBDIR=%{_libdir}
@@ -97,7 +99,7 @@
 %{_mandir}/man8/*
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
 %{_sbindir}/*
-%dir %{_datadir}/tc
+%dir %{_datadir}/tc/
 %{_datadir}/tc/*
 %dir %{_libdir}/tc/
 %{_libdir}/tc/*
@@ -105,6 +107,10 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
 %changelog
+* Wed Feb  4 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.28-2
+- 483484 install distribution files into /usr/share and also fixed
+ install paths in spec
+
 * Mon Jan 19 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.28-1
 - previous two patches were included into 2.6.28 release.
 - update