X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=udev.spec;h=1ec89674cff041ed2fd23a3806d589f5a5c6a1f1;hb=c119f61d4d4a4b1d4b44e76bd5c6b154dd324b4a;hp=a70113827a76ecdf2e3e662f0c49f08382c3a609;hpb=922920afc9a534d0acc8396c42c6113ab00d641f;p=packages%2Fudev.git

diff --git a/udev.spec b/udev.spec
index a701138..1ec8967 100644
--- 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:	2.1.1
-Release:	1
+Version:	3.1.2
+Release:	2
 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:	dd945ce34314b4544e9036153d3a97e9
+# Source0-md5:	07ab33fe310d250f06fc28f010e3fde2
 # rules
 Source101:	udev-alsa.rules
 Source102:	udev.rules
@@ -27,7 +27,10 @@ Source120:	udev.blacklist
 Source121:	fbdev.blacklist
 Patch0:		udev-ploop-rules.patch
 Patch1:		udev-libexecdir.patch
-URL:		http://www.gentoo.org/proj/en/eudev/
+# http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
+# don't remove it entirely, just change default value to disabled
+Patch2:		udev-net.ifnames.patch
+URL:		https://wiki.gentoo.org/wiki/Project:Eudev
 BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.11
@@ -185,6 +188,7 @@ Dokumentacja API libgudev.
 %setup -q -n eudev-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %if %{with apidocs}
@@ -209,7 +213,6 @@ Dokumentacja API libgudev.
         --enable-libkmod \
         --enable-manpages \
         --enable-modules \
-        --enable-rule-generator \
         --enable-shared \
         --enable-static \
         --with-html-dir=%{_gtkdocdir} \
@@ -234,9 +237,9 @@ install -d $RPM_BUILD_ROOT/var/lib/%{name}/coredump \
 %{__ln} -s %{_sbindir}/udevadm $RPM_BUILD_ROOT/bin/
 %{__ln} -s /lib/udev $RPM_BUILD_ROOT/usr/lib/
 
-# install custom udev rules from pld package
+# install custom udev rules
 %{__cp} -a %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
-%{__cp} -a %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-udev-pld.rules
+%{__cp} -a %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-udev-tld.rules
 
 # install udev configs
 %{__cp} -a %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/udev/links.conf
@@ -315,11 +318,6 @@ fi
 %attr(755,root,root) /lib/udev/udevd
 
 %attr(755,root,root) /lib/udev/accelerometer
-
-%attr(755,root,root) /lib/udev/write_cd_rules
-%attr(755,root,root) /lib/udev/write_net_rules
-/lib/udev/rule_generator.functions
-
 %dir /lib/udev/hwdb.d
 /lib/udev/hwdb.d/20-OUI.hwdb
 /lib/udev/hwdb.d/20-acpi-vendor.hwdb
@@ -330,7 +328,10 @@ fi
 /lib/udev/hwdb.d/20-sdio-vendor-model.hwdb
 /lib/udev/hwdb.d/20-usb-classes.hwdb
 /lib/udev/hwdb.d/20-usb-vendor-model.hwdb
+/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
 
 %attr(755,root,root) %{_sbindir}/start_udev
 %attr(755,root,root) %{_sbindir}/udevd
@@ -346,7 +347,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/udev_blacklist.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/links.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-udev-pld.rules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-udev-tld.rules
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
 
@@ -354,24 +355,24 @@ fi
 /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
 /lib/udev/rules.d/60-drm.rules
-/lib/udev/rules.d/60-keyboard.rules
+/lib/udev/rules.d/60-evdev.rules
 /lib/udev/rules.d/60-persistent-alsa.rules
 /lib/udev/rules.d/60-persistent-input.rules
-/lib/udev/rules.d/60-persistent-serial.rules
 /lib/udev/rules.d/60-persistent-storage-tape.rules
 /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/75-cd-aliases-generator.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-persistent-net-generator.rules
 /lib/udev/rules.d/75-probe_mtd.rules
-/lib/udev/rules.d/75-tty-description.rules
 /lib/udev/rules.d/78-sound-card.rules
 /lib/udev/rules.d/80-drivers.rules
-/lib/udev/rules.d/95-udev-late.rules
+/lib/udev/rules.d/80-net-name-slot.rules
 %{_mandir}/man5/udev.conf.5*
 %{_mandir}/man7/udev.7*
 %{_mandir}/man8/udevadm.8*