From 52c0e66d771d0772046e725abe131e43b1172dc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 23 May 2015 13:37:48 +0300 Subject: [PATCH] up to 1.1.2 --- default-distro.patch | 24 +++++++++++++----------- default-savepath.patch | 6 +++--- no-rpmdev-packager.patch | 27 +++++++++++++++++---------- pyp2rpm.spec | 8 ++++---- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/default-distro.patch b/default-distro.patch index 92a54d8..6beeb92 100644 --- a/default-distro.patch +++ b/default-distro.patch @@ -1,14 +1,16 @@ ---- pyp2rpm-1.0.1/./README.rst~ 2012-10-30 14:54:24.000000000 +0200 -+++ pyp2rpm-1.0.1/./README.rst 2013-03-17 12:04:03.622442099 +0200 -@@ -27,7 +27,7 @@ - -m METADATA_SOURCE Where to get metadata from ("pypi" or "local", default: "pypi"). - -s PACKAGE_SOURCE Where to get package from ("pypi" or "/full/path/to/local/file", default: "pypi"). - -d SAVE_DIR Where to save the package file (default: "/home/bkabrda/rpmbuild/SOURCES/") -- -t TEMPLATE Template file (jinja2 format) to render (default: "fedora"). Search order is 1) filesystem, 2) default templates. -+ -t TEMPLATE Template file (jinja2 format) to render (default: "pld"). Search order is 1) filesystem, 2) default templates. - -b BASE_PYTHON Base Python version to package for (default: "2"). - -p PYTHON_VERSION Additional Python versions to include in the specfile (e.g -p3 for %{?with_python3}). Can be specified multiple times. - +--- pyp2rpm-1.1.2/README.rst~ 2014-11-10 14:44:08.000000000 +0200 ++++ pyp2rpm-1.1.2/README.rst 2015-05-23 13:29:02.046296448 +0300 +@@ -37,8 +37,8 @@ + -s PACKAGE_SOURCE Where to get package from ("pypi" or "/full/path/to/local/file", default: "pypi"). + -d SAVE_DIR Where to save the package file (default: "~/rpmbuild") + -r RPM_NAME Name of rpm package (overrides calculated name) +- -t TEMPLATE Template file (jinja2 format) to render (default: "fedora"). Search order is 1) filesystem, 2) default templates. +- -o DISTRO Default distro whose conversion rules to use (default: "fedora"). Default templates have their rules associated and ignore this. ++ -t TEMPLATE Template file (jinja2 format) to render (default: "pld"). Search order is 1) filesystem, 2) default templates. ++ -o DISTRO Default distro whose conversion rules to use (default: "pld"). Default templates have their rules associated and ignore this. + -b BASE_PYTHON Base Python version to package for (default: "2"). + -p PYTHON_VERSION Additional Python versions to include in the specfile (e.g -p3 for %{?with_python3}). Can be specified multiple times. + --srpm When used pyp2rpm will produce srpm instead of printing specfile into stdout. --- pyp2rpm-1.0.1/./pyp2rpm/settings.py~ 2013-03-17 05:02:54.000000000 +0200 +++ pyp2rpm-1.0.1/./pyp2rpm/settings.py 2013-03-17 12:04:45.524371795 +0200 @@ -3,10 +3,10 @@ diff --git a/default-savepath.patch b/default-savepath.patch index d57a35f..dd18141 100644 --- a/default-savepath.patch +++ b/default-savepath.patch @@ -1,10 +1,10 @@ ---- pyp2rpm-1.0.1/pyp2rpm/settings.py~ 2012-11-26 15:22:18.000000000 +0200 -+++ pyp2rpm-1.0.1/pyp2rpm/settings.py 2013-03-17 03:10:31.762499704 +0200 +--- pyp2rpm-1.1.2/pyp2rpm/settings.py~ 2014-10-27 11:39:52.000000000 +0200 ++++ pyp2rpm-1.1.2/pyp2rpm/settings.py 2015-05-23 13:25:29.638625642 +0300 @@ -5,7 +5,7 @@ DEFAULT_METADATA_SOURCE = 'pypi' DEFAULT_TEMPLATE = 'fedora' DEFAULT_DISTRO = 'fedora' --DEFAULT_PKG_SAVE_PATH = os.path.expanduser('~/rpmbuild/SOURCES/') +-DEFAULT_PKG_SAVE_PATH = os.path.expanduser('~/rpmbuild') +DEFAULT_PKG_SAVE_PATH = os.path.expanduser('.') KNOWN_DISTROS = ['fedora', 'mageia'] ARCHIVE_SUFFIXES = ['.tar', '.tgz', '.tar.gz', '.tar.bz2', '.gz', '.bz2', '.zip', '.egg'] diff --git a/no-rpmdev-packager.patch b/no-rpmdev-packager.patch index f0e313f..c344808 100644 --- a/no-rpmdev-packager.patch +++ b/no-rpmdev-packager.patch @@ -1,21 +1,28 @@ ---- pyp2rpm-1.0.1/pyp2rpm/package_data.py~ 2012-11-26 15:22:18.000000000 +0200 -+++ pyp2rpm-1.0.1/pyp2rpm/package_data.py 2013-03-17 03:19:21.866958954 +0200 -@@ -1,6 +1,7 @@ - import subprocess +--- pyp2rpm-1.1.2/pyp2rpm/package_data.py~ 2014-11-10 11:58:43.000000000 +0200 ++++ pyp2rpm-1.1.2/pyp2rpm/package_data.py 2015-05-23 13:27:22.354465076 +0300 +@@ -2,6 +2,7 @@ import time import locale + import logging +import os from pyp2rpm import version - -@@ -50,7 +51,9 @@ - def changelog_date_packager(self): + from pyp2rpm import utils +@@ -45,14 +46,9 @@ + def get_changelog_date_packager(self): """Returns part of the changelog entry, containing date and packager. """ -- packager = subprocess.Popen('rpmdev-packager', stdout = subprocess.PIPE).communicate()[0].strip() -+ packager = 'unknown' +- try: +- packager = subprocess.Popen( +- 'rpmdev-packager', stdout=subprocess.PIPE).communicate()[0].strip() +- except OSError: +- # Hi John Doe, you should install rpmdevtools +- packager = "John Doe " +- logger.warn( +- 'Package rpmdevtools is missing, using default name: {0}.'.format(packager)) ++ packager = "John Doe " + if os.has_key('USER'): + packager = os.environ['USER'] date_str = time.strftime('%a %b %d %Y', time.gmtime()) encoding = locale.getpreferredencoding() - return '{0} {1}'.format(date_str, packager.decode(encoding)) + return u'{0} {1}'.format(date_str, packager.decode(encoding)) diff --git a/pyp2rpm.spec b/pyp2rpm.spec index 36a6b48..4e92412 100644 --- a/pyp2rpm.spec +++ b/pyp2rpm.spec @@ -4,17 +4,17 @@ Summary: Convert Python packages to RPM .spec files Name: pyp2rpm -Version: 1.0.1 +Version: 1.1.2 Release: 1 License: MIT Group: Applications Source0: http://pypi.python.org/packages/source/p/pyp2rpm/%{name}-%{version}.tar.gz -# Source0-md5: 1e9a514d8dab9782f699ded2eb268237 +# Source0-md5: c53728da205a0c9b8860644de464ea0d # to get tests: # git clone git@bitbucket.org:bkabrda/pyp2rpm.git && cd pyp2rpm # git checkout v1.0.1 && tar czf pyp2rpm-1.0.1-tests.tgz tests/ -Source1: %{name}-%{version}-tests.tgz -# Source1-md5: d6ffe3cd0acb10af01c99a77e6bd51f3 +Source1: http://pkgs.fedoraproject.org/repo/pkgs/pyp2rpm/%{name}-%{version}-tests.tgz/159412b3603fdcc673c0a8c731bc22c4/pyp2rpm-%{version}-tests.tgz +# Source1-md5: 159412b3603fdcc673c0a8c731bc22c4 Source2: pld.spec.tmpl Patch0: default-savepath.patch Patch1: no-rpmdev-packager.patch -- 2.44.0