diff --git a/.gitignore b/.gitignore index 2b042b7..0bfafac 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /cdbs_0.4.156.tar.xz /cdbs_0.4.158.tar.xz /cdbs_0.4.159.tar.xz +/cdbs_0.4.161.tar.xz diff --git a/cdbs.spec b/cdbs.spec index c2f4504..69421e5 100644 --- a/cdbs.spec +++ b/cdbs.spec @@ -1,6 +1,6 @@ Name: cdbs -Version: 0.4.159 -Release: 4%{?dist} +Version: 0.4.161 +Release: 1%{?dist} Summary: Common build system for Debian packages BuildArch: noarch @@ -48,6 +48,9 @@ can build; any or all rules may be overridden as needed. %{_mandir}/man1/cdbs-edit-patch.1* %changelog +* Sun Apr 12 2020 Sandro Mani - 0.4.161-1 +- Update to 0.4.161 + * Tue Jan 28 2020 Fedora Release Engineering - 0.4.159-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/cdbs_py3.patch b/cdbs_py3.patch index bdf8a2a..7eaed21 100644 --- a/cdbs_py3.patch +++ b/cdbs_py3.patch @@ -1,13 +1,13 @@ -diff -rupN cdbs-0.4.131/scripts/waf-unpack cdbs-0.4.131-new/scripts/waf-unpack ---- cdbs-0.4.131/scripts/waf-unpack 2016-05-11 14:01:51.000000000 +0200 -+++ cdbs-0.4.131-new/scripts/waf-unpack 2016-05-12 10:08:52.300229531 +0200 +diff -rupN --no-dereference cdbs-0.4.161/scripts/waf-unpack cdbs-0.4.161-new/scripts/waf-unpack +--- cdbs-0.4.161/scripts/waf-unpack 2016-06-10 12:36:01.000000000 +0200 ++++ cdbs-0.4.161-new/scripts/waf-unpack 2020-04-12 18:39:21.659468521 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- mode: python; coding: utf-8 -*- # # Most of this code was stolen from Waf which is: -@@ -18,6 +18,8 @@ +@@ -19,6 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . @@ -16,7 +16,7 @@ diff -rupN cdbs-0.4.131/scripts/waf-unpack cdbs-0.4.131-new/scripts/waf-unpack usage = ''' python waf-unpack --waf=WAF_FILE --dest=DEST_FOLDER -@@ -114,11 +116,11 @@ if __name__ == '__main__': +@@ -115,11 +117,11 @@ if __name__ == '__main__': (options, args) = parser.parse_args() if not options.waf and not options.dest: diff --git a/sources b/sources index 614a3b4..0fff6dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cdbs_0.4.159.tar.xz) = ab32bfa0c87fe5be3215d033963c2657177a349c7c8bbf073e87b6b2abfc43ebfbbe7bf0cacac9f3673a3645230fb560b341f9ee24e75b53d1ddb83c8da7e1f7 +SHA512 (cdbs_0.4.161.tar.xz) = 7a4ace4b1a5096a86ee10b9524eb311418b2b75f2228475bdc95816ff488048f49d32cd6453f35340a599210012e5266f2102dd2a78651e8d200e26f6a53aafd