commit rpmdevtools for openSUSE:Factory
Hello community, here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2020-08-19 18:59:25 Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old) and /work/SRC/openSUSE:Factory/.rpmdevtools.new.3399 (New) Package is "rpmdevtools" Wed Aug 19 18:59:25 2020 rev:8 rq:827857 version:8.10 Changes: --- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2020-04-27 23:33:35.482962630 +0200 +++ /work/SRC/openSUSE:Factory/.rpmdevtools.new.3399/rpmdevtools.changes 2020-08-19 18:59:57.447945925 +0200 @@ -1,0 +2,6 @@ +Wed Aug 19 10:05:41 UTC 2020 - Dominique Leuenberger + +- Stop passing --libdir=%{_libexecdir} to configure: besides being + wrong, it also has no effect in this package. + +--- Other differences: -- ++ rpmdevtools.spec ++ --- /var/tmp/diff_new_pack.dapYpz/_old 2020-08-19 18:59:58.403946406 +0200 +++ /var/tmp/diff_new_pack.dapYpz/_new 2020-08-19 18:59:58.403946406 +0200 @@ -82,7 +82,7 @@ sed -i "s/spectool/rpmdev-spectool/g" rpmdevtools.bash-completion.in spectool.in %build -%configure --libdir=%{_libexecdir} +%configure %make_build %install
commit rpmdevtools for openSUSE:Factory
Hello community, here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2020-04-27 23:33:11 Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old) and /work/SRC/openSUSE:Factory/.rpmdevtools.new.2738 (New) Package is "rpmdevtools" Mon Apr 27 23:33:11 2020 rev:7 rq:797599 version:8.10 Changes: --- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2020-03-24 22:37:35.305242383 +0100 +++ /work/SRC/openSUSE:Factory/.rpmdevtools.new.2738/rpmdevtools.changes 2020-04-27 23:33:35.482962630 +0200 @@ -1,0 +2,13 @@ +Sat Apr 25 08:50:20 UTC 2020 - Benoît Monin + +- Switch to python 3: + * Require python3-rpm instead of python2-rpm + * Add python3-shebang.patch to run python scripts with python3 + * Add rmdevelrpms_fix_filename_search.patch to add compatibility +with both newer and older rpm binding + * Backport upstream commits 2ddae80, 693c954 and ea772da as +rmdevelrpms_use_more_raw_strings.patch +bumpspec_checksig_avoid_python_3.6_regex_related_deprecations.patch +limit_newversion_re.sub_to_a_single_replacement.patch + +--- New: bumpspec_checksig_avoid_python_3.6_regex_related_deprecations.patch limit_newversion_re.sub_to_a_single_replacement.patch python3-shebang.patch rmdevelrpms_fix_filename_search.patch rmdevelrpms_use_more_raw_strings.patch Other differences: -- ++ rpmdevtools.spec ++ --- /var/tmp/diff_new_pack.IW3J9O/_old 2020-04-27 23:33:36.250964129 +0200 +++ /var/tmp/diff_new_pack.IW3J9O/_new 2020-04-27 23:33:36.250964129 +0200 @@ -31,9 +31,19 @@ # PATCH-FIX-OPENSUSE suse-specfile.patch -- Apply fix to comply to http://en.opensuse.org/openSUSE:Specfile_guidelines Patch0: suse-specfile.patch Patch1: dont-drop-Groups.patch +# PATCH-FIX-OPENSUSE python3-shebang.patch -- Run python scripts with python3 +Patch2: python3-shebang.patch +# PATCH-FIX-UPSTREAM rmdevelrpms_use_more_raw_strings.patch -- Backport of commit 2ddae80 for python3 +Patch3: rmdevelrpms_use_more_raw_strings.patch +# PATCH-FIX-UPSTREAM bumpspec_checksig_avoid_python_3.6_regex_related_deprecations.patch -- Backport of commit 693c954 for python3 +Patch4: bumpspec_checksig_avoid_python_3.6_regex_related_deprecations.patch +# PATCH-FIX-UPSTREAM limit_newversion_re.sub_to_a_single_replacement.patch -- Backport of commit ea772da for python3 +Patch5: limit_newversion_re.sub_to_a_single_replacement.patch +# PATCH-FIX-OPENSUSE rmdevelrpms_fix_filename_search.patch -- Add compat with both newer and older rpm binding +Patch6: rmdevelrpms_fix_filename_search.patch BuildRequires: help2man BuildRequires: pkgconfig -BuildRequires: python2-rpm +BuildRequires: python3-rpm BuildRequires: pkgconfig(bash-completion) # Required for bash-completion Requires: bash-completion @@ -43,7 +53,7 @@ # Minimal RPM build requirements Requires: distribution-release Requires: fakeroot -Requires: python2-rpm +Requires: python3-rpm BuildArch: noarch %description @@ -65,6 +75,7 @@ %prep %autosetup -p1 + cp -a %{SOURCE1} template.init # Use the "rpmdev-" prefix for spectool that conflicts with Redhat spectool ++ bumpspec_checksig_avoid_python_3.6_regex_related_deprecations.patch ++ >From 693c9549280b78860b756b593b5922bf3be46888 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Feb 15 2017 09:19:29 + Subject: bumpspec, checksig: Avoid python 3.6 regex related deprecations --- diff --git a/rpmdev-bumpspec b/rpmdev-bumpspec index ea2ddd9..35e6c9c 100755 --- a/rpmdev-bumpspec +++ b/rpmdev-bumpspec @@ -44,8 +44,10 @@ class SpecFile(object): # supported release value macro definitions _macro_bump_patterns = ( -re.compile(r"^%(?:define|global)\s+(?i)release\s+(\d+.*)"), -re.compile(r"^%(?:define|global)\s+(?i)baserelease\s+(\d+.*)"), +re.compile(r"^%(?:define|global)\s+" + r"[Rr][Ee][Ll][Ee][Aa][Ss][Ee]\s+(\d+.*)"), +re.compile(r"^%(?:define|global)\s+" + r"[Bb][Aa][Ss][Ee][Rr][Ee][Ll][Ee][Aa][Ss][Ee]\s+(\d+.*)"), ) # normal "Release:" tag lines _tag_bump_patterns = ( diff --git a/rpmdev-checksig b/rpmdev-checksig index 0e90fe5..76b5967 100755 --- a/rpmdev-checksig +++ b/rpmdev-checksig @@ -44,7 +44,7 @@ def lookupKeyID(ts, keyid): mi.pattern('version', rpm.RPMMIRE_STRCMP, keyid) for hdr in mi: sum = hdr['summary'] -mo = re.search(b'\<.*\>', sum) +mo = re.search(rb'\<.*\>', sum) email = mo.group().decode(errors='replace') return email ++
commit rpmdevtools for openSUSE:Factory
Hello community, here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2020-03-24 22:35:45 Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old) and /work/SRC/openSUSE:Factory/.rpmdevtools.new.3160 (New) Package is "rpmdevtools" Tue Mar 24 22:35:45 2020 rev:6 rq:787684 version:8.10 Changes: --- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2020-01-08 19:32:28.284590300 +0100 +++ /work/SRC/openSUSE:Factory/.rpmdevtools.new.3160/rpmdevtools.changes 2020-03-24 22:37:35.305242383 +0100 @@ -1,0 +2,6 @@ +Tue Mar 24 07:31:07 UTC 2020 - Martin Pluskal + +- Clean up spec file with spec-cleaner +- Update names of python bindings for rpm + +--- Other differences: -- ++ rpmdevtools.spec ++ --- /var/tmp/diff_new_pack.PfCkTo/_old 2020-03-24 22:37:35.989242715 +0100 +++ /var/tmp/diff_new_pack.PfCkTo/_new 2020-03-24 22:37:35.997242719 +0100 @@ -33,8 +33,7 @@ Patch1: dont-drop-Groups.patch BuildRequires: help2man BuildRequires: pkgconfig -BuildRequires: rpm-python -BuildRequires: xz +BuildRequires: python2-rpm BuildRequires: pkgconfig(bash-completion) # Required for bash-completion Requires: bash-completion @@ -44,8 +43,7 @@ # Minimal RPM build requirements Requires: distribution-release Requires: fakeroot -Requires: python -Requires: rpm-python +Requires: python2-rpm BuildArch: noarch %description @@ -66,9 +64,7 @@ ...and many more. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 cp -a %{SOURCE1} template.init # Use the "rpmdev-" prefix for spectool that conflicts with Redhat spectool @@ -76,7 +72,7 @@ %build %configure --libdir=%{_libexecdir} -make %{?_smp_mflags} +%make_build %install %make_install
commit rpmdevtools for openSUSE:Factory
Hello community, here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2020-01-08 19:32:16 Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old) and /work/SRC/openSUSE:Factory/.rpmdevtools.new.6675 (New) Package is "rpmdevtools" Wed Jan 8 19:32:16 2020 rev:5 rq:761084 version:8.10 Changes: --- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2019-01-03 18:04:04.904276196 +0100 +++ /work/SRC/openSUSE:Factory/.rpmdevtools.new.6675/rpmdevtools.changes 2020-01-08 19:32:28.284590300 +0100 @@ -1,0 +2,8 @@ +Sun Jan 5 16:33:45 UTC 2020 - Luigi Baldoni + +- Refreshed suse-specfile.patch to reflect current spec-cleaner + templates + * Updated company name + * Removed groups + +--- Other differences: -- ++ rpmdevtools.spec ++ --- /var/tmp/diff_new_pack.uXOhig/_old 2020-01-08 19:32:28.924590092 +0100 +++ /var/tmp/diff_new_pack.uXOhig/_new 2020-01-08 19:32:28.928590090 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpmdevtools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ suse-specfile.patch ++ --- /var/tmp/diff_new_pack.uXOhig/_old 2020-01-08 19:32:28.960590081 +0100 +++ /var/tmp/diff_new_pack.uXOhig/_new 2020-01-08 19:32:28.960590081 +0100 @@ -15,11 +15,11 @@ === --- rpmdevtools-8.10.orig/spectemplate-R.spec +++ rpmdevtools-8.10/spectemplate-R.spec -@@ -1,27 +1,41 @@ +@@ -1,27 +1,40 @@ +# +# spec file for package [spectemplate] +# -+# Copyright (c) __YEAR__ SUSE LINUX GmbH, Nuernberg, Germany. ++# Copyright (c) __YEAR__ SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed @@ -48,7 +48,6 @@ - -Group: Applications/Engineering License: -+Group: Development/Libraries/Other URL:http://cran.r-project.org/web/packages/%{packname}/ Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,7 +65,7 @@ %description -@@ -29,28 +43,18 @@ Requires: R-core +@@ -29,28 +42,18 @@ Requires: R-core %prep %setup -q -c -n %{packname} @@ -98,7 +97,7 @@ %license add-license-file-here %dir %{rlibdir}/%{packname} %doc %{rlibdir}/%{packname}/doc -@@ -64,5 +68,4 @@ rm -rf $RPM_BUILD_ROOT +@@ -64,5 +67,4 @@ rm -rf $RPM_BUILD_ROOT %{rlibdir}/%{packname}/R-ex %{rlibdir}/%{packname}/help @@ -108,11 +107,11 @@ === --- rpmdevtools-8.10.orig/spectemplate-dummy.spec +++ rpmdevtools-8.10/spectemplate-dummy.spec -@@ -1,31 +1,38 @@ +@@ -1,31 +1,37 @@ +# +# spec file for package [spectemplate] +# -+# Copyright (c) __YEAR__ SUSE LINUX GmbH, Nuernberg, Germany. ++# Copyright (c) __YEAR__ SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed @@ -138,7 +137,6 @@ -URL:http://fedoraproject.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +License:SUSE-Public-Domain -+Group: Productivity/Other +URL:http://www.opensuse.org %description @@ -167,11 +165,11 @@ === --- rpmdevtools-8.10.orig/spectemplate-lib.spec +++ rpmdevtools-8.10/spectemplate-lib.spec -@@ -1,14 +1,29 @@ +@@ -1,14 +1,28 @@ +# +# spec file for package [spectemplate] +# -+# Copyright (c) __YEAR__ SUSE LINUX GmbH, Nuernberg, Germany. ++# Copyright (c) __YEAR__ SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed @@ -194,7 +192,6 @@ - -Group: System Environment/Libraries License: -+Group: System/Libraries URL: Source0: -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -202,13 +199,12 @@ BuildRequires: Requires: -@@ -17,40 +32,28 @@ Requires: +@@ -17,40 +31,27 @@ Requires: %packagedevel Summary:Development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -+Group:
commit rpmdevtools for openSUSE:Factory
Hello community, here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2019-01-03 18:04:03 Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old) and /work/SRC/openSUSE:Factory/.rpmdevtools.new.28833 (New) Package is "rpmdevtools" Thu Jan 3 18:04:03 2019 rev:4 rq:661982 version:8.10 Changes: --- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2018-07-26 10:17:21.463823571 +0200 +++ /work/SRC/openSUSE:Factory/.rpmdevtools.new.28833/rpmdevtools.changes 2019-01-03 18:04:04.904276196 +0100 @@ -1,0 +2,10 @@ +Sat Dec 29 17:48:07 UTC 2018 - Luigi Baldoni + +- Refreshed suse-specfile.patch to reflect current spec-cleaner + templates. + +- Dropped suse-specfile_python.patch (targets no longer supported) + and suse-specfile_python_single.patch (re-merged into + suse-specfile.patch) + +--- Old: suse-specfile_python.patch suse-specfile_python_single.patch Other differences: -- ++ rpmdevtools.spec ++ --- /var/tmp/diff_new_pack.LRPT24/_old 2019-01-03 18:04:05.496275669 +0100 +++ /var/tmp/diff_new_pack.LRPT24/_new 2019-01-03 18:04:05.500275666 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -31,10 +31,6 @@ # PATCH-FIX-OPENSUSE suse-specfile.patch -- Apply fix to comply to http://en.opensuse.org/openSUSE:Specfile_guidelines Patch0: suse-specfile.patch Patch1: dont-drop-Groups.patch -# PATCH-FIX-OPENSUSE suse-specfile_python.patch -- Use old style python template -Patch3: suse-specfile_python.patch -# PATCH-FIX-OPENSUSE suse-specfile_python_single.patch -- Use new style python template (singlespec) -Patch4: suse-specfile_python_single.patch BuildRequires: help2man BuildRequires: pkgconfig BuildRequires: rpm-python @@ -73,11 +69,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120200 -%patch3 -p1 -%else -%patch4 -p1 -%endif cp -a %{SOURCE1} template.init # Use the "rpmdev-" prefix for spectool that conflicts with Redhat spectool ++ suse-specfile.patch ++ 620 lines (skipped) between /work/SRC/openSUSE:Factory/rpmdevtools/suse-specfile.patch and /work/SRC/openSUSE:Factory/.rpmdevtools.new.28833/suse-specfile.patch
commit rpmdevtools for openSUSE:Factory
Hello community, here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2018-07-26 10:17:19 Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old) and /work/SRC/openSUSE:Factory/.rpmdevtools.new (New) Package is "rpmdevtools" Thu Jul 26 10:17:19 2018 rev:3 rq:625197 version:8.10 Changes: --- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2017-05-31 12:19:32.302126777 +0200 +++ /work/SRC/openSUSE:Factory/.rpmdevtools.new/rpmdevtools.changes 2018-07-26 10:17:21.463823571 +0200 @@ -1,0 +2,8 @@ +Wed Jul 25 07:14:11 UTC 2018 - mplus...@suse.com + +- Modernise spec-file with spec-cleaner +- Use generic runtime dependency on distribution-release +- Move bash completions to correct dir +- Update dependencies + +--- Other differences: -- ++ rpmdevtools.spec ++ --- /var/tmp/diff_new_pack.pY3b97/_old 2018-07-26 10:17:21.875824318 +0200 +++ /var/tmp/diff_new_pack.pY3b97/_new 2018-07-26 10:17:21.879824325 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpmdevtools # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,9 @@ Release:0 Summary:RPM Development Tools # rpmdev-setuptree is GPL-2.0, everything else GPL-2.0+ -License:GPL-2.0 and GPL-2.0+ +License:GPL-2.0-only AND GPL-2.0-or-later Group: Development/Tools/Other -Url:https://pagure.io/rpmdevtools +URL:https://pagure.io/rpmdevtools Source0:https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz Source1:skeleton Source2:%{name}-rpmlintrc @@ -36,22 +36,21 @@ # PATCH-FIX-OPENSUSE suse-specfile_python_single.patch -- Use new style python template (singlespec) Patch4: suse-specfile_python_single.patch BuildRequires: help2man +BuildRequires: pkgconfig BuildRequires: rpm-python BuildRequires: xz +BuildRequires: pkgconfig(bash-completion) +# Required for bash-completion +Requires: bash-completion # Additionally required for tool operations Requires: cpio Requires: curl +# Minimal RPM build requirements +Requires: distribution-release Requires: fakeroot Requires: python Requires: rpm-python -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -# Minimal RPM build requirements -%if 0%{?sles_version} -Requires: sled-release -%else 0%{?suse_version} -Requires: openSUSE-release -%endif %description This package contains scripts and (X)Emacs support files to aid in @@ -85,7 +84,7 @@ sed -i "s/spectool/rpmdev-spectool/g" rpmdevtools.bash-completion.in spectool.in %build -%configure --libdir=%{_prefix}/lib +%configure --libdir=%{_libexecdir} make %{?_smp_mflags} %install @@ -103,13 +102,13 @@ chmod 755 %{buildroot}%{_datadir}/rpmdevtools/{trap.sh,tmpdir.sh} %files -%defattr(-,root,root,-) -%doc COPYING NEWS -%config %{_sysconfdir}/bash_completion.d/rpmdevtools.bash-completion +%license COPYING +%doc NEWS %config(noreplace) %{_sysconfdir}/rpmdevtools/ %{_bindir}/rpm* %{_mandir}/man[18]/rpm*.[18]%{ext_man} %{emacs_sitestart_d}/rpmdev-init.el* %{_datadir}/rpmdevtools/ +%{_datadir}/bash-completion/completions/* %changelog
commit rpmdevtools for openSUSE:Factory
Hello community, here is the log from the commit of package rpmdevtools for openSUSE:Factory checked in at 2017-05-31 12:18:26 Comparing /work/SRC/openSUSE:Factory/rpmdevtools (Old) and /work/SRC/openSUSE:Factory/.rpmdevtools.new (New) Package is "rpmdevtools" Wed May 31 12:18:26 2017 rev:2 rq:498783 version:8.10 Changes: --- /work/SRC/openSUSE:Factory/rpmdevtools/rpmdevtools.changes 2017-01-25 23:24:49.493302065 +0100 +++ /work/SRC/openSUSE:Factory/.rpmdevtools.new/rpmdevtools.changes 2017-05-31 12:19:32.302126777 +0200 @@ -1,0 +2,18 @@ +Sat May 27 13:28:13 UTC 2017 - aloi...@gmx.com + +- Update to version 8.10 + * Extract (only) full name from gecos field in -packager +(rh#1350928) + * Point URLs to pagure.io + +- Updated source and homepage URLs + +- Dropped rmdevelrpms-8.5-SLE11.patch (target no longer built + in project) + +- Polished suse-specfile.patch, split off the python template + as suse-specfile_python.patch and + suse-specfile_python_single.patch and applied each depending on + the availability of python-rpm-macros + +--- Old: rmdevelrpms-8.5-SLE11.patch rpmdevtools-8.9.tar.xz New: rpmdevtools-8.10.tar.xz suse-specfile_python.patch suse-specfile_python_single.patch Other differences: -- ++ rpmdevtools.spec ++ --- /var/tmp/diff_new_pack.rcyEjN/_old 2017-05-31 12:19:32.878045477 +0200 +++ /var/tmp/diff_new_pack.rcyEjN/_new 2017-05-31 12:19:32.878045477 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpmdevtools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,23 @@ %define emacs_sitestart_d %{_datadir}/emacs/site-lisp Name: rpmdevtools -Version:8.9 +Version:8.10 Release:0 Summary:RPM Development Tools # rpmdev-setuptree is GPL-2.0, everything else GPL-2.0+ License:GPL-2.0 and GPL-2.0+ Group: Development/Tools/Other -Url:https://fedorahosted.org/rpmdevtools/ -Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz +Url:https://pagure.io/rpmdevtools +Source0:https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz Source1:skeleton Source2:%{name}-rpmlintrc # PATCH-FIX-OPENSUSE suse-specfile.patch -- Apply fix to comply to http://en.opensuse.org/openSUSE:Specfile_guidelines Patch0: suse-specfile.patch Patch1: dont-drop-Groups.patch -Patch2: rmdevelrpms-8.5-SLE11.patch +# PATCH-FIX-OPENSUSE suse-specfile_python.patch -- Use old style python template +Patch3: suse-specfile_python.patch +# PATCH-FIX-OPENSUSE suse-specfile_python_single.patch -- Use new style python template (singlespec) +Patch4: suse-specfile_python_single.patch BuildRequires: help2man BuildRequires: rpm-python BuildRequires: xz @@ -71,8 +74,10 @@ %setup -q %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} == 1110 -%patch2 +%if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120200 +%patch3 -p1 +%else +%patch4 -p1 %endif cp -a %{SOURCE1} template.init @@ -88,7 +93,7 @@ mkdir -p %{buildroot}%{emacs_sitestart_d} ln -s %{_datadir}/rpmdevtools/rpmdev-init.el %{buildroot}%{emacs_sitestart_d}/rpmdev-init.el -#/bin/touch %{buildroot}%{emacs_sitestart_d}/rpmdev-init.elc +#/bin/touch %%{buildroot}%%{emacs_sitestart_d}/rpmdev-init.elc # Use the "rpmdev-" prefix for spectool that conflicts with Redhat spectool mv %{buildroot}%{_bindir}/spectool %{buildroot}%{_bindir}/rpmdev-spectool ++ rpmdevtools-8.9.tar.xz -> rpmdevtools-8.10.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmdevtools-8.9/Makefile.am new/rpmdevtools-8.10/Makefile.am --- old/rpmdevtools-8.9/Makefile.am 2016-06-23 19:31:58.0 +0200 +++ new/rpmdevtools-8.10/Makefile.am2017-01-14 11:51:20.0 +0100 @@ -74,3 +74,22 @@ flake8: $(python_scripts) $(flake8) $(python_scripts) + +shell_scripts = rpmdev-diff rpmdev-extract rpmdev-md5 rpmdev-newinit \ + rpmdev-newspec rpmdev-packager rpmdev-setuptree rpmdev-wipetree \ + rpminfo rpmls template.init +bashate = bashate +shellcheck = shellcheck + +bashate: $(shell_scripts) + $(bashate) $(shell_scripts) + +shellcheck: $(shell_scripts) + $(shellcheck) $(shell_scripts) + +check-local: $(shell_scripts) + ret=0 + for file in $(shell_scripts) ; do \ + bash -n -O extglob $$file || ret=$$? ;