rpms/hplip/devel hplip.spec,1.250,1.251

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20645

Modified Files:
	hplip.spec 
Log Message:
* Tue Jan  5 2010 Tim Waugh <twaugh at redhat.com> - 3.9.12-2
- Don't ship PolicyKit mechanism (bug #551773).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- hplip.spec	22 Dec 2009 17:46:48 -0000	1.250
+++ hplip.spec	5 Jan 2010 13:24:42 -0000	1.251
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -138,7 +138,8 @@ sed -i.duplex-constraints \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install --enable-pp-build \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-	--enable-hpijs-install --enable-udev-acl-rules
+	--enable-hpijs-install --enable-udev-acl-rules \
+	--disable-policykit
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -153,7 +154,10 @@ make install DESTDIR=%{buildroot}
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
 	%{buildroot}%{_docdir} \
-	%{buildroot}%{_datadir}/hal/fdi
+	%{buildroot}%{_datadir}/hal/fdi \
+	%{buildroot}%{_datadir}/hplip/pkservice.py \
+	%{buildroot}%{_datadir}/hplip/base/pkit.py \
+	%{buildroot}%{_bindir}/hp-pkservice
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
 	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -210,7 +214,6 @@ rm -rf %{buildroot}
 %{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
 %{_bindir}/hp-mkuri
-%{_bindir}/hp-pkservice
 %{_bindir}/hp-plugin
 %{_bindir}/hp-pqdiag
 %{_bindir}/hp-printsettings
@@ -244,7 +247,6 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/linefeedcal.py*
 %{_datadir}/hplip/makecopies.py*
 %{_datadir}/hplip/makeuri.py*
-%{_datadir}/hplip/pkservice.py*
 %{_datadir}/hplip/plugin.py*
 %{_datadir}/hplip/pqdiag.py*
 %{_datadir}/hplip/printsettings.py*
@@ -333,6 +335,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Jan  5 2010 Tim Waugh <twaugh at redhat.com> - 3.9.12-2
+- Don't ship PolicyKit mechanism (bug #551773).
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 3.9.12-1
 - 3.9.12.  No longer need hpcups-plugin patch.