- updated to 3.1.5

diff --git a/udev.spec b/udev.spec
index 381b1058b1d21c5b307981321004d68fdbc53924..1f852e6fec617c2815c58e732e5c370051987227 100644 (file)
--- a/udev.spec
+++ b/udev.spec
@@ -8,13 +8,13 @@
 Summary:       Device manager for the Linux kernel
 Summary(pl.UTF-8):     Zarządca urządzeń dla jądra Linuksa
 Name:          udev
-Version:       3.1.2
-Release:       3
+Version:       3.1.5
+Release:       1
 Epoch:         2
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 Source0:       http://dev.gentoo.org/~blueness/eudev/eudev-%{version}.tar.gz
-# Source0-md5: 07ab33fe310d250f06fc28f010e3fde2
+# Source0-md5: c4dace42deecede102b6c01904042acc
 # rules
 Source101:     udev-alsa.rules
 Source102:     udev.rules
@@ -37,10 +37,6 @@ BuildRequires:       automake >= 1:1.11
 BuildRequires: binutils >= 3:2.22.52.0.1-2
 BuildRequires: dbus-devel >= 1.3.2
 BuildRequires: docbook-style-xsl
-BuildRequires: glib2-devel >= 1:2.22.0
-BuildRequires: glibc-misc
-BuildRequires: gobject-introspection-devel >= 1.31.1
-BuildRequires: gperf
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.18}
 BuildRequires: kmod-devel >= 14
 BuildRequires: libblkid-devel >= 2.20
@@ -144,46 +140,6 @@ libudev API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API libudev.
 
-%package glib
-Summary:       Shared libgudev library - GObject bindings for libudev
-Summary(pl.UTF-8):     Biblioteka współdzielona libgudev - wiązania GObject do libudev
-Group:         Libraries
-Requires:      glib2 >= 1:2.22.0
-Requires:      udev-libs = %{epoch}:%{version}-%{release}
-
-%description glib
-Shared libgudev library - GObject bindings for libudev.
-
-%description glib -l pl.UTF-8
-Biblioteka współdzielona libgudev - wiązania GObject do libudev.
-
-%package glib-devel
-Summary:       Header file for libgudev library
-Summary(pl.UTF-8):     Plik nagłówkowy biblioteki libgudev
-Group:         Development/Libraries
-Requires:      glib2-devel >= 1:2.22.0
-Requires:      udev-devel = %{epoch}:%{version}-%{release}
-Requires:      udev-glib = %{epoch}:%{version}-%{release}
-Obsoletes:     udev-glib-static
-
-%description glib-devel
-Header file for libgudev library.
-
-%description glib-devel -l pl.UTF-8
-Plik nagłówkowy biblioteki libgudev.
-
-%package glib-apidocs
-Summary:       libgudev API documentation
-Summary(pl.UTF-8):     Dokumentacja API libgudev
-Group:         Documentation
-Requires:      gtk-doc-common
-
-%description glib-apidocs
-libgudev API documentation.
-
-%description glib-apidocs -l pl.UTF-8
-Dokumentacja API libgudev.
-
 %prep
 %setup -q -n eudev-%{version}
 %patch0 -p1
@@ -291,9 +247,6 @@ fi
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%post  glib -p /sbin/ldconfig
-%postun        glib -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %dev(c,1,3) %attr(666,root,root) /dev/null
@@ -317,11 +270,11 @@ fi
 
 %attr(755,root,root) /lib/udev/udevd
 
-%attr(755,root,root) /lib/udev/accelerometer
 %dir /lib/udev/hwdb.d
 /lib/udev/hwdb.d/20-OUI.hwdb
 /lib/udev/hwdb.d/20-acpi-vendor.hwdb
 /lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
+/lib/udev/hwdb.d/20-net-ifname.hwdb
 /lib/udev/hwdb.d/20-pci-classes.hwdb
 /lib/udev/hwdb.d/20-pci-vendor-model.hwdb
 /lib/udev/hwdb.d/20-sdio-classes.hwdb
@@ -331,7 +284,7 @@ fi
 /lib/udev/hwdb.d/60-evdev.hwdb
 /lib/udev/hwdb.d/60-keyboard.hwdb
 /lib/udev/hwdb.d/70-mouse.hwdb
-/lib/udev/hwdb.d/70-touchpad.hwdb
+/lib/udev/hwdb.d/70-pointingstick.hwdb
 
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udevd
@@ -352,7 +305,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
 
 # rules below are NOT supposed to be changed by users
-/lib/udev/rules.d/42-usb-hid-pm.rules
 /lib/udev/rules.d/50-udev-default.rules
 /lib/udev/rules.d/60-cdrom_id.rules
 /lib/udev/rules.d/60-block.rules
@@ -364,10 +316,8 @@ fi
 /lib/udev/rules.d/60-persistent-storage.rules
 /lib/udev/rules.d/60-persistent-v4l.rules
 /lib/udev/rules.d/60-serial.rules
-/lib/udev/rules.d/61-accelerometer.rules
 /lib/udev/rules.d/64-btrfs.rules
 /lib/udev/rules.d/70-mouse.rules
-/lib/udev/rules.d/70-touchpad.rules
 /lib/udev/rules.d/75-net-description.rules
 /lib/udev/rules.d/75-probe_mtd.rules
 /lib/udev/rules.d/78-sound-card.rules
@@ -396,22 +346,3 @@ fi
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libudev
 %endif
-
-%files glib
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0
-%{_libdir}/girepository-1.0/GUdev-1.0.typelib
-
-%files glib-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so
-%{_includedir}/gudev-1.0
-%{_pkgconfigdir}/gudev-1.0.pc
-%{_datadir}/gir-1.0/GUdev-1.0.gir
-
-%if %{with apidocs}
-%files glib-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gudev
-%endif