From ac5cdf4d19fc9e374cbc4094868891b3481edb68 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Sep 10 2019 13:28:03 +0000 Subject: Upgraded to a git snapshot from 2019-09-10 --- diff --git a/.gitignore b/.gitignore index 710b9e3..280b528 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rbm-d50b2a6.tar.gz +/rbm-e04f03f.tar.gz diff --git a/rbm-d50b2a6-Create-home-directory-when-adding-default-user-in-do.patch b/rbm-d50b2a6-Create-home-directory-when-adding-default-user-in-do.patch deleted file mode 100644 index 7d87558..0000000 --- a/rbm-d50b2a6-Create-home-directory-when-adding-default-user-in-do.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a1e67d4963fa0f7594d35995c6bf59014a999b32 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier -Date: Sun, 16 Oct 2016 15:56:08 +0200 -Subject: [PATCH] Create home directory when adding default user in docker - containers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - lib/RBM/DefaultConfig.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm -index 5759c6b..15f52f1 100644 ---- a/lib/RBM/DefaultConfig.pm -+++ b/lib/RBM/DefaultConfig.pm -@@ -364,7 +364,7 @@ ciddir=\$(mktemp -d) - cidfile="\$ciddir/cid" - [% - SET user=c('docker_user'); -- SET cmd = '/bin/sh -c ' _ shell_quote("id \$user >/dev/null 2>&1 || adduser \$user || useradd \$user"); -+ SET cmd = '/bin/sh -c ' _ shell_quote("id \$user >/dev/null 2>&1 || adduser -m \$user || useradd -m \$user"); - -%] - docker run --cidfile="\$cidfile" [% c("docker_opt") %] [% shell_quote(c('docker_image', {error_if_undef => 1})) %] [% cmd %] - cid=\$(cat \$cidfile) --- -2.7.4 - diff --git a/rbm-d50b2a6-Don-t-create-a-hg-directory.patch b/rbm-d50b2a6-Don-t-create-a-hg-directory.patch deleted file mode 100644 index 7a3efb4..0000000 --- a/rbm-d50b2a6-Don-t-create-a-hg-directory.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9d9ec94947508b66a6fed9effdd64f880be92fdd Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier -Date: Thu, 3 Nov 2016 18:03:16 +0100 -Subject: [PATCH] Don't create a hg directory -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There was no reason to do that, it was a mistake. - -This closes #4. - -Signed-off-by: Petr Písař ---- - lib/RBM.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/RBM.pm b/lib/RBM.pm -index 2456a17..6600f7a 100644 ---- a/lib/RBM.pm -+++ b/lib/RBM.pm -@@ -396,7 +396,7 @@ sub hg_need_fetch { - - sub hg_clone_fetch_chdir { - my ($project, $options) = @_; -- my $hg = create_dir(project_config($project, 'hg', $options)); -+ my $hg = project_config($project, 'hg', $options); - my $clonedir = create_dir(path(project_config($project, - 'hg_clone_dir', $options))); - my $hg_url = shell_quote(project_config($project, 'hg_url', $options)) --- -2.7.4 - diff --git a/rbm-d50b2a6-Fix-exit_error-call.patch b/rbm-d50b2a6-Fix-exit_error-call.patch deleted file mode 100644 index b9a65dc..0000000 --- a/rbm-d50b2a6-Fix-exit_error-call.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3e85f359e84222aa450ffbd1e82d671462814e6c Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier -Date: Mon, 24 Oct 2016 18:49:58 +0200 -Subject: [PATCH] Fix exit_error call -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - lib/RBM/DefaultConfig.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm -index 15f52f1..17c774b 100644 ---- a/lib/RBM/DefaultConfig.pm -+++ b/lib/RBM/DefaultConfig.pm -@@ -41,7 +41,7 @@ sub lsb_release { - my $res = {}; - my ($stdout, $stderr, $success, $exit_code) - = capture_exec('lsb_release', '-irc'); -- exit_error("Unknown distribution") unless $success; -+ RBM::exit_error("Unknown distribution") unless $success; - foreach (split "\n", $stdout) { - $res->{id} = $1 if (m/^Distributor ID:\s+(.+)$/); - $res->{release} = $1 if (m/^Release:\s+(.+)$/); --- -2.7.4 - diff --git a/rbm-d50b2a6-Use-dnf-on-recent-Fedora-and-Centos-releases.patch b/rbm-d50b2a6-Use-dnf-on-recent-Fedora-and-Centos-releases.patch deleted file mode 100644 index b665bfc..0000000 --- a/rbm-d50b2a6-Use-dnf-on-recent-Fedora-and-Centos-releases.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 073cf0bdeef141241f2b2310e410e60afaa23405 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier -Date: Thu, 3 Nov 2016 18:22:55 +0100 -Subject: [PATCH] Use dnf on recent Fedora and Centos releases -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use dnf on Fedora and Centos, except on Fedora 20, 21 and Centos 5, 6 -where yum is still used. - -This closes #3. - -Signed-off-by: Petr Písař ---- - lib/RBM/DefaultConfig.pm | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm -index 5a47c84..0fcf846 100644 ---- a/lib/RBM/DefaultConfig.pm -+++ b/lib/RBM/DefaultConfig.pm -@@ -494,18 +494,24 @@ OPT_END - install_package => sub { - my ($project, $options) = @_; - my $distro = RBM::project_config($project, 'lsb_release/id', $options); -+ my $release = RBM::project_config($project, 'lsb_release/release', $options); - my $yum = 'rpm -q [% c("pkg_name") %] > /dev/null || yum install -y [% c("pkg_name") %]'; -+ my $dnf = 'rpm -q [% c("pkg_name") %] > /dev/null || dnf install -y [% c("pkg_name") %]'; - my $zypper = 'rpm -q [% c("pkg_name") %] > /dev/null || zypper install [% c("pkg_name") %]'; - my $urpmi = 'rpm -q [% c("pkg_name") %] > /dev/null || urpmi [% c("pkg_name") %]'; - my $apt = 'dpkg -s [% c("pkg_name") %] > /dev/null 2>&1 || apt-get install -y [% c("pkg_name") %]'; - my %install = ( -- Fedora => $yum, -- CentOS => $yum, -- Mageia => $urpmi, -- openSuSe => $zypper, -- Debian => $apt, -- Ubuntu => $apt, -+ Fedora => $dnf, -+ 'Fedora-20' => $yum, -+ 'Fedora-21' => $yum, -+ CentOS => $dnf, -+ Mageia => $urpmi, -+ openSuSe => $zypper, -+ Debian => $apt, -+ Ubuntu => $apt, - ); -+ return $yum if "$distro-$release" =~ m/^Centos-[56]\./; -+ return $install{"$distro-$release"} if $install{"$distro-$release"}; - return $install{$distro}; - }, - urlget => 'wget -O[% shell_quote(dest_dir _ "/" _ c("filename")) %] [% shell_quote(c("URL")) %]', --- -2.7.4 - diff --git a/rbm.rpmlintrc b/rbm.rpmlintrc new file mode 100644 index 0000000..66cd4d7 --- /dev/null +++ b/rbm.rpmlintrc @@ -0,0 +1,3 @@ +from Config import * +# Source0 is a snapshot. A local file. +addFilter("W: invalid-url Source0: rbm-[0123456789abcdef]*\\.tar\\.gz"); diff --git a/rbm.spec b/rbm.spec index 52d8b75..ec2a4a3 100644 --- a/rbm.spec +++ b/rbm.spec @@ -1,33 +1,22 @@ -%global commit0 d50b2a62baaacd5ab7e77ed33b3571edd0ee7830 +%global commit0 e04f03f9626e993bb66d7784d258f95ca07bc769 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: rbm Version: 0.4 -Release: 13.20151206git%{shortcommit0}%{?dist} +Release: 14.20190910git%{shortcommit0}%{?dist} Summary: Reproducible Build Manager License: CC0 -URL: http://rbm.boklm.eu/ -# Latest 0.4 release is very old, use git snapshot, -# -Source0: https://github.com/boklm/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz -# Create a home directory for default user in a Docker container, -# in upstream after d50b2a6. -Patch0: rbm-d50b2a6-Create-home-directory-when-adding-default-user-in-do.patch -# Fix error reporting while parsing LSB release string, -# in upstream after d50b2a6. -Patch1: rbm-d50b2a6-Fix-exit_error-call.patch -# Do not create hg directory, , -# in upstream after d50b2a6. -Patch2: rbm-d50b2a6-Don-t-create-a-hg-directory.patch -# Use dnf instead of yum, -# in upstream after d50b2a6. -Patch3: rbm-d50b2a6-Use-dnf-on-recent-Fedora-and-Centos-releases.patch +URL: https://rbm.torproject.org/ +# Latest 0.4 release is very old, use a git snapshot, +# . +# Upstream git repository is . +Source0: %{name}-%{shortcommit0}.tar.gz BuildArch: noarch BuildRequires: asciidoc BuildRequires: coreutils BuildRequires: make -BuildRequires: perl-interpreter BuildRequires: perl-generators +BuildRequires: perl-interpreter # No tests are executed, run-time depdencies are not needed at build time. # bash for /bin/sh defined in default configuration Requires: bash @@ -67,18 +56,14 @@ allow reproducing the build. %prep %setup -qn %{name}-%{commit0} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -make sysconfigdir=%{_sysconfdir} bindir=%{_bindir} mandir=%{_mandir} \ - perldir=%{perl_vendorlib} %{?_smp_mflags} +%{make_build} sysconfigdir=%{_sysconfdir} bindir=%{_bindir} mandir=%{_mandir} \ + perldir=%{perl_vendorlib} %install -%make_install sysconfigdir=%{_sysconfdir} bindir=%{_bindir} mandir=%{_mandir} \ - perldir=%{perl_vendorlib} %{?_smp_mflags} +%{make_install} sysconfigdir=%{_sysconfdir} bindir=%{_bindir} mandir=%{_mandir} \ + perldir=%{perl_vendorlib} %files %license COPYING @@ -89,6 +74,9 @@ make sysconfigdir=%{_sysconfdir} bindir=%{_bindir} mandir=%{_mandir} \ %{_mandir}/man7/* %changelog +* Tue Sep 10 2019 Petr Pisar - 0.4-14.20190910gite04f03f +- Upgraded to a git snapshot from 2019-09-10 + * Fri Jul 26 2019 Fedora Release Engineering - 0.4-13.20151206gitd50b2a6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ca314c6..59f0d5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9bef765152bcb3df79c14c63cd204e5 rbm-d50b2a6.tar.gz +SHA512 (rbm-e04f03f.tar.gz) = 94361dac8ab0a886da88001073ae065c045e72d1c7269d7ec0b09817c861329dd745cd3b0b01e0db505527d032781fa3d0b57f71b0be2f0b910c589b28a437df