1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
by <Hector Garcia <hector@debian.org>>
Remove header from fetchmailconf.py since it is a library.
Changed Makefiles to create fetchmailconf correctly according
to latest python migration.
Index: fetchmail-6.3.13/Makefile.am
===================================================================
--- fetchmail-6.3.13.orig/Makefile.am 2009-10-30 03:09:41.000000000 +0100
+++ fetchmail-6.3.13/Makefile.am 2010-02-01 16:35:28.000000000 +0100
@@ -181,7 +181,7 @@
Doxyfile
fetchmailconf:
- ( echo '#! /bin/sh' && echo 'exec @PYTHON@ @pythondir@/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
+ ( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/site-packages/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
FAQ: fetchmail-FAQ.html $(srcdir)/dist-tools/html2txt
AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }
Index: fetchmail-6.3.13/Makefile.in
===================================================================
--- fetchmail-6.3.13.orig/Makefile.in 2009-10-30 03:09:45.000000000 +0100
+++ fetchmail-6.3.13/Makefile.in 2010-02-01 16:36:22.000000000 +0100
@@ -1498,7 +1498,7 @@
$(srcdir)/specgen.sh $(VERSION) >fetchmail.spec
fetchmailconf:
- ( echo '#! /bin/sh' && echo 'exec @PYTHON@ @pythondir@/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
+ ( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/site-packages/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
FAQ: fetchmail-FAQ.html $(srcdir)/dist-tools/html2txt
AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }
Index: fetchmail-6.3.13/fetchmailconf.py
===================================================================
--- fetchmail-6.3.13.orig/fetchmailconf.py 2009-09-24 01:11:14.000000000 +0200
+++ fetchmail-6.3.13/fetchmailconf.py 2010-02-01 16:33:46.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
# A GUI configurator for generating fetchmail configuration files.
# by Eric S. Raymond, <esr@snark.thyrsus.com>,
# Matthias Andree <matthias.andree@gmx.de>
|
