packages: udev/udev.spec - proper BR - only build introspoection crap if de...

[baggins]

Author: baggins                      Date: Sun Nov  8 23:05:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- proper BR
- only build introspoection crap if debug is on
- don't disable usb stuff on initrd

---- Files affected:
packages/udev:
   udev.spec (1.301 -> 1.302) 

---- Diffs:

================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.301 packages/udev/udev.spec:1.302
--- packages/udev/udev.spec:1.301	Sun Oct 25 00:57:34 2009
+++ packages/udev/udev.spec	Mon Nov  9 00:05:27 2009
@@ -61,7 +61,7 @@
 BuildRequires:	device-mapper-devel
 BuildRequires:	gir-repository-devel
 BuildRequires:	glib2-devel
-BuildRequires:	gobject-introspection-devel
+%{?debug:BuildRequires:	gobject-introspection-devel}
 BuildRequires:	gperf
 BuildRequires:	gtk-doc
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.17.13}
@@ -72,6 +72,11 @@
 BuildRequires:	usbutils >= 0.82
 %if %{with initrd}
 %{?with_dietlibc:BuildRequires:	dietlibc-static}
+BuildRequires:	acl-static
+BuildRequires:	attr-static
+BuildRequires:	pcre-static
+BuildRequires:	libusb-static
+BuildRequires:	glib2-static
 %if %{with glibc}
 BuildRequires:	glibc-static
 BuildRequires:	libselinux-static
@@ -268,15 +273,7 @@
 	--disable-shared \
 	--enable-static \
 	--with-pci-ids-path=%{_sysconfdir} \
-	--with-selinux
-
-# don't build few things for initrd
-cp -a Makefile Makefile.org
-sed -i -e 's#extras/usb_id/usb_id$(EXEEXT)##g' \
-	-e 's#extras/usb-db/usb-db$(EXEEXT)##g' \
-	-e 's#extras/hid2hci/hid2hci$(EXEEXT)##g' \
-	-e 's#extras/modem-modeswitch/modem-modeswitch$(EXEEXT)##g' \
-	Makefile
+	--without-selinux
 
 %{__make} -f Makefile \
 	LDFLAGS="-all-static"
@@ -288,8 +285,6 @@
 %if %{with main}
 %{__make} clean
 %endif
-
-cp -a Makefile.org Makefile
 %endif
 
 %if %{with main}
@@ -300,7 +295,7 @@
 	--with-rootlibdir=/%{_lib} \
 	--enable-extras \
 	--enable-gtk-doc \
-	--enable-introspection \
+	%{?debug:--enable-introspection} \
 	--enable-logging \
 	--enable-shared \
 	--enable-static \
@@ -545,6 +540,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.302  2009/11/08 23:05:27  baggins
+- proper BR
+- only build introspoection crap if debug is on
+- don't disable usb stuff on initrd
+
 Revision 1.301  2009/10/24 22:57:34  sls
 - install initramfs scripts outside initrd bcond
 
================================================================

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