Update obsolete /var/run/ path

Add missing closing quote in macro
Patch from John Soros.
2019-03-06 09:54:23 +01:00 · 2019-03-06 09:48:12 +01:00 · 2019-03-06 09:47:33 +01:00
2 changed files with 26 additions and 7 deletions
--- a/0028-rpm-Make-the-client-signer-use-the-fedora-values-unl.patch
+++ b/0028-rpm-Make-the-client-signer-use-the-fedora-values-unl.patch
@ -17,8 +17,8 @@ index 69280e9..22a3ee6 100644
 %__pesign_token %{nil}%{?pe_signing_token:-t "%{pe_signing_token}"}
 %__pesign_cert %{!?pe_signing_cert:"Red Hat Test Certificate"}%{?pe_signing_cert:"%{pe_signing_cert}"}
 
-+%__pesign_client_token %{!?pe_signing_token:"Fedora Signer (OpenSC Card)"}%{?pe_signing_token:"%{pe_signing_token}}
-+%__pesign_client_cert %{!?pe_signing_cert:"/CN=Fedora Secure Boot Signer"}%{?pe_signing_cert:"%{pe_signing_cert}}
+%__pesign_client_token %{!?pe_signing_token:"Fedora Signer (OpenSC Card)"}%{?pe_signing_token:"%{pe_signing_token}"}
+%__pesign_client_cert %{!?pe_signing_cert:"/CN=Fedora Secure Boot Signer"}%{?pe_signing_cert:"%{pe_signing_cert}"}
 +
 %_pesign /usr/bin/pesign
 %_pesign_client /usr/bin/pesign-client
--- a/pesign.spec
+++ b/pesign.spec
@ -3,23 +3,34 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 0.112
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2
 URL:     https://github.com/vathpela/pesign

 Obsoletes: pesign-rh-test-certs <= 0.111-7
-BuildRequires: git nspr nss nss-util popt-devel
+BuildRequires: gcc
+BuildRequires: git
+BuildRequires: nspr
+BuildRequires: nss
+BuildRequires: nss-util
+BuildRequires: popt-devel
 BuildRequires: nss-tools
 BuildRequires: nspr-devel >= 4.9.2-1
 BuildRequires: nss-devel >= 3.13.6-1
 BuildRequires: efivar-devel >= 31-1
 BuildRequires: libuuid-devel
-BuildRequires: tar xz
-BuildRequires: python3-rpm-macros python3
+BuildRequires: tar
+BuildRequires: xz
+BuildRequires: python3-rpm-macros
+BuildRequires: python3
 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 17
 BuildRequires: systemd
 %endif
-Requires: nspr nss nss-util popt rpm
+Requires:      nspr
+Requires:      nss
+Requires:      nss-util
+Requires:      popt
+Requires:      rpm
 Requires(pre): shadow-utils
 ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
 %if 0%{?rhel} == 7
@ -76,6 +87,9 @@ git am %{patches} </dev/null
 git config --unset user.email
 git config --unset user.name

+# https://bugzilla.redhat.com/show_bug.cgi?id=1678146
+sed -i 's|/var/run/pesign|/run/pesign|' src/tmpfiles.conf
+
 %build
 make PREFIX=%{_prefix} LIBDIR=%{_libdir}

@ -163,6 +177,11 @@ exit 0
 %{python3_sitelib}/mockbuild/plugins/pesign.*

 %changelog
+* Wed Mar  6 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.112-25
+- Fix build (#1605427)
+- Add missing closing quote in macro (#1651020)
+- Update obsolete /var/run/ path (#1678146)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.112-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	550f7f9ec2	Update obsolete /var/run/ path	2019-03-06 09:54:23 +01:00
Zbigniew Jędrzejewski-Szmek	487af474b5	Add missing closing quote in macro Patch from John Soros.	2019-03-06 09:48:12 +01:00
Zbigniew Jędrzejewski-Szmek	286da5020e	Add missing BR:gcc, make BRs one-per-line This fixes build in mock.	2019-03-06 09:47:33 +01:00