rpms/hplip/devel hplip-non-scripts.patch, NONE, 1.1 hplip.spec, 1.227, 1.228

[Tim Waugh]

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-non-scripts.patch 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
- Don't install base/*.py with executable bit set.


hplip-non-scripts.patch:
 Makefile.am |    2 +-
 Makefile.in |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE hplip-non-scripts.patch ---
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
@@ -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 -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/devel/hplip.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- hplip.spec	25 Aug 2009 09:44:16 -0000	1.227
+++ hplip.spec	25 Aug 2009 11:08:02 -0000	1.228
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -20,6 +20,7 @@ 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -120,6 +121,9 @@ 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
+
 %build
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -321,6 +325,9 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
+- Don't install base/*.py with executable bit set.
+
 * Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
 - Fixed typos in page sizes (bug #515469).
 - Build no longer requires libudev-devel.