Author: nanardon
Date: Fri Feb 16 16:02:43 2007
New Revision: 121853
Added:
packages/cooker/libnl/current/SOURCES/libnl-dont-install-as-root.patch
Modified:
packages/cooker/libnl/current/SPECS/libnl.spec
Log:
- fix installation (path0: owner during install setup, and libdir)
Added: packages/cooker/libnl/current/SOURCES/libnl-dont-install-as-root.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libnl/current/SOURCES/libnl-dont-install-as-root.patch
Fri Feb 16 16:02:43 2007
@@ -0,0 +1,29 @@
+Index: include/Makefile
+===================================================================
+--- include/Makefile
++++ include/Makefile 2007-02-16 15:54:46.782184758 +0100
+@@ -27,7 +27,7 @@
+ install:
+ mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/sch/
+ mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/cls/
+- install -o root -g root -m 0644 netlink/*.h
$(DESTDIR)$(prefix)/include/netlink/
+- install -o root -g root -m 0644 netlink/route/*.h
$(DESTDIR)$(prefix)/include/netlink/route/
+- install -o root -g root -m 0644 netlink/route/sch/*.h
$(DESTDIR)$(prefix)/include/netlink/route/sch/
+- install -o root -g root -m 0644 netlink/route/cls/*.h
$(DESTDIR)$(prefix)/include/netlink/route/cls/
++ install -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/
++ install -m 0644 netlink/route/*.h
$(DESTDIR)$(prefix)/include/netlink/route/
++ install -m 0644 netlink/route/sch/*.h
$(DESTDIR)$(prefix)/include/netlink/route/sch/
++ install -m 0644 netlink/route/cls/*.h
$(DESTDIR)$(prefix)/include/netlink/route/cls/
+Index: lib/Makefile
+===================================================================
+--- lib/Makefile
++++ lib/Makefile 2007-02-16 15:53:56.497870462 +0100
+@@ -58,7 +58,7 @@
+
+ install:
+ mkdir -p $(DESTDIR)$(LIBDIR)/
+- install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
++ install -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR)
+ rm -f $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) ; \
+ $(LN) -s $(OUT_SLIB) $(DESTDIR)$(LIBDIR)/$(LN1_SLIB)
+ rm -f $(DESTDIR)$(LIBDIR)/$(LN_SLIB) ; \
Modified: packages/cooker/libnl/current/SPECS/libnl.spec
==============================================================================
--- packages/cooker/libnl/current/SPECS/libnl.spec (original)
+++ packages/cooker/libnl/current/SPECS/libnl.spec Fri Feb 16 16:02:43 2007
@@ -2,7 +2,7 @@
%define version 1.0
%define pre pre5
%if %{pre}
-%define release %mkrel 0.%{pre}.2
+%define release %mkrel 0.%{pre}.3
%define fullversion %{version}-%{pre}
%else
%define release %mkrel 1
@@ -19,6 +19,7 @@
Group: System/X11
URL: http://people.suug.ch/~tgr/libnl/
Source0:
http://people.suug.ch/~tgr/libnl/files/libnl-%{fullversion}.tar.bz2
+Patch0: libnl-dont-install-as-root.patch
BuildRoot: %{_tmppath}/%{name}-buildroot
%description
@@ -72,6 +73,7 @@
%prep
%setup -q -n %{name}-%{fullversion}
+%patch -p0 -b .install-root
%build
@@ -81,7 +83,7 @@
%install
rm -rf %buildroot
-%{makeinstall_std}
+%{makeinstall_std} LIBDIR=%_libdir
install -d %{buildroot}%{_libdir}/pkgconfig/
cat << EOF > %{buildroot}%{_libdir}/pkgconfig/%{name}-%{major}.pc
