From 3c9d434ca5326bb9d37077bc645b8696fb1183c7 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 5 Jan 2010 13:27:00 +0000
Subject: [PATCH] - Don't ship PolicyKit mechanism (bug #551773). - Don't run
 automake/autoconf etc as it causes build failures.

---
 hplip-non-scripts.patch | 12 ------------
 hplip.spec              | 27 +++++++++++++--------------
 2 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 hplip-non-scripts.patch

diff --git a/hplip-non-scripts.patch b/hplip-non-scripts.patch
deleted file mode 100644
index bbc2bc3..0000000
--- a/hplip-non-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am
---- hplip-3.9.8/Makefile.am.non-scripts	2009-08-04 22:37:39.000000000 +0100
-+++ hplip-3.9.8/Makefile.am	2009-08-28 10:58:04.488778060 +0100
-@@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin
- # base
- basedir = $(hplipdir)/base
- 
--dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
-+dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
- 	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
- 	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
- 	base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \
diff --git a/hplip.spec b/hplip.spec
index 1414010..4f5ca9f 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -20,7 +20,6 @@ Patch4: hplip-no-asm.patch
 Patch5: hplip-clear-previous-state-reasons.patch
 Patch6: hplip-state-reasons-newline.patch
 Patch7: hplip-parenths.patch
-Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
@@ -50,7 +49,6 @@ BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 BuildRequires: sane-backends-devel
 BuildRequires: dbus-devel
-BuildRequires: automake, autoconf, libtool
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -138,9 +136,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed typos in page sizes (bug #515469).
 %patch7 -p1 -b .parenths
 
-# Don't install base/*.py with executable bit set.
-%patch8 -p1 -b .non-scripts
-
 # Set RequiresPageRegion in hpcups PPDs (bug #518756).
 %patch9 -p1 -b .requirespageregion
 
@@ -169,14 +164,12 @@ sed -i.duplex-constraints \
     prnt/drv/hpcups.drv.in
 
 %build
-aclocal
-automake --foreign --add-missing --copy
-autoconf
 %configure \
 	--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
@@ -191,7 +184,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 \
@@ -248,7 +244,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
@@ -282,7 +277,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*
@@ -296,7 +290,8 @@ rm -rf %{buildroot}
 %{_datadir}/hplip/unload.py*
 %{_datadir}/hplip/wificonfig.py*
 # Directories
-%{_datadir}/hplip/base
+%dir %{_datadir}/hplip/base
+%attr(0644,root,root) %{_datadir}/hplip/base/*
 %{_datadir}/hplip/copier
 %{_datadir}/hplip/data/ldl
 %{_datadir}/hplip/data/localization
@@ -371,6 +366,10 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Jan  5 2010 Tim Waugh <twaugh@redhat.com> - 3.9.8-26
+- Don't ship PolicyKit mechanism (bug #551773).
+- Don't run automake/autoconf etc as it causes build failures.
+
 * Thu Dec 10 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-25
 - Reverted fix for bug #533462 until bug #541604 is solved.