X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=e9ed27e359900d9e607e2ab253a1b27c33d333fc;hb=ace657a488514627fe3621188f6b9b1a247c2cdc;hp=27cd0badb821d434fa864e2c0151607d651c1263;hpb=6c5e6a74edf65b0207900899150512821721c4d3;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index 27cd0ba..e9ed27e 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -5,40 +5,38 @@
 # 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_without	tests	# tests
+%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}
 %define		db_pkg		db
 %define		ver_db		5.3
-%define		ver_db_rel	3
 %define		ver_rpm		1:4.14
 %define		ver_db_devel	%(rpm -q --qf '%|E?{%{E}:}|%{V}-%{R}' --what-provides db-devel)
 %else
-%define		db_pkg		db5.2
-%define		ver_db		5.2
-%define		ver_db_rel	3
+%define		ver_db		%(rpm -q --provides rpm-lib | awk 'BEGIN { v="RPM_TOO_OLD" } /^rpm-db-ver = [.0-9]+$/ { v=$3 } END { print v }')
+%define		db_pkg		db%{ver_db}
 %define		ver_rpm		5.4.10
 %endif
 
-%define		rel	1
+%define		rel	4
 Summary:	RPM packages management helper tool
 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.0
+Version:	0.42.2
 Release:	%{rel}%{?with_snap:.%{SNAP}}
 License:	GPL v2
 Group:		Applications/System
 #Source0:	http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
 Source0:	https://github.com/poldek-pm/poldek/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	f224a4f62cdedf0d8bcfe0ce6dd533b2
+# Source0-md5:	2759fe45bc50efb6084d5338d725411a
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
 Source3:	%{name}-config.sh
@@ -55,20 +53,37 @@ Source101:	%{name}-multilib-snap.conf
 Source102:	%{name}-debuginfo-snap.conf
 Patch0:		%{name}-config.patch
 Patch1:		pm-hooks.patch
-Patch2:		poldek-ext-down-enable.patch
+Patch2:		%{name}-ext-down-enable.patch
+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
+Patch14:	rpm4-script-req-workaround.patch
 URL:		http://poldek.pld-linux.org/
-BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
-BuildRequires:	autoconf
+BuildRequires:	%{db_pkg}-devel >= %{ver_db}
+BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel
 BuildRequires:	check-devel
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gettext-tools
+BuildRequires:	docbook2X
+BuildRequires:	gettext-tools >= 0.11.5
 BuildRequires:	libgomp-devel
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 2
+BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
+BuildRequires:	perl-XML-Simple
+BuildRequires:	perl-base
+BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 %{?with_python:BuildRequires:	python-devel}
@@ -76,12 +91,13 @@ BuildRequires:	readline-devel >= 5.0
 BuildRequires:	rpm-devel >= %{ver_rpm}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	texinfo
 BuildRequires:	xmlto
 BuildRequires:	xz
 BuildRequires:	zlib-devel
 BuildRequires:	zstd-devel
 %if %{with static}
-BuildRequires:	%{db_pkg}-static >= %{ver_db}-%{ver_db_rel}
+BuildRequires:	%{db_pkg}-static >= %{ver_db}
 BuildRequires:	bzip2-static
 BuildRequires:	glibc-static
 BuildRequires:	libxml2-static
@@ -94,12 +110,12 @@ 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
-Requires:	%{db_pkg} >= %{ver_db}-%{ver_db_rel}
+Requires:	%{db_pkg} >= %{ver_db}
 Requires:	rpm-db-ver = %{ver_db}
 %endif
 Requires:	%{name}-libs = %{version}-%{release}
@@ -110,7 +126,8 @@ Requires:	sed
 Conflicts:	etckeeper < 1.18-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_libexecdir	%{_prefix}/lib/%{name}
+# it could be %{_libexecdir}/%{name}, but beware of compatibility (path hardcoded in configurations)
+%define		pkglibexecdir	%{_prefix}/lib/%{name}
 
 %description
 poldek is an RPM package management tool which allows you to easily
@@ -225,7 +242,22 @@ Moduły języka Python dla poldka.
 %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
+cd trurlib
+%patch13 -p1
+cd ..
+%patch14 -p1
 
+%{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
 # cleanup backups after patching
@@ -253,15 +285,15 @@ cd ../trurlib
 %{__automake}
 cd ..
 
-CPPFLAGS="%{rpmcppflags} -std=gnu99 -fgnu89-inline -D_GNU_SOURCE=1"
 %configure \
 	%{?with_static:--enable-static --disable-shared} \
 	%{!?with_imode:--disable-imode} \
-	--with-pkglibdir=%{_libexecdir} \
+	--with-pkglibdir=%{pkglibexecdir} \
 	--enable-nls \
 	%{?with_python:--with-python}
 %{__make}
-#	--enable-trace
+
+%{__make} -C doc poldek.info
 
 %if %{with python}
 %{__make} -C python
@@ -288,7 +320,7 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poldek-config
 
 %{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
-%ifarch i486 i686 ppc sparc alpha athlon
+%ifarch i486 i686 ppc sparc alpha athlon aarch64
 	%define		ftp_arch	%{_target_cpu}
 %endif
 %ifarch %{x8664}
@@ -441,7 +473,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
@@ -464,8 +497,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
@@ -474,14 +506,13 @@ 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 = %{_libexecdir}/pm-command.sh,#&,' %{_sysconfdir}/%{name}/%{name}.conf
+	%{__sed} -i -re 's,^pm command = %{pkglibexecdir}/pm-command.sh,#&,' %{_sysconfdir}/%{name}/%{name}.conf
 else
 	# setup pm command
-	%{__sed} -i -re 's,#?(pm command =).*,\1 %{_libexecdir}/pm-command.sh,' %{_sysconfdir}/%{name}/%{name}.conf
+	%{__sed} -i -re 's,#?(pm command =).*,\1 %{pkglibexecdir}/pm-command.sh,' %{_sysconfdir}/%{name}/%{name}.conf
 fi
 
 %files -f %{name}.lang
@@ -499,13 +530,13 @@ fi
 %attr(755,root,root) %{_bindir}/poldek
 %attr(755,root,root) %{_bindir}/poldek-config
 %attr(755,root,root) %{_bindir}/rpmvercmp
-%dir %{_libexecdir}
-%attr(755,root,root) %{_libexecdir}/pm-command.sh
-%attr(755,root,root) %{_libexecdir}/poldekuser-setup.sh
-%attr(755,root,root) %{_libexecdir}/vfcompr
-%attr(755,root,root) %{_libexecdir}/vfjuggle
-%attr(755,root,root) %{_libexecdir}/vfsmb
-%attr(755,root,root) %{_libexecdir}/zlib-in-rpm.sh
+%dir %{pkglibexecdir}
+%attr(755,root,root) %{pkglibexecdir}/pm-command.sh
+%attr(755,root,root) %{pkglibexecdir}/poldekuser-setup.sh
+%attr(755,root,root) %{pkglibexecdir}/vfcompr
+%attr(755,root,root) %{pkglibexecdir}/vfjuggle
+%attr(755,root,root) %{pkglibexecdir}/vfsmb
+%attr(755,root,root) %{pkglibexecdir}/zlib-in-rpm.sh
 %{_mandir}/man1/%{name}*.1*
 %lang(pl) %{_mandir}/pl/man1/%{name}*
 %{_infodir}/poldek.info*