packages: udev/start_udev, udev/udev.spec - up to 175 - changed Source0 URL...

wiget wiget at pld-linux.org
Sat Dec 3 17:04:53 CET 2011 

Author: wiget                        Date: Sat Dec  3 16:04:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 175
- changed Source0 URL to working one
- removed unused static_extras and extras macros
- removed obsoleted rm's
- %post scripts for systemd

---- Files affected:
packages/udev:
   start_udev (1.39 -> 1.40) , udev.spec (1.359 -> 1.360) 

---- Diffs:

================================================================
Index: packages/udev/start_udev
diff -u packages/udev/start_udev:1.39 packages/udev/start_udev:1.40
--- packages/udev/start_udev:1.39	Sat Jun 14 15:26:59 2008
+++ packages/udev/start_udev	Sat Dec  3 17:04:48 2011
@@ -34,7 +34,7 @@
 
 prog=udev
 bin=/sbin/udev
-udevd=/sbin/udevd
+udevd=/lib/udev/udevd
 
 make_extra_nodes () {
 	grep '^[^#]' /etc/udev/links.conf | \
@@ -96,7 +96,7 @@
 kill_udevd > "$udev_root/null" 2>&1
 
 	# Start udevd daemon
-	udevd --daemon
+	$udevd --daemon
 	ret=$(( $ret + $? ))
 	
 	# Making extra nodes

================================================================
Index: packages/udev/udev.spec
diff -u packages/udev/udev.spec:1.359 packages/udev/udev.spec:1.360
--- packages/udev/udev.spec:1.359	Sun Nov 27 11:26:29 2011
+++ packages/udev/udev.spec	Sat Dec  3 17:04:48 2011
@@ -32,13 +32,13 @@
 Summary(pl.UTF-8):	Zarządca urządzeń dla Linuksa 2.6
 Name:		udev
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:	172
-Release:	4
+Version:	175
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Base
-Source0:	ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
-# Source0-md5:	bd122d04cf758441f498aad0169a454f
+Source0:	http://people.freedesktop.org/~kay/udev/%{name}-%{version}.tar.bz2
+# Source0-md5:	2fc9c1efcbde98e3d73ffee7a77aea47
 # rules
 Source1:	%{name}-alsa.rules
 Source2:	%{name}.rules
@@ -106,8 +106,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
-%define		static_extras	extras/ata_id extras/cdrom_id extras/edd_id extras/floppy extras/usb_id extras/volume_id extras/scsi_id
-%define		extras		%{static_extras} extras/firmware extras/path_id
 
 %description
 udev is the device manager for the Linux 2.6 kernel series. Its
@@ -355,6 +353,7 @@
 	--enable-gtk-doc \
 	--enable-introspection \
 	--enable-floppy \
+	--enable-udev_acl \
 	--enable-logging \
 	--enable-shared \
 	--enable-static \
@@ -371,9 +370,7 @@
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.permissions
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
+ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_sbindir}/udevd
 
 # install custom rules from pld package
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
@@ -401,7 +398,7 @@
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd/udev
 install -p udev-initrd/sbin/udevadm $RPM_BUILD_ROOT%{_libdir}/initrd
-install -p udev-initrd/sbin/udevd $RPM_BUILD_ROOT%{_libdir}/initrd
+install -p udev-initrd/lib/udev/udevd $RPM_BUILD_ROOT%{_libdir}/initrd
 ln -s udevd $RPM_BUILD_ROOT%{_libdir}/initrd/udevstart
 install -p udev-initrd/lib/udev/*_id $RPM_BUILD_ROOT%{_libdir}/initrd/udev
 install -p udev-initrd/lib/udev/collect $RPM_BUILD_ROOT%{_libdir}/initrd/udev
@@ -435,6 +432,13 @@
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
+%post systemd
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/bin/systemctl start udev.service >/dev/null 2>&1 || :
+
+%postun systemd
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
 %files
 %defattr(644,root,root,755)
 %dev(c,1,3) %attr(666,root,root) /dev/null
@@ -445,7 +449,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) /lib/udev/udev-acl
 %attr(755,root,root) /usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
-/lib/udev/rules.d/70-acl.rules
+/lib/udev/rules.d/70-udev-acl.rules
 
 %files compat
 %defattr(644,root,root,755)
@@ -469,19 +473,18 @@
 
 %attr(755,root,root) /lib/udev/keyboard-force-release.sh
 
-%attr(755,root,root) /lib/udev/*_helper
-%attr(755,root,root) /lib/udev/*_rules
+%attr(755,root,root) /lib/udev/net_helper
+#%attr(755,root,root) /lib/udev/*_rules
 
 %attr(755,root,root) /lib/udev/ata_id
 %attr(755,root,root) /lib/udev/cdrom_id
 %attr(755,root,root) /lib/udev/edd_id
-%attr(755,root,root) /lib/udev/input_id
 %attr(755,root,root) /lib/udev/mtd_probe
-%attr(755,root,root) /lib/udev/path_id
 %attr(755,root,root) /lib/udev/scsi_id
-%attr(755,root,root) /lib/udev/usb_id
 %attr(755,root,root) /lib/udev/v4l_id
 
+%attr(755,root,root) /lib/udev/udevd
+
 %attr(755,root,root) /lib/udev/keymap
 %dir /lib/udev/keymaps
 /lib/udev/keymaps/*
@@ -507,7 +510,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
 
 # rules below are NOT supposed to be changed by users
-/lib/udev/rule_generator.functions
+#/lib/udev/rule_generator.functions
 /lib/udev/rules.d/42-qemu-usb.rules
 /lib/udev/rules.d/50-firmware.rules
 /lib/udev/rules.d/50-udev-default.rules
@@ -521,7 +524,7 @@
 /lib/udev/rules.d/60-persistent-v4l.rules
 /lib/udev/rules.d/61-accelerometer.rules
 /lib/udev/rules.d/61-persistent-storage-edd.rules
-/lib/udev/rules.d/75-cd-aliases-generator.rules
+#/lib/udev/rules.d/75-cd-aliases-generator.rules
 /lib/udev/rules.d/75-net-description.rules
 /lib/udev/rules.d/75-probe_mtd.rules
 /lib/udev/rules.d/75-tty-description.rules
@@ -615,6 +618,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.360  2011/12/03 16:04:48  wiget
+- up to 175
+- changed Source0 URL to working one
+- removed unused static_extras and extras macros
+- removed obsoleted rm's
+- %post scripts for systemd
+
 Revision 1.359  2011/11/27 10:26:29  wiget
 - package systemd files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/start_udev?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udev/udev.spec?r1=1.359&r2=1.360&f=u

More information about the pld-cvs-commit mailing list