diff options
author | Eric Sandall | 2010-04-28 12:38:07 -0700 |
---|---|---|
committer | Eric Sandall | 2010-04-28 12:38:07 -0700 |
commit | c0f62794ef171fc432102672ccbab59fe1f81129 (patch) | |
tree | 89e36a036dcc54d99ffd6f519faa4b6091fcf60a /printer/pycups | |
parent | 7da9ebf862d571dbf7a0df1490e30062f531310b (diff) |
pycups: Apply python2.5.patch (Fixes Bug #15656)
Based on http://git.fedorahosted.org/git/?p=pycups.git;a=commit;h=fefe4d6b50c5f1c0bcafa40da60170f42217de82
https://fedorahosted.org/pycups/ticket/14
Diffstat (limited to 'printer/pycups')
-rw-r--r-- | printer/pycups/HISTORY | 6 | ||||
-rwxr-xr-x | printer/pycups/PRE_BUILD | 3 | ||||
-rw-r--r-- | printer/pycups/python2.5.patch | 33 |
3 files changed, 42 insertions, 0 deletions
diff --git a/printer/pycups/HISTORY b/printer/pycups/HISTORY index 488bb47db6..8a36ea3539 100644 --- a/printer/pycups/HISTORY +++ b/printer/pycups/HISTORY @@ -1,3 +1,9 @@ +2010-04-28 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Apply python2.5.patch (Fixes Bug #15656) + * python2.5.patch: Based on + http://git.fedorahosted.org/git/?p=pycups.git;a=commit;h=fefe4d6b50c5f1c0bcafa40da60170f42217de82 + https://fedorahosted.org/pycups/ticket/14 + 2010-03-10 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.9.49 diff --git a/printer/pycups/PRE_BUILD b/printer/pycups/PRE_BUILD new file mode 100755 index 0000000000..1ffd20b0a2 --- /dev/null +++ b/printer/pycups/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p1 < $SCRIPT_DIRECTORY/python2.5.patch diff --git a/printer/pycups/python2.5.patch b/printer/pycups/python2.5.patch new file mode 100644 index 0000000000..ed7fc48464 --- /dev/null +++ b/printer/pycups/python2.5.patch @@ -0,0 +1,33 @@ +# +# Based on +# http://git.fedorahosted.org/git/?p=pycups.git;a=commit;h=fefe4d6b50c5f1c0bcafa40da60170f42217de82 +# https://fedorahosted.org/pycups/ticket/14 +# +diff -Naur pycups-1.9.49.orig/Makefile pycups-1.9.49/Makefile +--- pycups-1.9.49.orig/Makefile 2010-04-28 12:25:05.016799280 -0700 ++++ pycups-1.9.49/Makefile 2010-04-28 12:34:20.275799057 -0700 +@@ -1,5 +1,4 @@ + NAME=pycups +-VERSION=1.9.49 + + SOURCES=cupsmodule.c cupsconnection.c cupsppd.c cupsipp.c setup.py \ + cupsppd.h cupsipp.h cupsconnection.h cupsmodule.h +@@ -9,7 +8,7 @@ + COPYING NEWS README TODO ChangeLog + + cups.so: $(SOURCES) +- CFLAGS=-DVERSION=\\\"$(VERSION)\\\" python setup.py build ++ python setup.py build + mv build/lib*/$@ . + + doc: cups.so +diff -Naur pycups-1.9.49.orig/setup.py pycups-1.9.49/setup.py +--- pycups-1.9.49.orig/setup.py 2010-04-28 12:25:05.016799280 -0700 ++++ pycups-1.9.49/setup.py 2010-04-28 12:35:39.438674099 -0700 +@@ -3,4 +3,5 @@ + ext_modules=[Extension("cups", + ["cupsmodule.c", "cupsconnection.c", + "cupsppd.c", "cupsipp.c"], +- libraries=["cups"])]) ++ libraries=["cups"], ++ define_macros=[("VERSION", '"1.9.49"')])]) |