rpms/hplip/F-11 hplip-non-scripts.patch, 1.1, 1.2 hplip.spec, 1.229, 1.230
Tim Waugh
twaugh at fedoraproject.org
Fri Aug 28 11:01:48 UTC 2009
- Previous message: rpms/python-xklavier/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/tigervnc/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tigervnc.spec, 1.18, 1.19 tigervnc10-rh495457.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24979
Modified Files:
hplip-non-scripts.patch hplip.spec
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-12
- Include missing base files.
hplip-non-scripts.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: hplip-non-scripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip-non-scripts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-non-scripts.patch 25 Aug 2009 11:09:03 -0000 1.1
+++ hplip-non-scripts.patch 28 Aug 2009 11:01:48 -0000 1.2
@@ -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-scr
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 at 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 at basedir = $(hplipdir)/base
-- at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \
-+ at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at 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 \
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- hplip.spec 28 Aug 2009 09:14:40 -0000 1.229
+++ hplip.spec 28 Aug 2009 11:01:48 -0000 1.230
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.9.8
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -45,6 +45,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
@@ -139,6 +140,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 \
@@ -352,6 +356,9 @@ fi
exit 0
%changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-12
+- Include missing base files.
+
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-11
- Use dll.d file instead of post scriptlet for hpaio (bug #519988).
- Fixed RequiresPageRegion patch (bug #518756).
- Previous message: rpms/python-xklavier/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message: rpms/tigervnc/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tigervnc.spec, 1.18, 1.19 tigervnc10-rh495457.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list