[udev] version 179

Wed Jan 25 13:38:53 UTC 2012

commit faded2be30b587c563f6aceba52826ef1ea8f7fe
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Wed Jan 25 14:04:35 2012 +0100

    version 179

 .gitignore |    2 +-
 sources    |    2 +-
 udev.spec  |   62 ++++++++++++++++++++++++-----------------------------------
 3 files changed, 27 insertions(+), 39 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 9e36943..9e7171b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/udev-175.tar.bz2
+/udev-179.tar.xz
diff --git a/sources b/sources
index f573b89..85ba111 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fc9c1efcbde98e3d73ffee7a77aea47  udev-175.tar.bz2
+c966a07dd75fd8d3f1a7e3d210a96c6b  udev-179.tar.xz
diff --git a/udev.spec b/udev.spec
index a52b63b..6c26f64 100644
--- a/udev.spec
+++ b/udev.spec
@@ -1,12 +1,11 @@
 Summary:        A rule-based device node and kernel event manager
 Name:           udev
-Version:        175
-Release:        2%{?dist}
+Version:        179
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Base
-Source:         ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
+Source:         ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz
 URL:            http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  gperf
@@ -15,13 +14,14 @@ BuildRequires:  glib2-devel
 BuildRequires:  hwdata
 BuildRequires:  gobject-introspection-devel >= 0.6.2
 BuildRequires:  usbutils >= 0.82
+BuildRequires:  kmod-libs >= 4
+BuildRequires:  libblkid-devel >= 2.20
 Obsoletes:      dev <= 0:3.12-1
 Provides:       dev = 0:3.12-2
 Requires(pre):  fileutils
 Requires(pre):  /usr/bin/getent /usr/sbin/groupadd
 Requires:       hwdata
 Requires:       systemd-units
-Requires:       pkgconfig
 Requires:       util-linux >= 2.15.1
 Conflicts:      systemd < 37
 Conflicts:      dracut < 013-93
@@ -89,35 +89,24 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now"
 export V=1
 %configure \
         --prefix=%{_prefix} \
+        --with-rootprefix= \
         --sysconfdir=%{_sysconfdir} \
-        --sbindir=/sbin \
-        --libexecdir=/lib/udev \
+        --bindir=/sbin \
+        --libexecdir=/lib \
         --with-rootlibdir=/%{_lib} \
         --with-selinux \
-        --with-systemdsystemunitdir=/lib/systemd/system \
-        --enable-floppy
+        --with-systemdsystemunitdir=/lib/systemd/system
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT%{_docdir}/udev
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-for i in \
-%ifarch ia64
-        rules/arch/40-ia64.rules \
-%endif
-%ifarch ppc ppc64
-        rules/arch/40-ppc.rules \
-%endif
-%ifarch s390 s390x
-        rules/arch/40-s390.rules \
-%endif
-        ; do
-        install -m 0644 "$i"  "$RPM_BUILD_ROOT/lib/udev/rules.d/${i##*/}"
-done
 mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware
 mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware/updates
+%ifarch s390 s390x
+install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT/lib/udev/rules.d
+%endif
 
 %pre
 getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || :
@@ -139,17 +128,13 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || :
 %post -n libgudev1 -p /sbin/ldconfig
 %postun -n libgudev1 -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-, root, root, 0755)
-%doc NEWS COPYING README TODO ChangeLog  extras/keymap/README.keymap.txt
+%doc NEWS COPYING README TODO ChangeLog  src/extras/keymap/README.keymap.txt
+/lib/udev
 %attr(0755,root,root) /sbin/udevadm
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
-%attr(0755,root,root) /lib/udev
 %attr(0644,root,root) %{_mandir}/man7/*.7*
 %attr(0644,root,root) %{_mandir}/man8/*.8*
 %{_datadir}/pkgconfig/udev.pc
@@ -161,27 +146,23 @@ rm -rf $RPM_BUILD_ROOT
 /lib/systemd/system/sockets.target.wants/*.socket
 
 %files -n libudev
-%defattr(0644, root, root, 0755)
-%doc libudev/COPYING
+%doc src/COPYING
 %attr(0755,root,root) /%{_lib}/libudev.so.*
 
 %files -n libudev-devel
-%defattr(0644, root, root, 0755)
-%doc libudev/docs/html/*
+%doc src/docs/html/*
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
 %{_datadir}/gtk-doc/html/libudev/*
 
 %files -n libgudev1
-%defattr(0644, root, root, 0755)
-%doc extras/gudev/COPYING
+%doc src/extras/gudev/COPYING
 %attr(0755,root,root) /%{_lib}/libgudev-1.0.so.*
 %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib
 
 %files -n libgudev1-devel
-%defattr(0644, root, root, 0755)
-%doc extras/gudev/docs/html/*
+%doc src/extras/gudev/docs/html/*
 %attr(0755,root,root) %{_libdir}/libgudev-1.0.so
 %dir %attr(0755,root,root) %{_includedir}/gudev-1.0
 %dir %attr(0755,root,root) %{_includedir}/gudev-1.0/gudev
@@ -192,6 +173,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Jan 25 2012 Kay Sievers <kay at redhat.com> 179-1
+- version 179
+  - devtmpfs is mandatory now
+  - /run is mandatory now
+  - modules are loaded with 'libkmod'
+  - blkid is built-in now
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 175-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
