rpms/gutenprint/devel gutenprint-foomaticppdupdate, 1.1, 1.2 gutenprint.spec, 1.43, 1.44
Tim Waugh
twaugh at fedoraproject.org
Thu Jan 8 16:19:17 UTC 2009
- Previous message: [pkgdb] gpsbabel: silfreed has requested commit
- Next message: rpms/flashrom/EL-4 .cvsignore, 1.11, 1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec, 1.13, 1.14 import.log, 1.3, 1.4 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31499
Modified Files:
gutenprint-foomaticppdupdate gutenprint.spec
Log Message:
* Thu Jan 8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
- Only run the foomatic PPD update script on update, and make sure the
script can deal with major version upgrades (bug #478328).
Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint-foomaticppdupdate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gutenprint-foomaticppdupdate 2 Jul 2007 17:19:02 -0000 1.1
+++ gutenprint-foomaticppdupdate 8 Jan 2009 16:18:46 -0000 1.2
@@ -5,8 +5,8 @@
## A utility for updating foomatic-generated PPDs so that they work with
## a newly-installed gutenprint package.
-## Copyright (C) 2007 Red Hat, Inc.
-## Copyright (C) 2007 Tim Waugh <twaugh at redhat.com
+## Copyright (C) 2007, 2009 Red Hat, Inc.
+## Copyright (C) 2007, 2009 Tim Waugh <twaugh at redhat.com
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -93,8 +93,15 @@
return
# Needs updating.
+ firstdot = gutenprint_version.find ('.')
+ seconddot = firstdot + 1 + gutenprint_version[1 + firstdot:].find ('.')
+ major = gutenprint_version[:seconddot]
+
+ driver = IDs[1]
+ dot = driver.find ('.')
+ driver = driver[:dot] + "." + major
try:
- genppd = generate_ppd (ppdfile, IDs[0], IDs[1])
+ genppd = generate_ppd (ppdfile, IDs[0], driver)
except:
return
Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gutenprint.spec 23 Dec 2008 11:33:41 -0000 1.43
+++ gutenprint.spec 8 Jan 2009 16:18:46 -0000 1.44
@@ -4,7 +4,7 @@
Name: gutenprint
Summary: Printer Drivers Package.
Version: 5.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Base
URL: http://gimp-print.sourceforge.net/
Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -246,12 +246,18 @@
%post foomatic
/bin/rm -f /var/cache/foomatic/*
-%{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+if [ $1 -eq 2 ]; then
+ %{_sbindir}/gutenprint-foomaticppdupdate %{version} || :
+fi
%postun foomatic
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Thu Jan 8 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-2
+- Only run the foomatic PPD update script on update, and make sure the
+ script can deal with major version upgrades (bug #478328).
+
* Tue Dec 23 2008 Tim Waugh <twaugh at redhat.com> 5.2.3-1
- 5.2.3.
- Previous message: [pkgdb] gpsbabel: silfreed has requested commit
- Next message: rpms/flashrom/EL-4 .cvsignore, 1.11, 1.12 flashrom--Makefile_cleanup.diff, 1.4, 1.5 flashrom.spec, 1.13, 1.14 import.log, 1.3, 1.4 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list