up to 3.3.0

diff --git a/default-distro.patch b/default-distro.patch
index d8f4195a575451df36dbfb98fa59f814452d0071..1c73862cf396f37c32e157b5235ef2ed0a4cbd59 100644 (file)
--- a/default-distro.patch
+++ b/default-distro.patch
@@ -1,13 +1,19 @@
---- pyp2rpm-2.0.0/pyp2rpm/settings.py~ 2016-03-11 23:24:36.000000000 +0200
-+++ pyp2rpm-2.0.0/pyp2rpm/settings.py  2016-03-11 23:25:04.213223094 +0200
-@@ -4,8 +4,8 @@
- DEFAULT_ADDITIONAL_VERSION = '3'
+--- pyp2rpm-3.3.0/pyp2rpm/settings.py~ 2017-12-14 17:50:37.000000000 +0200
++++ pyp2rpm-3.3.0/pyp2rpm/settings.py  2018-02-04 14:50:17.285186784 +0200
+@@ -1,6 +1,6 @@
+ from pyp2rpm import utils
+ 
+-DEFAULT_TEMPLATE = 'fedora'
++DEFAULT_TEMPLATE = 'pld'
+ DEFAULT_PYTHON_VERSIONS = {
+     'fedora': ['3', '2'],
+     'epel7': ['2', '3'],
+@@ -11,7 +11,7 @@
+ DEFAULT_PYTHON_VERSION = DEFAULT_PYTHON_VERSIONS[DEFAULT_TEMPLATE][0]
  DEFAULT_PKG_SOURCE = 'pypi'
  DEFAULT_METADATA_SOURCE = 'pypi'
--DEFAULT_TEMPLATE = 'fedora'
 -DEFAULT_DISTRO = 'fedora'
-+DEFAULT_TEMPLATE = 'pld'
 +DEFAULT_DISTRO = 'pld'
- DEFAULT_PKG_SAVE_PATH = os.path.expanduser('.')
- KNOWN_DISTROS = ['fedora', 'mageia', 'pld']
- ARCHIVE_SUFFIXES = ['.tar', '.tgz', '.tar.gz', '.tar.bz2', '.gz', '.bz2', '.zip', '.egg']
+ DEFAULT_PKG_SAVE_PATH = utils.get_default_save_path()
+ KNOWN_DISTROS = DEFAULT_PYTHON_VERSIONS.keys()
+ ARCHIVE_SUFFIXES = ['.tar', '.tgz', '.tar.gz', '.tar.bz2',

diff --git a/default-savepath.patch b/default-savepath.patch
index 3d7ad3f041fbaa50a64f777a47124eb9cd6b31db..db466e421120c3ee13b04ebad02e6598e2b518e1 100644 (file)
--- a/default-savepath.patch
+++ b/default-savepath.patch
@@ -1,11 +1,12 @@
---- pyp2rpm-2.0.0/pyp2rpm/settings.py~ 2015-08-10 11:11:04.000000000 +0300
-+++ pyp2rpm-2.0.0/pyp2rpm/settings.py  2016-03-11 23:23:40.392220994 +0200
-@@ -6,7 +6,7 @@
- DEFAULT_METADATA_SOURCE = 'pypi'
- DEFAULT_TEMPLATE = 'fedora'
- DEFAULT_DISTRO = 'fedora'
--DEFAULT_PKG_SAVE_PATH = os.path.expanduser('~/rpmbuild')
-+DEFAULT_PKG_SAVE_PATH = os.path.expanduser('.')
- KNOWN_DISTROS = ['fedora', 'mageia', 'pld']
- ARCHIVE_SUFFIXES = ['.tar', '.tgz', '.tar.gz', '.tar.bz2', '.gz', '.bz2', '.zip', '.egg']
- EXTENSION_SUFFIXES = ['.c', '.cpp']
+--- pyp2rpm-3.3.0/pyp2rpm/utils.py~    2017-12-14 17:50:37.000000000 +0200
++++ pyp2rpm-3.3.0/pyp2rpm/utils.py     2018-02-04 14:47:29.799743953 +0200
+@@ -163,7 +163,6 @@
+     else:
+         save_path = rpm_eval(macro)
+         if not save_path:
+-            logger.warn("rpm tools are missing, using default save path "
+-                        "~/rpmbuild/.")
+-            save_path = os.path.expanduser('~/rpmbuild')
++            logger.warn("rpm tools are missing, using current dir as save path.")
++            save_path = os.path.expanduser('.')
+     return save_path

diff --git a/no-rpmdev-packager.patch b/no-rpmdev-packager.patch
index c34480845770fc6cd4990c3c8dc720fdff7e83e6..6cf1c9f3ebf728c3307fb1d09b371f59a5455a37 100644 (file)
--- a/no-rpmdev-packager.patch
+++ b/no-rpmdev-packager.patch
@@ -1,5 +1,5 @@
---- 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
+--- pyp2rpm-3.3.0/pyp2rpm/package_data.py~     2018-02-04 14:48:00.000000000 +0200
++++ pyp2rpm-3.3.0/pyp2rpm/package_data.py      2018-02-04 14:49:12.598463752 +0200
 @@ -2,6 +2,7 @@
  import time
  import locale
@@ -8,21 +8,22 @@
  
  from pyp2rpm import version
  from pyp2rpm import utils
-@@ -45,14 +46,9 @@
+@@ -90,15 +90,9 @@
      def get_changelog_date_packager(self):
          """Returns part of the changelog entry, containing date and packager.
          """
 -        try:
 -            packager = subprocess.Popen(
--                'rpmdev-packager', stdout=subprocess.PIPE).communicate()[0].strip()
+-                'rpmdev-packager', stdout=subprocess.PIPE).communicate(
+-                )[0].strip()
 -        except OSError:
 -            # Hi John Doe, you should install rpmdevtools
 -            packager = "John Doe <john@doe.com>"
--            logger.warn(
--                'Package rpmdevtools is missing, using default name: {0}.'.format(packager))
+-            logger.warn("Package rpmdevtools is missing, using default "
+-                        "name: {0}.".format(packager))
 +        packager = "John Doe <john@doe.com>"
 +        if os.has_key('USER'):
 +            packager = os.environ['USER']
-         date_str = time.strftime('%a %b %d %Y', time.gmtime())
+         with utils.c_time_locale():
+             date_str = time.strftime('%a %b %d %Y', time.gmtime())
          encoding = locale.getpreferredencoding()
-         return u'{0} {1}'.format(date_str, packager.decode(encoding))

diff --git a/pyp2rpm.spec b/pyp2rpm.spec
index bc9079dd6efd25a51a51783f849d43a1d49036aa..0954c9403ebe58f4d8ffd47544ad766d7a7cdeab 100644 (file)
--- a/pyp2rpm.spec
+++ b/pyp2rpm.spec
@@ -4,12 +4,12 @@
 
 Summary:       Convert Python packages to RPM .spec files
 Name:          pyp2rpm
-Version:       3.2.2
+Version:       3.3.0
 Release:       1
 License:       MIT
 Group:         Development
 Source0:       https://github.com/fedora-python/pyp2rpm/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 38bec138ff81cd8966b6a61c8dd20c22
+# Source0-md5: 9c744bc722f554cb22f63e1fd2b1a187
 Patch0:                default-savepath.patch
 Patch1:                no-rpmdev-packager.patch
 Patch2:                default-distro.patch
@@ -57,12 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pyp2rpm
 %dir %{py_sitescriptdir}/%{name}
 %{py_sitescriptdir}/%{name}/*.py[co]
-%{py_sitescriptdir}/command
+%{py_sitescriptdir}/%{name}/command
 %dir %{py_sitescriptdir}/%{name}/templates
 %{py_sitescriptdir}/%{name}/templates/epel6.spec
 %{py_sitescriptdir}/%{name}/templates/epel7.spec
 %{py_sitescriptdir}/%{name}/templates/fedora.spec
-%{py_sitescriptdir}/%{name}/templates/fedora_subdirs.spec
 %{py_sitescriptdir}/%{name}/templates/macros.spec
 %{py_sitescriptdir}/%{name}/templates/mageia.spec
 %{py_sitescriptdir}/%{name}/templates/pld.spec