- PLD merge

diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644 (file)
index 0000000..8d509c0
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,13 @@
+--- poldek-0.42.2/pm/rpmorg/install.c.orig     2020-01-25 22:59:59.000000000 +0100
++++ poldek-0.42.2/pm/rpmorg/install.c  2024-11-26 23:59:38.132248185 +0100
+@@ -77,8 +77,8 @@
+ 
+ static void *install_cb(const void *h __attribute__((unused)),
+                         const enum rpmCallbackType_e op,
+-                        const long long unsigned int amount,
+-                        const long long unsigned int total,
++                        const long unsigned int amount,
++                        const long unsigned int total,
+                         const void *pkgpath,
+                         void *data __attribute__((unused)))
+ {

diff --git a/poldek.spec b/poldek.spec
index 5d9f58a60b88c6b3866c918796b679d7ffff5958..a82e7531f2165dd51fefba1295b0effc1f5b07dc 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -16,7 +16,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:       18
+Release:       24
 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
@@ -55,6 +55,8 @@ Patch21:      sorted-ls-upgradable.patch
 Patch22:       egrep-is-obsolete.patch
 Patch23:       minus.patch
 Patch24:       %{name}-https-redirect.patch
+Patch25:       gcc14.patch
+Patch26:       rpm-4.18.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
@@ -221,33 +223,35 @@ Moduły języka Python dla poldka.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
+%patch -P 11 -p1
+%patch -P 12 -p1
 cd trurlib
-%patch13 -p1
+%patch -P 13 -p1
 cd ..
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
+%patch -P 14 -p1
+%patch -P 15 -p1
+%patch -P 16 -p1
+%patch -P 17 -p1
+%patch -P 18 -p1
+%patch -P 19 -p1
+%patch -P 20 -p1
+%patch -P 21 -p1
+%patch -P 22 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 25 -p1
+%patch -P 26 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4

diff --git a/rpm-4.18.patch b/rpm-4.18.patch
new file mode 100644 (file)
index 0000000..d893bb9
--- /dev/null
+++ b/rpm-4.18.patch
@@ -0,0 +1,13 @@
+--- poldek-0.42.2/pm/rpmorg/install.c~ 2025-01-03 23:00:37.000000000 +0100
++++ poldek-0.42.2/pm/rpmorg/install.c  2025-01-03 23:07:13.436664378 +0100
+@@ -77,8 +77,8 @@
+ 
+ static void *install_cb(const void *h __attribute__((unused)),
+                         const enum rpmCallbackType_e op,
+-                        const long unsigned int amount,
+-                        const long unsigned int total,
++                        const rpm_loff_t amount, 
++                        const rpm_loff_t total,
+                         const void *pkgpath,
+                         void *data __attribute__((unused)))
+ {