rpms/system-config-printer/F-10 system-config-printer-1.0.x.patch, 1.11, 1.12 system-config-printer.spec, 1.232, 1.233

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3136

Modified Files:
	system-config-printer-1.0.x.patch system-config-printer.spec 
Log Message:
* Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-7
- Updated patch for 1.0.x changes:
  - Fixed stub scripts (bug #477107).


system-config-printer-1.0.x.patch:

Index: system-config-printer-1.0.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer-1.0.x.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- system-config-printer-1.0.x.patch	19 Dec 2008 10:26:24 -0000	1.11
+++ system-config-printer-1.0.x.patch	19 Dec 2008 13:04:13 -0000	1.12
@@ -1,8 +1,15 @@
 diff --git a/ChangeLog b/ChangeLog
-index 2851eeb..d02e03d 100644
+index 2851eeb..db57408 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,108 @@
+@@ -1,3 +1,115 @@
++2008-12-19  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.in: Set prefix environment variable here,
++	partially reverting earlier change.
++	* system-config-printer-applet.in: Likewise.
++	* my-default-printer.in: Likewise.
++
 +2008-12-19  Tim Waugh  <twaugh at redhat.com>
 +
 +	* PhysicalDevice.py (PhysicalDevice.get_info): The hpfax backend
@@ -378,14 +385,6 @@
          except cups.IPPError, (e, m):
              self.watcher.cups_ipp_error (self, e, m)
              return
-diff --git a/my-default-printer.in b/my-default-printer.in
-index 7fa772d..3c55f0e 100755
---- a/my-default-printer.in
-+++ b/my-default-printer.in
-@@ -1,3 +1,2 @@
- #!/bin/sh
--prefix=@prefix@
- exec @datarootdir@/@PACKAGE@/my-default-printer.py "$@"
 diff --git a/po/POTFILES.in b/po/POTFILES.in
 index 7d5766a..897e78a 100644
 --- a/po/POTFILES.in
@@ -4468,22 +4467,6 @@
  #~ msgid "Unknown printer"
  #~ msgstr "Okänd"
 +
-diff --git a/system-config-printer-applet.in b/system-config-printer-applet.in
-index 22b5f75..a30d4b7 100755
---- a/system-config-printer-applet.in
-+++ b/system-config-printer-applet.in
-@@ -1,3 +1,2 @@
- #!/bin/sh
--prefix=@prefix@
- exec @datarootdir@/@PACKAGE@/applet.py "$@"
-diff --git a/system-config-printer.in b/system-config-printer.in
-index c4ea13d..97f0098 100755
---- a/system-config-printer.in
-+++ b/system-config-printer.in
-@@ -1,3 +1,2 @@
- #!/bin/sh
--prefix=@prefix@
- exec @datarootdir@/@PACKAGE@/system-config-printer.py "$@"
 diff --git a/system-config-printer.py b/system-config-printer.py
 index 349c6f0..c225b95 100755
 --- a/system-config-printer.py


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-10/system-config-printer.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- system-config-printer.spec	19 Dec 2008 10:26:25 -0000	1.232
+++ system-config-printer.spec	19 Dec 2008 13:04:13 -0000	1.233
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.0.12
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -156,6 +156,10 @@
 exit 0
 
 %changelog
+* Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-7
+- Updated patch for 1.0.x changes:
+  - Fixed stub scripts (bug #477107).
+
 * Fri Dec 19 2008 Tim Waugh <twaugh at redhat.com> 1.0.12-6
 - Updated patch for 1.0.x changes:
   - Look harder for locale/page size issues in the troubleshooter