From c5d1cddc4e17dc5312eadd271f9012493b00e581 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 19 Dec 2008 13:03:38 +0000 Subject: [PATCH] - Updated patch for 1.0.x changes: - Fixed stub scripts (bug #477107). --- system-config-printer-1.0.x.patch | 35 ++++++++----------------------- system-config-printer.spec | 6 +++++- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/system-config-printer-1.0.x.patch b/system-config-printer-1.0.x.patch index 731a2e2..2b39454 100644 --- a/system-config-printer-1.0.x.patch +++ b/system-config-printer-1.0.x.patch @@ -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 ++ ++ * 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 + + * PhysicalDevice.py (PhysicalDevice.get_info): The hpfax backend @@ -378,14 +385,6 @@ index 3748d45..43e151f 100644 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 @@ index 5a6b7bc..8fcccab 100644 #~ 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 diff --git a/system-config-printer.spec b/system-config-printer.spec index 079b1ad..6d529c2 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -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 @@ rm -rf %buildroot exit 0 %changelog +* Fri Dec 19 2008 Tim Waugh 1.0.12-7 +- Updated patch for 1.0.x changes: + - Fixed stub scripts (bug #477107). + * Fri Dec 19 2008 Tim Waugh 1.0.12-6 - Updated patch for 1.0.x changes: - Look harder for locale/page size issues in the troubleshooter