Tue Jul 13 19:19:47 UTC 2010

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24991

Modified Files:
	.cvsignore sources udev-post.init udev.spec 
Added Files:
	udev-160.tar.bz2.sign 
Removed Files:
	0001-version-bump.patch 0002-add-systemd-service-files.patch 
	0003-make-pre-process-and-install-systemd-service-files-w.patch 
	0004-make-fix-make-distcheck.patch 
	0005-switch-a-few-left-over-from-GPLv2-to-GPLv2-or-later.patch 
	0006-path_id-add-handle_scsi_sas.patch udev-158.tar.bz2.sign 
	udev.sysconfig 
Log Message:
* Tue Jul 13 2010 Harald Hoyer <harald at redhat.com> 160-1
- version 160
- add systemd service files
- fixed COPYRIGHT files

--- NEW FILE udev-160.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBMOkG1yGugalF9Dw4RAjB0AJ9ftRX/zmCiRcSyQWhcWJXsnXDn3gCeMFbR
KdR80Jxmitbil01dFfPzwEE=
=8B8M
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	24 Jun 2010 12:01:40 -0000	1.69
+++ .cvsignore	13 Jul 2010 19:19:47 -0000	1.70
@@ -1 +1 @@
-udev-158.tar.bz2
+udev-160.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- sources	24 Jun 2010 12:01:41 -0000	1.69
+++ sources	13 Jul 2010 19:19:47 -0000	1.70
@@ -1 +1 @@
-26f99dde11f8e393d659614d7d1a3964  udev-158.tar.bz2
+65459a1f090082c0471bf4e5112208d7  udev-160.tar.bz2


Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- udev-post.init	27 May 2010 09:31:37 -0000	1.14
+++ udev-post.init	13 Jul 2010 19:19:47 -0000	1.15
@@ -18,7 +18,6 @@
 ### END INIT INFO
 
 . /etc/rc.d/init.d/functions
-. /etc/sysconfig/udev
 
 # See how we were called.
 case "$1" in


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- udev.spec	25 Jun 2010 13:33:19 -0000	1.315
+++ udev.spec	13 Jul 2010 19:19:47 -0000	1.316
@@ -4,8 +4,8 @@
 
 Summary: A rule-based device node and kernel event manager
 Name: udev
-Version: 158
-Release: 2%{?dist}
+Version: 160
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -15,13 +15,6 @@ Source: ftp://ftp.kernel.org/pub/linux/u
 Source1: start_udev
 Source2: udev-post.init
 
-#Patch1: 0001-version-bump.patch
-Patch2: 0002-add-systemd-service-files.patch
-Patch3: 0003-make-pre-process-and-install-systemd-service-files-w.patch
-Patch4: 0004-make-fix-make-distcheck.patch
-Patch5: 0005-switch-a-few-left-over-from-GPLv2-to-GPLv2-or-later.patch
-Patch6: 0006-path_id-add-handle_scsi_sas.patch
-
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +23,8 @@ Requires(pre): /usr/bin/stat /sbin/pidof
 Requires(pre): /usr/bin/getent /usr/sbin/groupadd
 Requires: hwdata
 Requires: pkgconfig
+Requires: systemd-units
+Conflicts: systemd < 3
 
 %ifarch s390 s390x
 # Require s390utils-base, because it's essential on s390
@@ -46,6 +41,9 @@ BuildRequires: gobject-introspection-dev
 BuildRequires: gtk-doc
 BuildRequires: usbutils >= 0.82
 BuildRequires: libtool >= 2.2.6
+BuildRequires: systemd-units
+BuildRequires: systemd 
+BuildRequires: pkgconfig
 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
@@ -115,19 +113,13 @@ glib-based applications using libudev fu
 %prep 
 %setup -q 
 
-#%patch1 -p1 -b .git1
-%patch2 -p1 -b .git2
-%patch3 -p1 -b .git3
-%patch4 -p1 -b .git4
-%patch5 -p1 -b .git5
-%patch6 -p1 -b .git6
-
 %build
 libtoolize -f -c
 %configure --with-selinux  --prefix=%{_prefix} --exec-prefix="" \
            --sysconfdir=%{_sysconfdir} \
            --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \
-           --with-rootlibdir=/%{_lib} --enable-introspection 
+           --with-rootlibdir=/%{_lib} \
+           --enable-introspection 
 
 make %{?_smp_mflags}
 
@@ -188,6 +180,7 @@ if [ "$1" -eq 0 -a -f %{_initrddir}/udev
 fi
 if [ "$1" -eq 0 ]; then
         /sbin/chkconfig --del udev-post
+        /usr/bin/systemd-install --system --start disable udev.service >/dev/null 2>&1 || :
 fi
 exit 0
 
@@ -223,6 +216,7 @@ if test -f /proc/1/exe -a -d /proc/1/roo
         fi
 fi
 /sbin/chkconfig --add udev-post
+/usr/bin/systemd-install --system --start enable udev.service >/dev/null 2>&1 || :
 
 exit 0
 
@@ -240,7 +234,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS COPYING README TODO ChangeLog  extras/keymap/README.keymap.txt
 %attr(0755,root,root) /sbin/udevadm
 %attr(0755,root,root) /sbin/udevd
-%attr(0755,root,root) /sbin/start_udev
 %attr(0755,root,root) /sbin/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/ata_id
@@ -309,6 +302,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck
 %{_datadir}/pkgconfig/udev.pc
 
+%attr(0755,root,root) /sbin/start_udev
+%define systemdsystemunitdir  %(/usr/bin/pkg-config --variable=systemdsystemunitdir systemd)
+%attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service
+%attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service
+%attr(0644,root,root) %{systemdsystemunitdir}/udev.service
+
 # Deprecated, but keep the ownership
 %ghost %dir /var/lib/udev
 %ghost %dir %{_sysconfdir}/udev/scripts/
@@ -323,7 +322,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libudev-devel
 %defattr(0644, root, root, 0755)
-%doc libudev/COPYING libudev/docs/html/*
+%doc libudev/docs/html/*
 %{_includedir}/libudev.h
 %{_libdir}/libudev.so
 %{_libdir}/pkgconfig/libudev.pc
@@ -337,7 +336,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libgudev1-devel
 %defattr(0644, root, root, 0755)
-%doc extras/gudev/COPYING extras/gudev/docs/html/*
+%doc 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
@@ -348,6 +347,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Jul 13 2010 Harald Hoyer <harald at redhat.com> 160-1
+- version 160
+- add systemd service files
+- fixed COPYRIGHT files
+
 * Fri Jun 25 2010 Harald Hoyer <harald at redhat.com> 158-2
 - moved udev pkgconfig to base file on authors request
 - specfile cleanups


--- 0001-version-bump.patch DELETED ---


--- 0002-add-systemd-service-files.patch DELETED ---


--- 0003-make-pre-process-and-install-systemd-service-files-w.patch DELETED ---


--- 0004-make-fix-make-distcheck.patch DELETED ---


--- 0005-switch-a-few-left-over-from-GPLv2-to-GPLv2-or-later.patch DELETED ---


--- 0006-path_id-add-handle_scsi_sas.patch DELETED ---


--- udev-158.tar.bz2.sign DELETED ---


--- udev.sysconfig DELETED ---

