rpms/udev/devel udev.spec,1.316,1.317

[Lennart Poettering]

Author: lennart

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

Modified Files:
	udev.spec 
Log Message:
Don't require systemd .pc file


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- udev.spec	13 Jul 2010 19:19:47 -0000	1.316
+++ udev.spec	13 Jul 2010 19:40:37 -0000	1.317
@@ -5,7 +5,7 @@
 Summary: A rule-based device node and kernel event manager
 Name: udev
 Version: 160
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -22,7 +22,6 @@ Requires(pre): /bin/sh fileutils /sbin/c
 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
 
@@ -119,7 +118,8 @@ libtoolize -f -c
            --sysconfdir=%{_sysconfdir} \
            --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \
            --with-rootlibdir=/%{_lib} \
-           --enable-introspection 
+           --enable-introspection  \
+           --with-systemdsystemunitdir=/lib/systemd/system
 
 make %{?_smp_mflags}
 
@@ -303,7 +303,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/udev.pc
 
 %attr(0755,root,root) /sbin/start_udev
-%define systemdsystemunitdir  %(/usr/bin/pkg-config --variable=systemdsystemunitdir systemd)
+%define systemdsystemunitdir  %(/lib/systemd/system)
 %attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service
 %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service
 %attr(0644,root,root) %{systemdsystemunitdir}/udev.service
@@ -347,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Tue Jul 13 2010 Lennart Poettering <lennart at poettering.net> - 160-2
+- Don't require systemd .pc file, to break build dependency cycle
+
 * Tue Jul 13 2010 Harald Hoyer <harald at redhat.com> 160-1
 - version 160
 - add systemd service files