X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpoldek.git;a=blobdiff_plain;f=poldek.spec;h=c9b65dfa4f5fd818e67a296a51df430c12fbcf03;hp=42cce4e371fada52096be57dc4d96149000563d7;hb=d7b8232ab2385fe0a6f40c3875b425251a830535;hpb=b4614f84028dfc1746b337e631630f1e3f1152bb

diff --git a/poldek.spec b/poldek.spec
index 42cce4e..c9b65df 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -1,46 +1,53 @@
-#
+# TODO
+# - fix config having escaped html entities:
+#   # package A requires capability foo >= 1.0 while package B provides "foo"
+
 # 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
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%define		db_pkg		db4.5
-%define		ver_db		4.5.20
-%define		ver_db_rel	3
-%define		ver_rpm		4.5-71
+# NOTE: poldek links with "system db" (-ldb) anyway if it exists
+%define		db_pkg		db4.7
+%define		ver_db		4.7.25
+%define		ver_db_rel	1
+%define		ver_rpm		4.5-49
 
-%define		rel	1
+%define		rel	2
 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.30.0
+Version:	0.32.2
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/System
-#Source0:	http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
-Source0:	http://carme.pld-linux.org/~megabajt/releases/poldek/%{name}-%{version}.tar.xz
-# Source0-md5:	392cfa125912fbedb6cc6d54dfbb80e3
+Source0:	https://launchpad.net/poldek/0.32/%{version}/+download/%{name}-%{version}.tar.xz
+# Source0-md5:	60b964723880569531f88f084cd3ae65
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
+Source3:	%{name}-config.sh
 Source5:	%{name}-aliases.conf
 Source6:	%{name}.desktop
 Source7:	%{name}.png
 Patch0:		%{name}-size-type.patch
-Patch1:		%{name}-Os-fail-workaround.patch
-Patch2:		%{name}-config.patch
+Patch1:		%{name}-config.patch
+Patch2:		pm-hooks.patch
+Patch3:		WTERMSIG.patch
+Patch4:		%{name}-no_local_stdint.patch
+Patch5:		%{name}-libdb.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel
 BuildRequires:	check-devel
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	libgomp-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
-BuildRequires:	neon-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
 BuildRequires:	pkgconfig
@@ -49,7 +56,6 @@ BuildRequires:	popt-devel
 BuildRequires:	readline-devel >= 5.0
 BuildRequires:	rpm-devel >= %{ver_rpm}
 %{?with_python:BuildRequires:	rpm-pythonprov}
-BuildRequires:	swig-python
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xmlto
 BuildRequires:	xz
@@ -58,7 +64,6 @@ BuildRequires:	zlib-devel
 BuildRequires:	%{db_pkg}-static >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	bzip2-static
 BuildRequires:	glibc-static
-BuildRequires:	libselinux-static
 BuildRequires:	libxml2-static
 BuildRequires:	ncurses-static
 BuildRequires:	openssl-static
@@ -72,12 +77,12 @@ Requires(triggerpostun):	awk
 Requires(triggerpostun):	sed >= 4.0
 Requires:	%{db_pkg} >= %{ver_db}-%{ver_db_rel}
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	/bin/run-parts
 Requires:	rpm >= %{ver_rpm}
 Requires:	rpm-db-ver = %{ver_db}
-#Requires:	rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
 Requires:	rpm-lib >= %{ver_rpm}
-# vf* scripts use sed
 Requires:	sed
+Conflicts:	etckeeper < 1.18-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_prefix}/lib/%{name}
@@ -195,6 +200,9 @@ Moduły języka Python dla poldka.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
@@ -203,6 +211,7 @@ find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 chmod u+x ./configure ./doc/conf-xml2.sh
 
 %build
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoheader}
@@ -222,7 +231,7 @@ cd ../trurlib
 %{__automake}
 cd ..
 
-CPPFLAGS="%{rpmcppflags} -std=gnu99"
+CPPFLAGS="%{rpmcppflags} -std=gnu99 -fgnu89-inline"
 %configure \
 	%{?with_static:--enable-static --disable-shared} \
 	%{!?with_imode:--disable-imode} \
@@ -234,11 +243,13 @@ CPPFLAGS="%{rpmcppflags} -std=gnu99"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
+install -d $RPM_BUILD_ROOT/var/cache/%{name}
 
 %{__make} install -j1 \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poldek-config
+
 %if %{with python}
 %{__make} -C python -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -248,14 +259,14 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
 %{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
 %ifarch i686
-	%define		_ftp_arch	%{_target_cpu}
+	%define		ftp_arch	%{_target_cpu}
 %endif
 %ifarch %{x8664}
-	%define		_ftp_arch	x86_64
-	%define		_ftp_alt_arch	i686
+	%define		ftp_arch	x86_64
+	%define		ftp_alt_arch	i686
 %endif
 %ifarch pentium2 pentium3 pentium4
-	%define		_ftp_arch	i686
+	%define		ftp_arch	i686
 %endif
 
 %define	tld_conf %{SOURCE1}
@@ -264,10 +275,10 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
 	%define	tld_multilib_conf %{SOURCE2}
 %endif
 
-%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{tld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld.conf
+%{__sed} -e 's|%%ARCH%%|%{ftp_arch}|g' < %{tld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld.conf
 
 %if 0%{?tld_multilib_conf:1}
-	%{__sed} 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{tld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld-multilib.conf
+	%{__sed} 's|%%ARCH%%|%{ftp_alt_arch}|g' < %{tld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld-multilib.conf
 %endif
 
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
@@ -280,7 +291,7 @@ cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
 # sources we don't package
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{{rh,fedora,centos}-source,repos.d/pld}.conf
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora,centos}-source.conf
 # include them in %doc
 %{__rm} -rf configs
 cp -a conf configs
@@ -291,6 +302,7 @@ cp -a conf configs
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_poldekmod.la
 %endif
 
+
 %find_lang %{name}
 
 %clean
@@ -321,50 +333,6 @@ fi
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%triggerpostun -- poldek < 0.19.0-1.20050613.22.0
-if [ -f /etc/poldek.conf.rpmsave ]; then
-	awk '/^source/ {
-	name = $3;
-	path = $4;
-	auto = "yes";
-	autoup = "yes";
-	type = "pdir";
-	pri = "";
-
-	if (sub(",noauto", "", name)) {
-		auto = "no";
-	}
-
-	# process pri=\d+
-	if (match(name, /,pri=[0-9]+/)) {
-		pri = substr(name, RSTART + 5, RLENGTH - 5);
-		name = substr(name, 1, RSTART - 1) substr(name, RSTART + RLENGTH);
-	}
-
-	# skip ac sources. already in new config.
-	if (name !~ /^ac(-(ready|test|supported|updates-(general|security)))?$/) {
-		print "";
-		print "[source]";
-		print "name = " name;
-		print "type = " type;
-		print "path = " path;
-		print "auto = " auto;
-		print "autoup = " autoup;
-		if (pri) {
-			print "pri = " pri;
-		}
-	}
-
-	}' < /etc/poldek.conf.rpmsave >> /etc/poldek/source.conf
-	echo "Converted old custom sources from /etc/poldek.conf.rpmsave to new poldek format in /etc/poldek/source.conf"
-
-	# copy hold=
-	hold=$(grep ^hold /etc/poldek.conf.rpmsave)
-	if [ "$hold" ]; then
-		%{__sed} -i -e "/^#hold =/s/^.*/$hold/" /etc/poldek/poldek.conf
-	fi
-fi
-
 %triggerpostun -- poldek < 0.30-0.20080225.00.1
 if ! grep -q '^%%includedir repos.d' %{_sysconfdir}/%{name}/poldek.conf; then
 	%{__sed} -i -e '/^%%include source.conf/{
@@ -378,29 +346,54 @@ fi
 %{__sed} -i -e '/%%include %%{_distro}-multilib-source.conf/d' %{_sysconfdir}/%{name}/poldek.conf
 
 if [ -f %{_sysconfdir}/%{name}/tld-source.conf.rpmsave ]; then
-	cp -f %{_sysconfdir}/%{name}/repos.d/tld.conf{,.rpmnew}
-	cp -f %{_sysconfdir}/%{name}/tld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld.conf
+	%{__mv} -f %{_sysconfdir}/%{name}/repos.d/tld.conf{,.rpmnew}
+	%{__mv} -v %{_sysconfdir}/%{name}/tld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld.conf
 fi
 
 %ifarch %{x8664}
 if [ -f %{_sysconfdir}/%{name}/tld-multilib-source.conf.rpmsave ]; then
-	cp -f %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf{,.rpmnew}
-	cp -f %{_sysconfdir}/%{name}/tld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf
+	%{__mv} -f %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf{,.rpmnew}
+	%{__mv} -v %{_sysconfdir}/%{name}/tld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf
 fi
 %endif
 
+%triggerpostun -- %{name} < 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
+else
+	# setup pm command
+	%{__sed} -i -re 's,#?(pm command =).*,\1 %{_libexecdir}/pm-command.sh,' %{_sysconfdir}/%{name}/%{name}.conf
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog README* NEWS TODO configs
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/pre-install.d
+%{_sysconfdir}/%{name}/pre-install.d/README
+%dir %{_sysconfdir}/%{name}/post-install.d
+%{_sysconfdir}/%{name}/post-install.d/README
 %dir %{_sysconfdir}/%{name}/repos.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/repos.d/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/cli.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/fetch.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/poldek.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/source.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/repos.d/tld.conf
+%if 0%{?tld_multilib_conf:1}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf
+%endif
 %attr(755,root,root) %{_bindir}/ipoldek
 %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}/*
+%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
 %{_mandir}/man1/%{name}*.1*
 %lang(pl) %{_mandir}/pl/man1/%{name}*
 %{_infodir}/poldek.info*