Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fde-tools for openSUSE:Factory
checked in at 2024-03-06 23:03:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fde-tools (Old)
and /work/SRC/openSUSE:Factory/.fde-tools.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fde-tools"
Wed Mar 6 23:03:14 2024 rev:17 rq:1154987 version:0.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/fde-tools/fde-tools.changes 2024-02-21
17:51:51.165393449 +0100
+++ /work/SRC/openSUSE:Factory/.fde-tools.new.1770/fde-tools.changes
2024-03-06 23:03:23.934849170 +0100
@@ -1,0 +2,10 @@
+Tue Mar 5 05:54:49 UTC 2024 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Add fde-tools-change-rpm-macro-dir.patch and set the rpm macro
+ directory correctly
+- Make fde-firstboot, fde-tpm-helper, and fde-tpm-helper-rpm-macros
+ noarch
+- Add fde-tools-bsc1220160-conditional-requires.patch to make
+ fde-tpm-helper a conditional "Requires" (bsc#1220160)
+
+-------------------------------------------------------------------
New:
----
fde-tools-bsc1220160-conditional-requires.patch
fde-tools-change-rpm-macro-dir.patch
BETA DEBUG BEGIN:
New: noarch
- Add fde-tools-bsc1220160-conditional-requires.patch to make
fde-tpm-helper a conditional "Requires" (bsc#1220160)
New:
- Add fde-tools-change-rpm-macro-dir.patch and set the rpm macro
directory correctly
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fde-tools.spec ++++++
--- /var/tmp/diff_new_pack.lsgmuF/_old 2024-03-06 23:03:24.626874259 +0100
+++ /var/tmp/diff_new_pack.lsgmuF/_new 2024-03-06 23:03:24.626874259 +0100
@@ -16,6 +16,10 @@
#
+%if %{undefined _rpmmacrodir}
+ %define _rpmmacrodir %{_sysconfdir}/rpm
+%endif
+
Name: fde-tools
Version: 0.7.2
Release: 0
@@ -27,6 +31,8 @@
Source1: fde-tools.service
Patch0: fde-tools-firstboot-alp-snapshot.patch
Patch1: fde-tools-bsc1213945-set-rsa-key-size.patch
+Patch2: fde-tools-change-rpm-macro-dir.patch
+Patch3: fde-tools-bsc1220160-conditional-requires.patch
BuildRequires: help2man
BuildRequires: pkgconfig(libcryptsetup)
BuildRequires: pkgconfig(libfido2)
@@ -45,6 +51,7 @@
Group: System/Boot
Requires: fde-tools
Requires: jeos-firstboot
+BuildArch: noarch
%description -n fde-firstboot
This package contains the scripts necessary to plug Full Disk Encryption
@@ -64,6 +71,7 @@
%package -n fde-tpm-helper
Summary: TPM helper for fde-tools
Group: System/Boot
+BuildArch: noarch
%description -n fde-tpm-helper
This package contains the TPM helper script for the bootloader packages
@@ -72,6 +80,7 @@
%package -n fde-tpm-helper-rpm-macros
Summary: RPM macros for fde-tools
Group: Development/Tools/Building
+BuildArch: noarch
%description -n fde-tpm-helper-rpm-macros
This package contains the RPM macros for the bootloader packages to
@@ -87,7 +96,8 @@
LIBEXECDIR="%{_libexecdir}" \
SBINDIR="%{_sbindir}" \
DATADIR="%{_datadir}" \
- SYSCONFDIR="%{_sysconfdir}"
+ SYSCONFDIR="%{_sysconfdir}" \
+ RPM_MACRO_DIR="%{_rpmmacrodir}"
%install
%make_install \
@@ -95,7 +105,8 @@
LIBEXECDIR="%{_libexecdir}" \
SBINDIR="%{_sbindir}" \
DATADIR="%{_datadir}" \
- SYSCONFDIR="%{_sysconfdir}"
+ SYSCONFDIR="%{_sysconfdir}" \
+ RPM_MACRO_DIR="%{_rpmmacrodir}"
mkdir -p %{buildroot}%{_fillupdir}
mv %{buildroot}/etc/sysconfig/fde-tools
%{buildroot}%{_fillupdir}/sysconfig.fde-tools
@@ -141,5 +152,5 @@
%{_libexecdir}/fde/fde-tpm-helper
%files -n fde-tpm-helper-rpm-macros
-%config %{_sysconfdir}/rpm/macros.fde-tpm-helper
+%{_rpmmacrodir}/macros.fde-tpm-helper
++++++ fde-tools-bsc1220160-conditional-requires.patch ++++++
>From 7f5a36bb82728a6cce66b15e6bb656ce05cf5978 Mon Sep 17 00:00:00 2001
From: Gary Lin <g...@suse.com>
Date: Tue, 5 Mar 2024 14:51:57 +0800
Subject: [PATCH] macros.fde-tpm-helper: conditionally requires the helper
fde-tpm-helper is only used when fde-tools is installed. Update the rpm
macro to make fde-tpm-helper an conditional "Requires".
Signed-off-by: Gary Lin <g...@suse.com>
---
rpm-build/macros.fde-tpm-helper | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rpm-build/macros.fde-tpm-helper b/rpm-build/macros.fde-tpm-helper
index 1ec3a4e..3c89e2b 100644
--- a/rpm-build/macros.fde-tpm-helper
+++ b/rpm-build/macros.fde-tpm-helper
@@ -1,4 +1,4 @@
-%fde_tpm_update_requires Requires(posttrans): fde-tpm-helper
+%fde_tpm_update_requires Requires(posttrans): (fde-tpm-helper if fde-tools)
%fde_tpm_update_post() \
mkdir -p %{_rundir}/fde-tpm-helper/ \
--
2.35.3
++++++ fde-tools-change-rpm-macro-dir.patch ++++++
>From 7dd8ab8920806384c01e3765ff2027222ac21d29 Mon Sep 17 00:00:00 2001
From: Gary Lin <g...@suse.com>
Date: Thu, 29 Feb 2024 15:05:35 +0800
Subject: [PATCH] Allow RPM_MACRO_DIR to be defined during build time
The system directory of rpm macro files could be either /etc/rpm
or /usr/lib/rpm/macros.d/. This commit allows RPM_MACRO_DIR to be
defined during build time, so that the packager can change the variable
if necessary.
Signed-off-by: Gary Lin <g...@suse.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: fde-tools-0.7.2/Makefile
===================================================================
--- fde-tools-0.7.2.orig/Makefile
+++ fde-tools-0.7.2/Makefile
@@ -12,7 +12,7 @@ FDE_CONFIG_DIR = ${SYSCONFDIR}/fde
FDE_SHARE_DIR = $(DATADIR)/fde
FIRSTBOOTDIR = $(DATADIR)/jeos-firstboot
FDE_HELPER_DIR = $(LIBEXECDIR)/fde
-RPM_MACRO_DIR = /etc/rpm
++RPM_MACRO_DIR ?= /etc/rpm
FIDO_LINK = -lfido2 -lcrypto
CRPYT_LINK = -lcryptsetup -ljson-c
TOOLS = fde-token fdectl-grub-tpm2
