Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pesign for openSUSE:Factory checked in at 2021-05-10 15:36:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pesign (Old) and /work/SRC/openSUSE:Factory/.pesign.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pesign" Mon May 10 15:36:30 2021 rev:37 rq:891213 version:113 Changes: -------- --- /work/SRC/openSUSE:Factory/pesign/pesign.changes 2020-05-08 23:00:53.681315954 +0200 +++ /work/SRC/openSUSE:Factory/.pesign.new.2988/pesign.changes 2021-05-10 15:38:50.841694299 +0200 @@ -1,0 +2,14 @@ +Fri May 7 01:38:34 UTC 2021 - Gary Ching-Pang Lin <[email protected]> + +- Stop marking macros.pesign as %config + +------------------------------------------------------------------- +Thu May 6 09:22:38 UTC 2021 - Gary Ching-Pang Lin <[email protected]> + +- Add pesign-boo1185663-set-rpmmacrodir.patch to set the rpm macro + directory at build time (boo#1185663) + + Also set rpmmacrodir when installing files +- Remove "make install" since "make install_systemd" invokes + "make install" automatically + +------------------------------------------------------------------- New: ---- pesign-boo1185663-set-rpmmacrodir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pesign.spec ++++++ --- /var/tmp/diff_new_pack.t5485J/_old 2021-05-10 15:38:51.321692399 +0200 +++ /var/tmp/diff_new_pack.t5485J/_new 2021-05-10 15:38:51.325692384 +0200 @@ -1,7 +1,7 @@ # # spec file for package pesign # -# Copyright (c) 2020 SUSE LLC +# 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 @@ -38,6 +38,8 @@ Patch6: pesign-boo1143063-remove-var-tracking.patch # PATCH-FIX-UPSTREAM pesign-boo1158197-fix-pesigncheck-gcc10.patch [email protected] -- boo#1158197 Fix the gcc10 errors Patch7: pesign-boo1158197-fix-pesigncheck-gcc10.patch +# PATCH-FIX-UPSTREAM pesign-boo1185663-set-rpmmacrodir.patch boo#1185663 [email protected] -- Set the rpm macro directory at build time +Patch8: pesign-boo1185663-set-rpmmacrodir.patch BuildRequires: efivar-devel BuildRequires: libuuid-devel BuildRequires: mozilla-nss-devel @@ -61,16 +63,19 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" %install -make INSTALLROOT=%{buildroot} libexecdir=%{_libexecdir} install mkdir -p %{buildroot}%{_localstatedir}/lib/pesign - mkdir -p %{buildroot}%{_sbindir} -make INSTALLROOT=%{buildroot} UNITDIR=%{_unitdir} libexecdir=%{_libexecdir} install_systemd +make INSTALLROOT=%{buildroot} \ + UNITDIR=%{_unitdir} \ + libexecdir=%{_libexecdir} \ + rpmmacrodir=%{_rpmmacrodir} \ + install_systemd # create rcsymlink ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} @@ -109,7 +114,7 @@ %dir %{_sysconfdir}/popt.d %config %{_sysconfdir}/popt.d/pesign.popt %{_sysconfdir}/pki/ -%config %{_sysconfdir}/rpm/macros.pesign +%{_rpmmacrodir}/macros.pesign %{_mandir}/man?/* %{_localstatedir}/lib/pesign %{_unitdir}/pesign.service ++++++ pesign-boo1185663-set-rpmmacrodir.patch ++++++ diff --git a/Make.defaults b/Make.defaults index 2d18005..7ecba00 100644 --- a/Make.defaults +++ b/Make.defaults @@ -11,6 +11,7 @@ includedir ?= $(prefix)include/ bindir ?= $(prefix)bin/ pcdir ?= $(libdir)pkgconfig/ docdir ?= $(prefix)share/doc/ +rpmmacrodir ?= /etc/rpm/ DESTDIR ?= INSTALLROOT = $(DESTDIR) diff --git a/src/Makefile b/src/Makefile index 5fb2841..ca546a3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -90,8 +90,8 @@ install : $(INSTALL) -m 644 pesigcheck.1 $(INSTALLROOT)$(mandir)man1/ $(INSTALL) -m 644 authvar.1 $(INSTALLROOT)$(mandir)man1/ $(INSTALL) -m 644 efisiglist.1 $(INSTALLROOT)$(mandir)man1/ - $(INSTALL) -d -m 755 $(INSTALLROOT)/etc/rpm/ - $(INSTALL) -m 644 macros.pesign $(INSTALLROOT)/etc/rpm/ + $(INSTALL) -d -m 755 $(INSTALLROOT)$(rpmmacrodir) + $(INSTALL) -m 644 macros.pesign $(INSTALLROOT)$(rpmmacrodir) $(INSTALL) -d -m 755 $(INSTALLROOT)$(libexecdir)/pesign/ $(INSTALL) -m 750 pesign-authorize $(INSTALLROOT)$(libexecdir)/pesign/ $(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pesign
