From 96fe7d6513d707e8ac38eda6eaccf4d1c2802f1f Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 24 Jun 2014 13:13:13 +0200 Subject: [PATCH] New package: python-curl-7.19.3.1 with 3.4 subpkg; replaces pycurl; revbump affected pkgs urlgrabber: renamed to python-urlgrabber (python2-only) --- srcpkgs/pycurl/template | 14 ----- srcpkgs/python-curl/template | 74 ++++++++++++++++++++++++++ srcpkgs/python-urlgrabber/template | 18 +++++++ srcpkgs/python3.4-curl | 1 + srcpkgs/system-config-printer/template | 4 +- srcpkgs/urlgrabber/template | 16 ------ 6 files changed, 95 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/pycurl/template create mode 100644 srcpkgs/python-curl/template create mode 100644 srcpkgs/python-urlgrabber/template create mode 120000 srcpkgs/python3.4-curl delete mode 100644 srcpkgs/urlgrabber/template diff --git a/srcpkgs/pycurl/template b/srcpkgs/pycurl/template deleted file mode 100644 index 140f4d4284b..00000000000 --- a/srcpkgs/pycurl/template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'pycurl' -pkgname=pycurl -version=7.19.0 -revision=4 -build_style=python-module -hostmakedepends="python-devel libcurl-devel" -makedepends="openssl-devel libcurl-devel python-devel" -pycompile_module="curl" -short_desc="Python interface to the CURL library" -homepage="http://pycurl.sourceforge.net/" -license="LGPL-2.1/MIT" -maintainer="Juan RP " -distfiles="http://pycurl.sourceforge.net/download/${pkgname}-${version}.tar.gz" -checksum=eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642 diff --git a/srcpkgs/python-curl/template b/srcpkgs/python-curl/template new file mode 100644 index 00000000000..616c5efd60d --- /dev/null +++ b/srcpkgs/python-curl/template @@ -0,0 +1,74 @@ +# Template file for 'python-curl' +pkgname=python-curl +version=7.19.3.1 +revision=1 +wrksrc="pycurl-${version}" +build_style=python-module +python_versions="2.7 3.4" +hostmakedepends="libcurl-devel python-devel python3.4-devel" +makedepends="openssl-devel ${hostmakedepends}" +depends="python curl" +replaces="pycurl>=0" +pycompile_module="curl" +short_desc="Python2 interface to cURL library" +homepage="http://pycurl.sourceforge.net/" +license="LGPL-2.1, MIT" +maintainer="Juan RP " +distfiles="http://pycurl.sourceforge.net/download/pycurl-${version}.tar.gz" +checksum=c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f + +CFLAGS="${CFLAGS} -fno-strict-aliasing" + +post_extract() { + cp -a ${wrksrc} /tmp/python2-build + cp -a ${wrksrc} /tmp/python3.4-build + mv /tmp/python{2,3.4}-build ${wrksrc} +} + +pre_build() { + cd ${wrksrc}/python2-build + sed -i -e 's/"COPYING-LGPL", "COPYING-MIT",//' \ + -e 's/"share", "doc", PACKAGE/"share", "doc", "python-curl"/' setup.py + + cd ${wrksrc}/python3.4-build + find . -name '*.py' -exec sed -i -e 's|#! /usr/bin/env python|&3.4|' {} + + sed -i -e 's/"COPYING-LGPL", "COPYING-MIT",//' \ + -e 's/"share", "doc", PACKAGE/"share", "doc", "python3.4-curl"/' setup.py +} + +do_build() { + cd ${wrksrc}/python2-build + python setup.py build + + cd ${wrksrc}/python3.4-build + python3.4 setup.py build +} + +do_install() { + cd ${wrksrc}/python2-build + python setup.py install --root=${DESTDIR} + + cd ${wrksrc}/python3.4-build + python3.4 setup.py install --root=${DESTDIR} +} + +post_install() { + # install licenses + vinstall COPYING-LGPL 644 usr/share/licenses/${pkgname} + vinstall COPYING-MIT 644 usr/share/licenses/${pkgname} +} + +python3.4-curl_package() { + depends="python3.4 curl" + pycompile_version="3.4" + pycompile_module="curl" + short_desc="${short_desc/Python2/Python3.4}" + pkg_install() { + vmove /usr/lib/python3.4 + vmove /usr/share/doc/python3.4-curl + # install licenses + cd ${wrksrc} + vinstall COPYING-LGPL 644 usr/share/licenses/${pkgname} + vinstall COPYING-MIT 644 usr/share/licenses/${pkgname} + } +} diff --git a/srcpkgs/python-urlgrabber/template b/srcpkgs/python-urlgrabber/template new file mode 100644 index 00000000000..efb29e9de0b --- /dev/null +++ b/srcpkgs/python-urlgrabber/template @@ -0,0 +1,18 @@ +# Template file for 'python-urlgrabber' +pkgname=python-urlgrabber +version=3.10.1 +revision=1 +wrksrc="urlgrabber-${version}" +build_style=python-module +hostmakedepends="python python-curl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +replaces="urlgrabber>=0" +noarch=yes +pycompile_module="urlgrabber" +short_desc="A high-level cross-protocol url-grabber (Python2)" +homepage="http://urlgrabber.baseurl.org/" +license="LGPL-2.1" +maintainer="Juan RP " +distfiles="http://urlgrabber.baseurl.org/download/urlgrabber-${version}.tar.gz" +checksum=06b13ff8d527dba3aee04069681b2c09c03117592d5485a80ae4b807cdf33476 diff --git a/srcpkgs/python3.4-curl b/srcpkgs/python3.4-curl new file mode 120000 index 00000000000..c90170b4eff --- /dev/null +++ b/srcpkgs/python3.4-curl @@ -0,0 +1 @@ +python-curl \ No newline at end of file diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template index 41ad1387b7d..9f96987e568 100644 --- a/srcpkgs/system-config-printer/template +++ b/srcpkgs/system-config-printer/template @@ -1,14 +1,14 @@ # Template file for 'system-config-printer' pkgname=system-config-printer version=1.4.4 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-udev-rules" make_build_args="udevhelperdir=/usr/lib/udev" make_install_args="udevhelperdir=/usr/lib/udev udevrulesdir=/usr/lib/udev/rules.d" hostmakedepends="pkg-config intltool xmlto desktop-file-utils" makedepends="gtk+3-devel cups-devel libusb-devel systemd-devel - pycups python-dbus notify-python pycurl pysmbc python-gobject gir-freedesktop + pycups python-dbus notify-python python-curl pysmbc python-gobject gir-freedesktop gnome-keyring" depends="python pycups python-dbus notify-python pycurl pysmbc python-gobject gir-freedesktop gnome-keyring" diff --git a/srcpkgs/urlgrabber/template b/srcpkgs/urlgrabber/template deleted file mode 100644 index a9c8431afd2..00000000000 --- a/srcpkgs/urlgrabber/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'urlgrabber' -pkgname=urlgrabber -version=3.9.1 -revision=3 -build_style=python-module -hostmakedepends="python pycurl" -makedepends="${hostmakedepends}" -depends="${hostmakedepends}" -noarch="yes" -pycompile_module="urlgrabber" -short_desc="A high-level cross-protocol url-grabber and Python library" -homepage="http://urlgrabber.baseurl.org/" -license="LGPL-2.1" -maintainer="Juan RP " -distfiles="http://urlgrabber.baseurl.org/download/$pkgname-$version.tar.gz" -checksum=4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0