From 9f2ae4b392fdac5c699cb744765e3114ecde4d0b Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 19 Mar 2021 19:49:32 +0100 Subject: [PATCH] - merged PLD changes --- poldek.spec | 4 +++- skip-buildid-obsoletes.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 skip-buildid-obsoletes.patch diff --git a/poldek.spec b/poldek.spec index d147239..b6454f4 100644 --- a/poldek.spec +++ b/poldek.spec @@ -19,7 +19,7 @@ Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM Name: poldek Version: 0.42.2 -Release: 5 +Release: 6 License: GPL v2 Group: Applications/System #Source0: http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2 @@ -48,6 +48,7 @@ Patch11: rpm4-no-dir-deps.patch Patch12: rpm4-rpmvercmp.patch Patch13: trurlib-shared.patch Patch14: rpm4-script-req-workaround.patch +Patch15: skip-buildid-obsoletes.patch URL: http://poldek.pld-linux.org/ BuildRequires: %{db_pkg}-devel >= %{ver_db} BuildRequires: autoconf >= 2.63 @@ -233,6 +234,7 @@ cd trurlib %patch13 -p1 cd .. %patch14 -p1 +%patch15 -p1 %{__rm} doc/poldek.info %{__rm} m4/libtool.m4 m4/lt*.m4 diff --git a/skip-buildid-obsoletes.patch b/skip-buildid-obsoletes.patch new file mode 100644 index 0000000..1b2e7c1 --- /dev/null +++ b/skip-buildid-obsoletes.patch @@ -0,0 +1,11 @@ +--- poldek-0.42.2/install3/obsoletes.c.orig 2020-01-25 22:59:59.000000000 +0100 ++++ poldek-0.42.2/install3/obsoletes.c 2021-03-16 13:14:05.667576984 +0100 +@@ -188,6 +188,8 @@ + "/usr/share/doc/*", + "/usr/share/man/*.[0-9]", + "/usr/src/examples/*", ++ "/usr/lib/.build-id", ++ "/usr/lib/.build-id/*", + "*.desktop", + "*.mo", + "*.gz", -- 2.46.0