rpms/udev/devel udev.spec,1.277,1.278

Fri Jun 19 14:37:29 UTC 2009

Author: harald

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

Modified Files:
	udev.spec 
Log Message:
* Fri Jun 19 2009 Harald Hoyer <harald at redhat.com> 143-1
- version 143



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278

--- udev.spec	8 Jun 2009 09:10:26 -0000	1.277
+++ udev.spec	19 Jun 2009 14:36:59 -0000	1.278
@@ -1,16 +1,17 @@
 %define debug true
-%define with_static 1
 %define udev_scriptdir /lib/udev
 %define firmwaredir /lib/firmware
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 142
-Release: 4%{?dist}
+Version: 143
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
 Obsoletes: udev-persistent < 0:030-5
+Obsoletes: udev-extras < 20090618
+Provides: udev-extras = 20090618-1
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 
 Source1: start_udev
@@ -18,24 +19,24 @@ Source3: udev-post.init
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
-Patch1: udev.git-055e40edc647d8ccfc27c9cd3163ab5dbf63ed6c.patch
-Patch2: udev.git-0c37798916bc87d72f5f1399d9e050307901db84.patch
-Patch3: udev.git-b4fa1b67f86c9555cbb41c57774761730f6b8939.patch
-Patch4: udev.git-d3c8231e738dd286591c1becc2f327ed55ed89d1.patch
-Patch5: udev.git-f58a9099bb2b18f3f683615324a4382b95446305.patch
-
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service
 Requires(pre): /usr/bin/stat /sbin/pidof
 Requires(pre): MAKEDEV >= 0:3.11 /usr/bin/getent /usr/sbin/groupadd
+Requires: hwdata
+
 BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
 BuildRequires: glib2-devel bison findutils MAKEDEV
-%if %{with_static}
-BuildRequires: libselinux-static libsepol-static
-BuildRequires: autoconf libtool
-%endif
+BuildRequires: glib2-devel
+BuildRequires: libusb-devel
+BuildRequires: libxslt
+BuildRequires: hwdata
+BuildRequires: gobject-introspection-devel >= 0.6.2
+BuildRequires: gtk-doc
+BuildRequires: usbutils
+
 Requires: libselinux >= 0:1.17.9-2 sed 
 Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
 Requires: util-linux-ng >= 2.15.1
@@ -46,20 +47,10 @@ Provides: dev = 0:3.12-1
 The udev package contains an implementation of devfs in 
 userspace using sysfs and netlink.
 
-%if %{with_static}
-%package static
-Summary: Static udev binaries for init environments
-Group: System Environment/Base
-Requires: udev = %{version}-%{release}
-
-%description static
-This package contains static versions of the udev binaries,
-to build e.g. an initramfs.
-%endif
-
 %package -n libudev0
 Summary: Dynamic library to access udev device information
 Group: System Environment/Libraries
+Obsoletes: libudev0 < 143
 
 %description -n libudev0
 This package contains the dynamic library libudev, which provides access
@@ -76,37 +67,35 @@ Requires: libudev0 = %{version}-%{releas
 This package contains the development files for the library libudev, a
 dynamic library, which provides access to udev device information.
 
+%package -n libgudev-1.0-0
+Summary: Libraries for adding libudev support to applications that use glib.
+Group: Development/Libraries
+Requires: libudev >= 142
+
+%description -n libgudev-1.0-0
+This package contains the libraries that make it easier to use libudev
+functionality from applications that use glib.
+
+%package -n libgudev-devel
+Summary: Header files for adding libudev support to applications that use glib.
+Group: Development/Libraries
+Requires: libudev-devel >= 142
+Requires: libgudev-1.0-0 = %{version}-%{release}
+
+%description -n libgudev-devel
+This package contains the header and pkg-config files for developing
+glib-based applications using libudev functionality.
+
 %prep
 %setup -q  
 
-%patch1 -p1 
-%patch2 -p1 
-%patch3 -p1 
-%patch4 -p1 
-%patch5 -p1 
-
 %build
-%if %{with_static}
-%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/floppy/create_floppy_devices \
-	; do
-	mv $i $i.static
-done
-make clean
-%else
-%configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib}  --sbindir="/sbin" 
-%endif
+%configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" \
+	   --sysconfdir=%{_sysconfdir} --with-libdir-name=%{_lib} \
+	   --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \
+	   --with-rootlibdir=/%{_lib} --enable-introspection
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -114,9 +103,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
+#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
+#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
+#rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
+rm -f $RPM_BUILD_ROOT%{_docdir}/udev/README.keymap.txt
+rmdir $RPM_BUILD_ROOT%{_docdir}/udev
 
 # Deprecated, but keep the ownership
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,makedev.d,scripts,devices}
@@ -134,24 +125,8 @@ ln -sf ../../sbin/udevadm $RPM_BUILD_ROO
 ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevsettle
 ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevcontrol
 
-%if %{with_static}
-for i in extras/scsi_id/scsi_id \
-	extras/ata_id/ata_id \
-	extras/edd_id/edd_id \
-	extras/usb_id/usb_id \
-	extras/floppy/create_floppy_devices \
- 	; do
-	install -m 0755 $i.static $RPM_BUILD_ROOT%{udev_scriptdir}/$(basename $i).static
-done
-
-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 \
-	rules/redhat/40-redhat.rules \
+        rules/redhat/40-redhat.rules \
 %ifarch ia64
 	rules/packages/40-ia64.rules \
 %endif
@@ -262,12 +237,15 @@ rm -f /var/lib/udev/makenode.d/*  >/dev/
 %post -n libudev0 -p /sbin/ldconfig
 %postun -n libudev0 -p /sbin/ldconfig
 
+%post -n libgudev-1.0-0 -p /sbin/ldconfig
+%postun -n libgudev-1.0-0 -p /sbin/ldconfig
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644, root, root, 0755)
-%doc COPYING README TODO ChangeLog docs/* 
+%doc COPYING README TODO ChangeLog docs/* extras/keymap/README.keymap.txt
 %attr(0755,root,root) /sbin/udevadm
 %attr(0755,root,root) /sbin/udevsettle
 %attr(0755,root,root) /sbin/udevtrigger
@@ -281,6 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{udev_scriptdir}/usb_id
 %attr(0755,root,root) %{udev_scriptdir}/cdrom_id
 %attr(0755,root,root) %{udev_scriptdir}/path_id
+%attr(0755,root,root) %{udev_scriptdir}/hid2hci
 %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
 %attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
 %attr(0755,root,root) %{udev_scriptdir}/firmware.sh
@@ -315,12 +294,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*
 %attr(0644,root,root) %{_mandir}/man7/udev*.7*
 %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
-%attr(0644,root,root) %{_mandir}/man8/ata_id*.8*
-%attr(0644,root,root) %{_mandir}/man8/edd_id*.8*
-%attr(0644,root,root) %{_mandir}/man8/path_id*.8*
-%attr(0644,root,root) %{_mandir}/man8/cdrom_id*.8*
-%attr(0644,root,root) %{_mandir}/man8/usb_id*.8*
-%attr(0644,root,root) %{_mandir}/man8/create_floppy_devices*.8*
 
 %dir %attr(0755,root,root) /var/lib/udev
 %dir %attr(0755,root,root) /var/lib/udev/makedev.d
@@ -330,18 +303,16 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %dir %{_sysconfdir}/udev/devices/
 %ghost %dir %{_sysconfdir}/dev.d/
 
-%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(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}/create_floppy_devices.static
-%endif
+%attr(0755,root,root) %{udev_scriptdir}/modem-modeswitch
+%attr(0755,root,root) %{udev_scriptdir}/pci-db
+%attr(0755,root,root) %{udev_scriptdir}/usb-db
+%attr(0755,root,root) %{udev_scriptdir}/keymap
+%attr(0755,root,root) %{udev_scriptdir}/udev-acl
+%attr(0755,root,root) %{udev_scriptdir}/v4l_id
+%attr(0755,root,root) %{_datadir}/udev/findkeyboards
+%attr(0755,root,root) %{udev_scriptdir}/keymaps/*
+%attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-session.d/udev-acl.ck
+
 
 %files -n libudev0
 %defattr(0644, root, root, 0755)
@@ -354,12 +325,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
-%if %{with_static}
-%{_libdir}/libudev.a
-%endif
+%{_datadir}/gtk-doc/html/libudev/*
 
+%files -n libgudev-1.0-0
+%defattr(0644, root, root, 0755)
+%attr(0755,root,root) %{_libdir}/libgudev-1.0*
+%attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib
+
+%files -n libgudev-devel
+%defattr(0644, root, root, 0755)
+%attr(0644,root,root) %{_includedir}/gudev-1.0/gudev/*.h
+%attr(0644,root,root) %{_datadir}/gir-1.0/GUdev-1.0.gir
+%dir %{_datadir}/gtk-doc/html/gudev
+%attr(0644,root,root) %{_datadir}/gtk-doc/html/gudev/*
+%attr(0755,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Jun 19 2009 Harald Hoyer <harald at redhat.com> 143-1
+- version 143
+
 * Thu Jun 08 2009 Harald Hoyer <harald at redhat.com> 142-4
 - git fix: udevadm: settle - fix timeout
 - git fix: OWNER/GROUP: fix if logic


