rpms/udev/devel udev.spec,1.256,1.257

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19107

Modified Files:
	udev.spec 
Log Message:
* Tue Dec 16 2008 Harald Hoyer <harald at redhat.com> 135-2
- changed udevsettle -> udevadm settle
- added doc to libudev-devel
- added more attr and defattr
- various rpmlint fixes



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- udev.spec	2 Dec 2008 10:22:49 -0000	1.256
+++ udev.spec	16 Dec 2008 09:42:56 -0000	1.257
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 135
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,6 +18,7 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
+Patch1: udev-135-sepol.patch
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -29,6 +30,7 @@
 BuildRequires: glib2-devel bison findutils MAKEDEV
 %if %{with_static}
 BuildRequires: libselinux-static libsepol-static
+BuildRequires: autoconf libtool
 %endif
 Requires: libselinux >= 0:1.17.9-2 sed 
 Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
@@ -90,24 +92,29 @@
 
 %prep
 %setup -q  
+%if %{with_static}
+%patch1 -p1 -b .sepol
+%endif
 %patch102 -p1 -b .sysconf
 rm rules/redhat/95-pam-console.rules
 
 %build
-%configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib}  --sbindir="/sbin" --enable-static
 %if %{with_static}
-make LDFLAGS=-static %{?_smp_mflags}
+libtoolize -f
+autoreconf 
+%configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib}  --sbindir="/sbin" --enable-static
+make LDFLAGS="-all-static" %{?_smp_mflags}
 for i in udev/udevd \
-       udev/udevadm \
-       extras/scsi_id/scsi_id \
-       extras/ata_id/ata_id \
-       extras/edd_id/edd_id \
-       extras/usb_id/usb_id \
-       extras/cdrom_id/cdrom_id \
-       extras/volume_id/vol_id \
-       extras/floppy/create_floppy_devices \
-       ; do
-       mv $i $i.static
+	udev/udevadm \
+	extras/scsi_id/scsi_id \
+	extras/ata_id/ata_id \
+	extras/edd_id/edd_id \
+	extras/usb_id/usb_id \
+	extras/cdrom_id/cdrom_id \
+	extras/volume_id/vol_id \
+	extras/floppy/create_floppy_devices \
+	; do
+	mv $i $i.static
 done
 make clean
 %endif
@@ -157,6 +164,7 @@
 for i in udev/udevd udev/udevadm; do
 	install -m 0755 $i.static $RPM_BUILD_ROOT/sbin/$(basename $i).static
 done
+
 %endif
 
 for i in \
@@ -256,7 +264,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(0644, root, root, 0755)
 %doc COPYING README TODO ChangeLog docs/* 
 %attr(0755,root,root) /sbin/udevadm
 %attr(0755,root,root) /sbin/udevsettle
@@ -295,7 +303,7 @@
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
 
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
-%config %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
+%attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules
 
 #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
@@ -323,22 +331,25 @@
 
 %if %{with_static}
 %files static
+%defattr(0644, root, root, 0755)
 %doc COPYING
 %attr(0755,root,root) /sbin/udevd.static
 %attr(0755,root,root) /sbin/udevadm.static
-%attr(755,root,root) %{udev_scriptdir}/scsi_id.static
-%attr(755,root,root) %{udev_scriptdir}/ata_id.static
-%attr(755,root,root) %{udev_scriptdir}/edd_id.static
-%attr(755,root,root) %{udev_scriptdir}/usb_id.static
-%attr(755,root,root) %{udev_scriptdir}/vol_id.static
+%attr(0755,root,root) %{udev_scriptdir}/scsi_id.static
+%attr(0755,root,root) %{udev_scriptdir}/ata_id.static
+%attr(0755,root,root) %{udev_scriptdir}/edd_id.static
+%attr(0755,root,root) %{udev_scriptdir}/usb_id.static
+%attr(0755,root,root) %{udev_scriptdir}/vol_id.static
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices.static
 %endif
 
 %files -n libvolume_id
+%defattr(0644, root, root, 0755)
 %doc COPYING
 %attr(0755,root,root) /%{_lib}/libvolume_id.so.*
 
 %files -n libvolume_id-devel
+%defattr(0644, root, root, 0755)
 %doc COPYING
 %defattr(0644, root, root, 0755)
 %{_includedir}/libvolume_id.h 
@@ -347,11 +358,13 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %files -n libudev0
-%defattr(-,root,root)
-/%{_lib}/libudev.so.*
+%defattr(0644, root, root, 0755)
+%doc COPYING
+%attr(0755,root,root) /%{_lib}/libudev.so.*
 
 %files -n libudev-devel
-%defattr(-,root,root)
+%defattr(0644, root, root, 0755)
+%doc COPYING
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
@@ -361,6 +374,12 @@
 
 
 %changelog
+* Tue Dec 16 2008 Harald Hoyer <harald at redhat.com> 135-2
+- changed udevsettle -> udevadm settle
+- added doc to libudev-devel
+- added more attr and defattr
+- various rpmlint fixes
+
 * Tue Dec 02 2008 Harald Hoyer <harald at redhat.com> 135-1
 - version 135