packages: udev/udev.spec - seems to build properly now, with proper paths b...

[baggins]

Author: baggins                      Date: Sun Feb 19 19:16:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- seems to build properly now, with proper paths built-in

---- Files affected:
packages/udev:
   udev.spec (1.373 -> 1.374) 

---- Diffs:

================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.373 packages/udev/udev.spec:1.374
--- packages/udev/udev.spec:1.373	Sun Feb 19 19:57:20 2012
+++ packages/udev/udev.spec	Sun Feb 19 20:16:37 2012
@@ -317,8 +317,9 @@
 	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -D_BSD_SOURCE"} \
 	%{?with_klibc:CC="%{_bindir}/klcc"} \
 	%{?debug:--enable-debug} \
-	--bindir=%{_sbindir} \
 	--libexecdir=/lib \
+	--bindir=%{_sbindir} \
+	--with-rootprefix="" \
 	--with-rootlibdir=/%{_lib} \
 	--disable-rule_generator \
 	--disable-udev_acl \
@@ -346,9 +347,10 @@
 
 %configure \
 	%{?debug:--enable-debug} \
-	--bindir=%{_sbindir} \
 	--libexecdir=/lib \
 	--with-html-dir=%{_gtkdocdir} \
+	--bindir=%{_sbindir} \
+	--with-rootprefix="" \
 	--with-rootlibdir=/%{_lib} \
 	--disable-silent-rules \
 	--enable-edd \
@@ -367,13 +369,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,udev/rules.d} \
-	$RPM_BUILD_ROOT/lib/udev/devices
+	$RPM_BUILD_ROOT{/lib/udev/devices,/usr/lib,%{_bindir}}
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_sbindir}/udevd
 
+# compat symlinks for "/ merged into /usr" programs
+ln -s %{_sbindir}/udevadm $RPM_BUILD_ROOT%{_bindir}
+
 # install custom rules from pld package
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-udev-pld.rules
@@ -510,6 +515,7 @@
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udevd
 %attr(755,root,root) %{_sbindir}/udevadm
+%attr(755,root,root) %{_bindir}/udevadm
 
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
@@ -622,6 +628,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.374  2012/02/19 19:16:37  baggins
+- seems to build properly now, with proper paths built-in
+
 Revision 1.373  2012/02/19 18:57:20  baggins
 - firmware loader has been internalized
 - as were usb-db and pci-db
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.373&r2=1.374&f=u