up to 1.9; new homepage

diff --git a/pythonpath.patch b/pythonpath.patch
index 078bf3a8fbdf64ea4940ab7e5c64a6c2b770c82e..6248efed181b76a1cfbd006fbf85f60ab4ad552a 100644 (file)
--- a/pythonpath.patch
+++ b/pythonpath.patch
@@ -1,13 +1,15 @@
---- rpmlint-1.0/rpmdiff~       2009-11-03 21:21:48.000000000 +0200
-+++ rpmlint-1.0/rpmdiff        2011-01-09 19:35:20.929627311 +0200
-@@ -27,9 +27,7 @@
+--- rpmlint-rpmlint-1.9/rpmdiff~       2016-06-29 20:07:39.000000000 +0300
++++ rpmlint-rpmlint-1.9/rpmdiff        2016-08-06 12:12:07.619967936 +0300
+@@ -24,11 +24,7 @@
+ import tempfile
  
  import rpm
- 
+-
 -if os.path.isdir("/usr/share/rpmlint"):
+-    import site
 -    site.addsitedir("/usr/share/rpmlint")
--import Pkg
+-import Pkg  # noqa: E402
 +from rpmlint.Pkg import Pkg
  
  
- class Rpmdiff:
+ class Rpmdiff(object):

diff --git a/rpmlint-groups.patch b/rpmlint-groups.patch
index 9a2cf793082cd556d74aa6db669ff543dc2dee39..c1137e349fc12ceec95fc06dabc4b529ef0a5fd2 100644 (file)
--- a/rpmlint-groups.patch
+++ b/rpmlint-groups.patch
@@ -1,11 +1,24 @@
---- rpmlint-1.7/Pkg.py~        2015-07-08 16:38:24.000000000 +0300
-+++ rpmlint-1.7/Pkg.py 2015-07-15 15:10:07.954186622 +0300
-@@ -197,7 +197,7 @@
-     the rpm package (if installed) if no filename is given"""
+Use GROUPS file from rpmlint (this project) package rather than rpm
+
+--- rpmlint-rpmlint-1.9/Pkg.py~        2016-06-29 20:07:39.000000000 +0300
++++ rpmlint-rpmlint-1.9/Pkg.py 2016-08-06 12:10:45.102344608 +0300
+@@ -214,16 +214,16 @@
+ def get_default_valid_rpmgroups(filename=None):
+     """
+     Get default rpm groups from filename, or try to look them up from
+-    the rpm package (if installed) if no filename is given.
++    the rpmlint package (if installed) if no filename is given.
+     """
      groups = []
      if not filename:
--        with InstalledPkg("rpm") as p:
-+        with InstalledPkg("rpmlint") as p:
-             groupsfiles = [x for x in p.files() if x.endswith('/GROUPS')]
-             if groupsfiles:
-                 filename = groupsfiles[0]
+         try:
+-            with InstalledPkg("rpm") as p:
++            with InstalledPkg("rpmlint") as p:
+                 groupsfiles = [x for x in p.files() if x.endswith('/GROUPS')]
+                 if groupsfiles:
+                     filename = groupsfiles[0]
+-        except:  # the rpm package might not be installed
++        except:  # the rpmlint package might not be installed
+             pass
+     if filename and os.path.exists(filename):
+         with open(filename) as fobj:

diff --git a/rpmlint.spec b/rpmlint.spec
index 960818a669155424939655cf302f75127913a39a..a4413b6ddf86a88d378cbfa871162251b21fa693 100644 (file)
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -5,12 +5,12 @@
 Summary:       Tool for checking common errors in RPM packages
 Summary(pl.UTF-8):     Narzędzie do sprawdzania pakietów RPM pod kątem częstych błędów
 Name:          rpmlint
-Version:       1.7
-Release:       2
+Version:       1.9
+Release:       1
 License:       GPL v2
 Group:         Development/Building
-Source0:       http://downloads.sourceforge.net/rpmlint/%{name}-%{version}.tar.xz
-# Source0-md5: 0b78c2fa4a98c6f660003a679ad6ea90
+Source0:       https://github.com/rpm-software-management/rpmlint/archive/%{name}-%{version}.tar.gz
+# Source0-md5: 810d7fd565d389fec305ff80af53ba40
 Source1:       %{name}.config
 Source3:       %{name}-etc.config
 Patch0:                %{name}-groups.patch
@@ -20,7 +20,7 @@ Patch3:               postshell.patch
 Patch4:                rpm5.patch
 Patch5:                bash-completion.patch
 Patch6:                revert-9f71923e.patch
-URL:           http://sourceforge.net/projects/rpmlint/
+URL:           https://github.com/rpm-software-management/rpmlint
 BuildRequires: python >= 1:2.6
 BuildRequires: python-modules
 %{?with_tests:BuildRequires:   python-rpm >= 5.4.10-12}
@@ -28,8 +28,6 @@ BuildRequires:        rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.673
 # tests require rpmlint in installed packages database
 %{?with_tests:BuildRequires:   rpmlint}
-BuildRequires: tar >= 1:1.22
-BuildRequires: xz
 Requires:      /bin/bash
 Requires:      /lib/cpp
 Requires:      binutils
@@ -70,7 +68,7 @@ bash-completion for rpmlint.
 Bashowe uzupełnianie parametrów dla polecenia rpmlint.
 
 %prep
-%setup -q
+%setup -q -n %{name}-rpmlint-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -129,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README* config.example
+%doc README* config.example
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpmlint/config
 %attr(755,root,root) %{_bindir}/rpmdiff