X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=cf1ce436200c9caa70ddd59f1d6a7a9c83e31c84;hb=051a64ca2899da381f9551a4f1e0da4a37e5484b;hp=2f23bb306b2c722b8312bc85d000e35fa014014b;hpb=bd8cd9546d55e27542d688f1b934edf371033fa2;p=packages%2Fpoldek.git diff --git a/poldek.spec b/poldek.spec index 2f23bb3..cf1ce43 100644 --- a/poldek.spec +++ b/poldek.spec @@ -5,13 +5,13 @@ # Conditional build: %bcond_with static # don't use shared libraries %bcond_without imode # don't build interactive mode -%bcond_without python # don't build python bindings +%bcond_with python # don't build python bindings %bcond_with snap # install configs for official Th snapshot %bcond_with rpm4 # use rpm4 instead of rpm5 %bcond_with tests # tests # current snapshot name -%define SNAP 2019 +%define SNAP 2020 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek) %if %{with rpm4} @@ -58,6 +58,13 @@ Patch3: %{name}-pc.patch Patch4: %{name}-info.patch Patch5: %{name}-multiarch-x32.patch Patch6: rpm-4.15.patch +Patch7: db-index-format.patch +Patch8: rpm4-uname-deps.patch +Patch9: sqlite-rpmdb.patch +Patch10: rpm4-cpuinfo-deps.patch +Patch11: rpm4-no-dir-deps.patch +Patch12: rpm4-rpmvercmp.patch +Patch13: trurlib-shared.patch URL: http://poldek.pld-linux.org/ BuildRequires: %{db_pkg}-devel >= %{ver_db} BuildRequires: autoconf >= 2.63 @@ -102,8 +109,8 @@ BuildRequires: rpm-static BuildRequires: zlib-static BuildRequires: zstd-static %endif -Requires(triggerpostun): awk -Requires(triggerpostun): sed >= 4.0 +Requires(postun): awk +Requires(postun): sed >= 4.0 %if %{with rpm4} Requires: %{db_pkg} >= %{ver_db_devel} %else @@ -238,6 +245,15 @@ Moduły języka Python dla poldka. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +cd trurlib +%patch13 -p1 +cd .. %{__rm} doc/poldek.info %{__rm} m4/libtool.m4 m4/lt*.m4 @@ -455,7 +471,8 @@ fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%triggerpostun -- poldek < 0.30-0.20080225.00.1 +%triggerpostun -- poldek < 0.30.1-8 +# poldek < 0.30-0.20080225.00.1 if ! grep -q '^%%includedir repos.d' %{_sysconfdir}/%{name}/poldek.conf; then %{__sed} -i -e '/^%%include source.conf/{ a @@ -478,8 +495,7 @@ if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then %{__mv} -v %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf fi %endif - -%triggerpostun -- poldek < 0.30.1-3 +# poldek < 0.30.1-3 if [ -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave ]; then %{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld-%{ftp_alt_arch}.conf{,.rpmnew} %{__mv} -v %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{ftp_alt_arch}.conf @@ -488,8 +504,7 @@ if [ -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave ]; then %{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{ftp_alt_arch}.conf{,.rpmnew} %{__mv} -v %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{ftp_alt_arch}.conf fi - -%triggerpostun -- %{name} < 0.30.1-8 +# poldek < 0.30.1-8 if [ $1 -le 1 ]; then # revert change on --downgrade %{__sed} -i -re 's,^pm command = %{pkglibexecdir}/pm-command.sh,#&,' %{_sysconfdir}/%{name}/%{name}.conf