X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=d51f3196d4d760d798cc27f42c1f5e1711894df0;hb=6e185c3778f17e13b3af22c2ecd8290c1734bf46;hp=3f7961d6e6a4d4160864fe8abdcd83df3fb47066;hpb=4ee7e05390b7190a6ee9ef4d3b18555acf3d2d0a;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index 3f7961d..d51f319 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -4,28 +4,36 @@
 %bcond_without	imode	# don't build interactive mode
 %bcond_without	python	# don't build python bindings
 %bcond_with	snap	# install configs for official Th snapshot
+%bcond_with	db60	# DB 6.0 instead of 5.2
 
 # current snapshot name
 %define		SNAP	2012
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%define		ver_db		5.3
+# NOTE: poldek links with "system db" (-ldb) anyway if it exists
+%if %{with db60}
+%define		db_pkg		db6.0
+%define		ver_db		6.0
 %define		ver_db_rel	1
+%else
+%define		db_pkg		db5.2
+%define		ver_db		5.2
+%define		ver_db_rel	3
+%endif
 %define		ver_rpm		5.4.10
 
-%define		snap	rc5
-%define		rel	14.2%{?with_snap:.%{SNAP}}
+%define		rel	3
 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
-Release:	1.%{snap}.%{rel}
+Version:	0.30.0
+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:	http://carme.pld-linux.org/~cactus/snaps/poldek/%{name}-%{version}%{snap}.tar.xz
-# Source0-md5:	ab89926c28cfb6b7d72497fc37c16ac4
+Source0:	http://carme.pld-linux.org/~megabajt/releases/poldek/%{name}-%{version}.tar.xz
+# Source0-md5:	392cfa125912fbedb6cc6d54dfbb80e3
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
 Source5:	%{name}-aliases.conf
@@ -38,25 +46,15 @@ Source11:	%{name}-archive.conf
 Source100:	%{name}-snap.conf
 Source101:	%{name}-multilib-snap.conf
 Source102:	%{name}-debuginfo-snap.conf
-Patch0:		%{name}-vserver-packages.patch
-Patch1:		%{name}-config.patch
-Patch2:		%{name}-size-type.patch
-Patch3:		%{name}-Os-fail-workaround.patch
-Patch4:		%{name}-git.patch
-Patch5:		%{name}-am.patch
-Patch6:		https://bugs.launchpad.net/poldek/+bug/1031767/+attachment/3252805/+files/%{name}-ls-space-lp1031767.patch
-# Patch6-md5:	9ba0f7abdb2ba1051e1a396f9daec606
-Patch7:		https://bugs.launchpad.net/pld-linux/+bug/1042200/+attachment/3285885/+files/poldek-rpm54.patch
-# Patch7-md5:	128afb37934a3f12077fff12fddaa3ec
-Patch8:		https://bugs.launchpad.net/pld-linux/+bug/1042200/+attachment/3298948/+files/poldek-pkg-recno-type.patch
-# Patch8-md5:	bdc855d84167592a1adef576eba75de6
-Patch9:		%{name}-Werror-format-security.patch
+Patch0:		%{name}-size-type.patch
+Patch1:		%{name}-Os-fail-workaround.patch
+Patch2:		%{name}-config.patch
 URL:		http://poldek.pld-linux.org/
+BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	check-devel
-BuildRequires:	db-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
@@ -71,11 +69,13 @@ 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
 BuildRequires:	zlib-devel
 %if %{with static}
+BuildRequires:	%{db_pkg}-static >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	bzip2-static
-BuildRequires:	db-static >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	glibc-static
 BuildRequires:	libselinux-static
 BuildRequires:	libxml2-static
@@ -89,15 +89,18 @@ BuildRequires:	zlib-static
 %endif
 Requires(triggerpostun):	awk
 Requires(triggerpostun):	sed >= 4.0
+Requires:	%{db_pkg} >= %{ver_db}-%{ver_db_rel}
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	db >= %{ver_db}-%{ver_db_rel}
 Requires:	rpm >= %{ver_rpm}
 Requires:	rpm-db-ver = %{ver_db}
-Requires:	rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
+#Requires:	rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
+Requires:	rpm-lib >= 5.4.10
 # vf* scripts use sed
 Requires:	sed
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_prefix}/lib/%{name}
+
 %description
 poldek is an RPM package management tool which allows you to easily
 perform package verification, installation (including system
@@ -195,7 +198,7 @@ Summary(hu.UTF-8):	Python modulok poldek-hez
 Summary(pl.UTF-8):	Moduły języka Python dla poldka
 Group:		Libraries/Python
 Requires:	%{name}-libs = %{version}-%{release}
-%pyrequires_eq	python-libs
+Requires:	python-libs
 
 %description -n python-poldek
 Python modules for poldek.
@@ -211,13 +214,6 @@ 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
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
@@ -249,6 +245,7 @@ CPPFLAGS="%{rpmcppflags} -std=gnu99"
 %configure \
 	%{?with_static:--enable-static --disable-shared} \
 	%{!?with_imode:--disable-imode} \
+	--with-pkglibdir=%{_libexecdir} \
 	--enable-nls \
 	%{?with_python:--with-python}
 %{__make} -j1
@@ -468,8 +465,8 @@ fi
 %attr(755,root,root) %{_bindir}/ipoldek
 %attr(755,root,root) %{_bindir}/poldek
 %attr(755,root,root) %{_bindir}/rpmvercmp
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*
+%dir %{_libexecdir}
+%attr(755,root,root) %{_libexecdir}/*
 %{_mandir}/man1/%{name}*.1*
 %lang(pl) %{_mandir}/pl/man1/%{name}*
 %{_infodir}/poldek.info*
@@ -513,6 +510,7 @@ fi
 %{_includedir}/trurl
 %{_includedir}/vfile
 %{_pkgconfigdir}/tndb.pc
+%{_pkgconfigdir}/trurlib.pc
 
 %files static
 %defattr(644,root,root,755)