Update to 11.1

Add no_layout_deb.patch
epel9
Sérgio M. Basto 7 years ago
parent 8a3bac5781
commit 0cbc91001e

1
.gitignore vendored

@ -11,3 +11,4 @@
/debhelper_10.7.2.tar.xz /debhelper_10.7.2.tar.xz
/debhelper_10.8.tar.xz /debhelper_10.8.tar.xz
/debhelper_10.9.tar.xz /debhelper_10.9.tar.xz
/debhelper_11.1.tar.xz

@ -7,8 +7,8 @@
} }
Name: debhelper Name: debhelper
Version: 10.9 Version: 11.1
Release: 2%{?dist} Release: 1%{?dist}
Summary: Helper programs for Debian rules Summary: Helper programs for Debian rules
Group: Development/Tools Group: Development/Tools
@ -16,6 +16,7 @@ License: GPLv2+
URL: http://kitenet.net/~joey/code/debhelper/ URL: http://kitenet.net/~joey/code/debhelper/
Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz Source0: http://ftp.de.debian.org/debian/pool/main/d/%{name}/%{name}_%{version}.tar.xz
Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch Patch1: debhelper-10.2.5-ignore-dh-systemd-transitional-package.patch
Patch2: no_layout_deb.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: bash BuildRequires: bash
@ -79,9 +80,10 @@ cc -dumpmachine
%setup -q -n %{name} %setup -q -n %{name}
%patch1 -p1 -b .no-transitional-package %patch1 -p1 -b .no-transitional-package
%patch2 -p1 -b .no-debian-layout
%build %build
make %{?_smp_mflags} build %make_build build
%install %install
%make_install %make_install
@ -121,6 +123,10 @@ make test
%{perl_vendorlib}/* %{perl_vendorlib}/*
%changelog %changelog
* Sun Jan 07 2018 Sérgio Basto <sergio@serjux.com> - 11.1-1
- Update to 11.1
- Add no_layout_deb.patch
* Sun Oct 01 2017 Sérgio Basto <sergio@serjux.com> - 10.9-2 * Sun Oct 01 2017 Sérgio Basto <sergio@serjux.com> - 10.9-2
- Print also dpkg --print-architecture to debug FTBFS in armv7 and ppc64le - Print also dpkg --print-architecture to debug FTBFS in armv7 and ppc64le

@ -0,0 +1,12 @@
Fedora setuptools don't have option --install-layout=deb
--- ./lib/Debian/Debhelper/Buildsystem/python_distutils.pm.orig 2017-12-02 08:46:03.000000000 +0000
+++ ./lib/Debian/Debhelper/Buildsystem/python_distutils.pm 2018-01-07 23:43:53.492047778 +0000
@@ -166,7 +166,7 @@ sub setup_py {
and $python_default =~ /^python2\.[2345]$/)
or $python =~ /^python2\.[2345](?:-dbg)?$/ )) {
$this->doit_in_sourcedir($python, "setup.py",
- $act, @_, "--install-layout=deb");
+ $act, @_);
}
else {
$this->doit_in_sourcedir($python, "setup.py",

@ -1 +1 @@
SHA512 (debhelper_10.9.tar.xz) = 0efec68a6a01530e57f220593e66ff9f527aa57deb1df025728a52754e32ea6a4f5d57e9c8fb4fb2eb0c584cd9951dd69a92aeaf0c274806c17473ef9926ac61 SHA512 (debhelper_11.1.tar.xz) = e837046615b8fec235ad769df8e89451423057f53b704e7220c3f55fbe9ee071782e6d0e072d3b9ff8175ebede0aad702c66f4b8cc8143be309f090b377f4594

Loading…
Cancel
Save