From f3bb816e289cce39d34a51e26e5e4ffc16a0bdbc Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 28 Aug 2009 10:41:52 +0000
Subject: [PATCH] - Include missing base files.

---
 hplip-non-scripts.patch | 25 ++-----------------------
 hplip.spec              |  9 ++++++++-
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/hplip-non-scripts.patch b/hplip-non-scripts.patch
index 9bda52e..bbc2bc3 100644
--- a/hplip-non-scripts.patch
+++ b/hplip-non-scripts.patch
@@ -1,6 +1,6 @@
 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-25 12:02:59.790202347 +0100
-+++ hplip-3.9.8/Makefile.am	2009-08-25 12:03:32.234212568 +0100
+--- 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
@@ -10,24 +10,3 @@ diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am
  	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 -up hplip-3.9.8/Makefile.in.non-scripts hplip-3.9.8/Makefile.in
---- hplip-3.9.8/Makefile.in.non-scripts	2009-08-25 12:03:37.345077328 +0100
-+++ hplip-3.9.8/Makefile.in	2009-08-25 12:04:08.766078065 +0100
-@@ -428,7 +428,7 @@ am__ptest_SOURCES_DIST = pcard/ptest.c p
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	fat.$(OBJEXT)
- ptest_OBJECTS = $(am_ptest_OBJECTS)
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ptest_DEPENDENCIES = libhpmud.la
--am__dist_base_SCRIPTS_DIST = base/maint.py base/codes.py base/g.py \
-+am__dist_base_DATA_DIST = 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 \
-@@ -3701,7 +3701,7 @@ cups_drv = prnt/drv/hpcups.drv
- 
- # base
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@basedir = $(hplipdir)/base
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
-+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py  \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	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 8c8d3fe..1e217bb 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: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -44,6 +44,7 @@ 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,6 +139,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %patch9 -p1 -b .requirespageregion
 
 %build
+aclocal
+automake --foreign --add-missing --copy
+autoconf
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install \
@@ -337,6 +341,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-14
+- Include missing base files.
+
 * Fri Aug 28 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-13
 - Use dll.d file instead of post scriptlet for hpaio (bug #519988).
 - Fixed RequiresPageRegion patch (bug #518756).