From 088fef5e5475de0624fe650a0a10c240c757cf5c Mon Sep 17 00:00:00 2001 From: OBS User jankara Date: Thu, 9 Jul 2020 20:14:38 +0000 Subject: [PATCH 1/3] - Add BuildRequires suse-module-tools so that regenerate_initrd_posttrans is properly defined during build (bsc#1042986) Rev filesystems/127 Md5 c40b13eefe1f6277298a008b9e94e7bd 2020-07-09 20:14:38 jankara 819802 --- e2fsprogs.changes | 6 ++++++ e2fsprogs.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index bd12fe1..8f2ef20 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 9 16:10:59 UTC 2020 - Jan Kara + +- Add BuildRequires suse-module-tools so that regenerate_initrd_posttrans + is properly defined during build (bsc#1042986) + ------------------------------------------------------------------- Sat May 2 09:44:11 UTC 2020 - Andreas Stieger diff --git a/e2fsprogs.spec b/e2fsprogs.spec index ab83161..5d34de2 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package e2fsprogs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,9 @@ BuildRequires: automake BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: pkg-config +%if 0%{?suse_version} >= 1310 +BuildRequires: suse-module-tools +%endif BuildRequires: xz %if ! %{build_mini} %if 0%{?suse_version} > 1220 From 959f9b4b8a150e2bfc29709588538bc084a12baf Mon Sep 17 00:00:00 2001 From: OBS User jankara Date: Wed, 15 Jul 2020 12:20:51 +0000 Subject: [PATCH 2/3] revert the BuildRequires addition Rev filesystems/128 Md5 7ca3ce76ca10fc1678dde00afbdfaabd 2020-07-15 12:20:51 jankara 821087 --- e2fsprogs.changes | 6 ------ e2fsprogs.spec | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 8f2ef20..bd12fe1 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Jul 9 16:10:59 UTC 2020 - Jan Kara - -- Add BuildRequires suse-module-tools so that regenerate_initrd_posttrans - is properly defined during build (bsc#1042986) - ------------------------------------------------------------------- Sat May 2 09:44:11 UTC 2020 - Andreas Stieger diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 5d34de2..ab83161 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package e2fsprogs # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,9 +33,6 @@ BuildRequires: automake BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: pkg-config -%if 0%{?suse_version} >= 1310 -BuildRequires: suse-module-tools -%endif BuildRequires: xz %if ! %{build_mini} %if 0%{?suse_version} > 1220 From 86696608025b2c23a49f45d9d93a6832c01721f6 Mon Sep 17 00:00:00 2001 From: OBS User jankara Date: Fri, 20 Nov 2020 11:13:53 +0000 Subject: [PATCH 3/3] - prepare usrmerge (boo#1029961) Rev filesystems/129 Md5 e2c6644e0bf756a877c4771c96681680 2020-11-20 11:13:53 jankara 849593 --- e2fsprogs.changes | 5 +++++ e2fsprogs.spec | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/e2fsprogs.changes b/e2fsprogs.changes index bd12fe1..c23b465 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 29 10:31:32 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Sat May 2 09:44:11 UTC 2020 - Andreas Stieger diff --git a/e2fsprogs.spec b/e2fsprogs.spec index ab83161..034d66e 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -287,7 +287,7 @@ make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir} rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper -#UsrMerge +%if !0%{?usrmerged} mkdir %{buildroot}/sbin ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks ln -s %{_sbindir}/debugfs %{buildroot}/sbin/debugfs @@ -314,7 +314,7 @@ popd for libName in $LIBNAMES; do ln -s %{_libdir}/$libName %{buildroot}/%{_lib}; done -#EndUsrMerge +%endif %if %{with systemd} %if %{build_mini} @@ -403,7 +403,7 @@ done %license NOTICE %endif %config /etc/mke2fs.conf -#UsrMerge +%if !0%{?usrmerged} /sbin/badblocks /sbin/debugfs /sbin/dumpe2fs @@ -422,7 +422,7 @@ done /sbin/tune2fs /sbin/e2image /sbin/logsave -#EndUsrMerge +%endif %{_sbindir}/badblocks %{_sbindir}/debugfs %{_sbindir}/dumpe2fs @@ -487,10 +487,10 @@ done %files -n libext2fs2 %endif %defattr(-, root, root) -#UsrMerge +%if !0%{?usrmerged} /%{_lib}/libext2fs.so.* /%{_lib}/libe2p.so.* -#EndUsrMerge +%endif %{_libdir}/libext2fs.so.* %{_libdir}/libe2p.so.* @@ -513,10 +513,10 @@ done %files -n libcom_err2 %endif %defattr(-, root, root) -#UsrMerge +%if !0%{?usrmerged} /%{_lib}/libcom_err.so.* /%{_lib}/libss.so.* -#EndUsrMerge +%endif %{_libdir}/libcom_err.so.* %{_libdir}/libss.so.*