rpms/python-cups
6
0
Fork 0
Code Issues Pull Requests Releases Activity

1.9.62, including fixes for building against newer versions of CUPS.

Browse Source
This commit is contained in:
Tim Waugh 2012-08-01 13:01:37 +01:00
parent dd6edf5665
commit 0e8e20da20
2 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
python-cups-ppd-null.patch
View File

@ -1,28 +0,0 @@
diff -U0 pycups-1.9.61/ChangeLog.ppd-null pycups-1.9.61/ChangeLog
--- pycups-1.9.61/ChangeLog.ppd-null 2012-03-06 10:53:09.000000000 +0000
+++ pycups-1.9.61/ChangeLog 2012-04-10 12:22:16.224974764 +0100
@@ -0,0 +1,5 @@
+2012-03-22 Tim Waugh <twaugh@redhat.com>
+
+ * cupsppd.c (PPD_dealloc): Add missing NULL check for
+ debugging message (Ubuntu #951001). Patch from Till Kamppeter.
+
diff -up pycups-1.9.61/cupsppd.c.ppd-null pycups-1.9.61/cupsppd.c
--- pycups-1.9.61/cupsppd.c.ppd-null 2011-12-08 13:22:35.000000000 +0000
+++ pycups-1.9.61/cupsppd.c 2012-04-10 12:22:16.224974764 +0100
@@ -236,10 +236,12 @@ PPD_init (PPD *self, PyObject *args, PyO
static void
PPD_dealloc (PPD *self)
{
- debugprintf ("- PPD %p (fd %d)\n", self, fileno (self->file));
-
- if (self->file)
+ if (self->file) {
+ debugprintf ("- PPD %p (fd %d)\n", self, fileno (self->file));
fclose (self->file);
+ } else
+ debugprintf ("- PPD %p (no fd)\n", self);
+
if (self->ppd)
ppdClose (self->ppd);
if (self->conv_from)

12
python-cups.spec
View File

@ -5,8 +5,8 @@
Summary: Python bindings for CUPS Summary: Python bindings for CUPS
Name: python-cups Name: python-cups
Version: 1.9.61 Version: 1.9.62
Release: 3%{?dist} Release: 1%{?dist}
URL: http://cyberelk.net/tim/software/pycups/ URL: http://cyberelk.net/tim/software/pycups/
Source: http://cyberelk.net/tim/data/pycups/pycups-%{version}.tar.bz2 Source: http://cyberelk.net/tim/data/pycups/pycups-%{version}.tar.bz2
License: GPLv2+ License: GPLv2+
@ -15,8 +15,6 @@ BuildRequires: cups-devel
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: epydoc BuildRequires: epydoc
Patch1: python-cups-ppd-null.patch
Conflicts: rpm-build < 4.9.0 Conflicts: rpm-build < 4.9.0
%description %description
@ -34,9 +32,6 @@ Documentation for python-cups.
%prep %prep
%setup -q -n pycups-%{version} %setup -q -n pycups-%{version}
# Apply upstream patch to fix crash on loading invalid PPDs (bug #811159).
%patch1 -p1 -b .ppd-null
%build %build
make CFLAGS="%{optflags} -fno-strict-aliasing" make CFLAGS="%{optflags} -fno-strict-aliasing"
make doc make doc
@ -57,6 +52,9 @@ make install DESTDIR="%{buildroot}"
%doc examples html %doc examples html
%changelog %changelog
* Wed Aug 1 2012 Tim Waugh <twaugh@redhat.com> - 1.9.62-1
- 1.9.62, including fixes for building against newer versions of CUPS.
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.61-3 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.61-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild