diff --git a/strip-nondeterminism.changes b/strip-nondeterminism.changes index 3f1b039..965d6c7 100644 --- a/strip-nondeterminism.changes +++ b/strip-nondeterminism.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 11 11:43:06 UTC 2021 - Dominique Leuenberger + +- Move macros.strip-nondeterminism from /etc/rpm to + %{_rpmmacrodir} (boo#1185657). +- Install the macro file non-executable: it is loaded by rpm, never + run. + ------------------------------------------------------------------- Tue Oct 29 11:54:17 UTC 2019 - Dominique Leuenberger diff --git a/strip-nondeterminism.spec b/strip-nondeterminism.spec index f116b3b..bf5654f 100644 --- a/strip-nondeterminism.spec +++ b/strip-nondeterminism.spec @@ -1,7 +1,7 @@ # # spec file for package strip-nondeterminism # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Release: 0 Summary: A tool for stripping non-deterministic information License: GPL-3.0-or-later Group: Development/Libraries/Perl -Url: https://anonscm.debian.org/git/reproducible/strip-nondeterminism.git +URL: https://anonscm.debian.org/git/reproducible/strip-nondeterminism.git Source: https://reproducible-builds.org/_lfs/releases/strip-nondeterminism/strip-nondeterminism-%{version}.tar.bz2 Source1: https://reproducible-builds.org/_lfs/releases/strip-nondeterminism/strip-nondeterminism-%{version}.tar.bz2.asc Source2: rpmmacros @@ -34,10 +34,10 @@ BuildRequires: perl-base BuildRequires: perl-macros BuildRequires: perl(Archive::Cpio) BuildRequires: perl(Archive::Zip) -BuildRequires: perl(Sub::Override) +BuildRequires: perl(Sub::Override) Requires: perl-base Requires: perl(Archive::Zip) -Requires: perl(Sub::Override) +Requires: perl(Sub::Override) Recommends: perl(Archive::Cpio) %{perl_requires} @@ -49,7 +49,7 @@ It can be used as a post-processing step to make a build reproducible, when the build process itself cannot be made deterministic. It is used as part of the Reproducible Builds project. -strip-nondeterminism contains the File::StripNondeterminism Perl module, +strip-nondeterminism contains the File::StripNondeterminism Perl module, and the strip-nondeterminism command line utility. %prep @@ -63,8 +63,8 @@ and the strip-nondeterminism command line utility. %{__make} test %install -mkdir -p %buildroot/etc/rpm/ %buildroot/%{_bindir}/ -install -p %{SOURCE2} %buildroot/etc/rpm/macros.strip-nondeterminism +mkdir -p %buildroot%{_rpmmacrodir} %buildroot/%{_bindir}/ +install -p %{SOURCE2} -m 644 %buildroot%{_rpmmacrodir}/macros.strip-nondeterminism install -p %{SOURCE3} -m 755 %buildroot/%{_bindir}/ %perl_make_install %perl_process_packlist @@ -74,6 +74,6 @@ install -p %{SOURCE3} -m 755 %buildroot/%{_bindir}/ %defattr(-,root,root,755) %doc README TODO %license COPYING -/etc/rpm/macros.strip-nondeterminism +%{_rpmmacrodir}/macros.strip-nondeterminism %changelog