X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=16f3017044c236274365c17f1378cef58a3bd312;hb=1e0595d6832f4b3d1c11a5f040fcd9cfbcddbd94;hp=a7e2e3a380f71d3d58599b5763617edc8b3013cb;hpb=9fb594dc1be1384329cc2c7015212eef64acc5d0;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index a7e2e3a..16f3017 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -1,38 +1,34 @@
-# TODO:
-# - fails to build without poldek-devel - fix it !
 #
 # 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	snap	# install configs for official Th snapshot
+
+# current snapshot name
+%define		SNAP	2012
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%if "%{pld_release}" == "ti"
-%define	ver_db	4.5.20
-%define	ver_db_rel	8
-%else
-%define	ver_db	4.7.25
-%define	ver_db_rel	1
-%endif
-%define	ver_rpm	4.5-49
+%define		db_pkg		db5.2
+%define		ver_db		5.2
+%define		ver_db_rel	3
+%define		ver_rpm		5.4.10
 
-%define		snap	rc5
-%define		rel	11
+%define		snap	rc7
+%define		rel	3%{?with_snap:.%{SNAP}}
 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
+Version:	0.30.0
 Release:	1.%{snap}.%{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/~cactus/snaps/poldek/%{name}-%{version}%{snap}.tar.xz
-# Source0-md5:	ab89926c28cfb6b7d72497fc37c16ac4
+Source0:	http://carme.pld-linux.org/~megabajt/snaps/poldek/%{name}-%{version}%{snap}.tar.xz
+# Source0-md5:	56ba9e7b709a99965f42e24e65eb2d7f
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
-Source3:	%{name}-ti.conf
-Source4:	%{name}-multilib-ti.conf
 Source5:	%{name}-aliases.conf
 Source6:	%{name}.desktop
 Source7:	%{name}.png
@@ -40,17 +36,21 @@ Source8:	%{name}-debuginfo.conf
 Source9:	%{name}-aidath.conf
 Source10:	%{name}-multilib-aidath.conf
 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}-inherited-group.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	check-devel
-BuildRequires:	db-devel >= %{ver_db}-%{ver_db_rel}
+BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
@@ -69,7 +69,7 @@ BuildRequires:	xmlto
 BuildRequires:	zlib-devel
 %if %{with static}
 BuildRequires:	bzip2-static
-BuildRequires:	db-static >= %{ver_db}-%{ver_db_rel}
+BuildRequires:	%{db_pkg}-static >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	glibc-static
 BuildRequires:	libselinux-static
 BuildRequires:	libxml2-static
@@ -84,10 +84,11 @@ BuildRequires:	zlib-static
 Requires(triggerpostun):	awk
 Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	db >= %{ver_db}-%{ver_db_rel}
+Requires:	%{db_pkg} >= %{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)
@@ -207,8 +208,9 @@ Moduły języka Python dla poldka.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
-rm -f m4/libtool.m4 m4/lt*.m4
+%{__rm} m4/libtool.m4 m4/lt*.m4
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -222,13 +224,19 @@ chmod u+x ./configure ./doc/conf-xml2.sh
 %{__automake}
 cd tndb
 %{__libtoolize}
-autoreconf -i
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 cd ../trurlib
 %{__libtoolize}
-autoreconf -i
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 cd ..
 
-CPPFLAGS="-std=gnu99"
+CPPFLAGS="%{rpmcppflags} -std=gnu99"
 %configure \
 	%{?with_static:--enable-static --disable-shared} \
 	%{!?with_imode:--disable-imode} \
@@ -250,7 +258,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
 	libdir=%{py_sitedir}
 %endif
 
-%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
+%{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
 %ifarch i486 i686 ppc sparc alpha athlon
 	%define		_ftp_arch	%{_target_cpu}
@@ -260,63 +268,66 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
 	%define		_ftp_alt_arch	i686
 %endif
 %ifarch i586
-	%if "%{pld_release}" == "ti"
-		%define		_ftp_arch	i586
-	%else
-		%define		_ftp_arch	i486
-	%endif
+	%define		_ftp_arch	i486
 %endif
 %ifarch pentium2 pentium3 pentium4
 	%define		_ftp_arch	i686
 %endif
 %ifarch sparcv9 sparc64
 	%define		_ftp_arch	sparc
-	%if "%{pld_release}" == "th"
-		%define		_ftp_arch	%{_target_cpu}
-		%ifarch sparc64
+	%define		_ftp_arch	%{_target_cpu}
+	%ifarch sparc64
 		%define		_ftp_alt_arch	sparcv9
-		%endif
 	%endif
 %endif
 
-%if "%{pld_release}" == "ti"
-	%define	pld_conf %{SOURCE3}
-	%ifarch %{x8664}
-		%define	pld_multilib_conf %{SOURCE4}
-	%endif
-%endif
+%define	pld_conf %{SOURCE1}
+%define	pld_debuginfo_conf %{SOURCE8}
+%define	pld_archive_conf %{SOURCE11}
 
-%if "%{pld_release}" == "th"
-	%define	pld_conf %{SOURCE1}
-	%define	pld_debuginfo_conf %{SOURCE8}
-	%define	pld_archive_conf %{SOURCE11}
-
-	%ifarch %{x8664}
-		%define	pld_multilib_conf %{SOURCE2}
-	%endif
+%ifarch %{x8664}
+	%define	pld_multilib_conf %{SOURCE2}
+%endif
 
-	# aidath
-	%ifarch sparcv9 sparc64
-		%define	pld_conf %{SOURCE9}
-		%undefine pld_archive_conf
-	%endif
-	%ifarch sparc64
-		%define pld_multilib_conf %{SOURCE10}
-	%endif
+# aidath
+%ifarch sparcv9 sparc64
+	%define	pld_conf %{SOURCE9}
+	%undefine pld_archive_conf
+%endif
+%ifarch sparc64
+	%define pld_multilib_conf %{SOURCE10}
 %endif
 
-sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
 
 %if 0%{?pld_multilib_conf:1}
-	sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{pld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+	%{__sed} 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{pld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 %endif
 
 %if 0%{?pld_debuginfo_conf:1}
-sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_debuginfo_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
+%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_debuginfo_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
 %endif
 
 %if 0%{?pld_archive_conf:1}
-sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_archive_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-archive.conf
+%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_archive_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-archive.conf
+%endif
+
+# Always install snapshot configs
+%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' \
+	-e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE100} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
+%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' \
+	-e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE102} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-debuginfo.conf
+%ifarch %{x8664}
+	%{__sed} -e 's|%%ARCH%%|%{_ftp_alt_arch}|g' \
+		-e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE101} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf
+%endif
+
+%if %{with snap}
+%{__sed} -i -e 's|@@SNAP@@||g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+%{__sed} -i '/@@SNAP@@.*/d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
+%else
+%{__sed} -i -e 's|@@SNAP@@||g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
+%{__sed} -i '/@@SNAP@@.*/d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
 %endif
 
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
@@ -329,15 +340,15 @@ cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
 # sources we don't package
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,pld,fedora,centos}-source.conf
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora,centos}-source.conf
 # include them in %doc
-rm -rf configs
+%{__rm} -rf configs
 cp -a conf configs
-rm -f configs/Makefile*
+%{__rm} -f configs/Makefile*
 
 %if %{with python}
 %py_postclean
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/_poldekmod.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_poldekmod.la
 %endif
 
 %find_lang %{name}
@@ -410,7 +421,7 @@ if [ -f /etc/poldek.conf.rpmsave ]; then
 	# copy hold=
 	hold=$(grep ^hold /etc/poldek.conf.rpmsave)
 	if [ "$hold" ]; then
-		sed -i -e "/^#hold =/s/^.*/$hold/" /etc/poldek/poldek.conf
+		%{__sed} -i -e "/^#hold =/s/^.*/$hold/" /etc/poldek/poldek.conf
 	fi
 fi
 
@@ -445,10 +456,12 @@ fi
 %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
-%attr(755,root,root) %{_bindir}/*
+%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}/*
-%{_mandir}/man1/%{name}*
+%{_mandir}/man1/%{name}*.1*
 %lang(pl) %{_mandir}/pl/man1/%{name}*
 %{_infodir}/poldek.info*
 %if %{with imode}
@@ -474,13 +487,29 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%{!?with_static:%attr(755,root,root) %{_libdir}/lib*.so}
-%{_libdir}/lib*.la
-%{_includedir}/*
+%if %{without static}
+%attr(755,root,root) %{_libdir}/libpoclidek.so
+%attr(755,root,root) %{_libdir}/libpoldek.so
+%attr(755,root,root) %{_libdir}/libtndb.so
+%attr(755,root,root) %{_libdir}/libtrurl.so
+%attr(755,root,root) %{_libdir}/libvfile.so
+%endif
+%{_libdir}/libpoclidek.la
+%{_libdir}/libpoldek.la
+%{_libdir}/libtndb.la
+%{_libdir}/libtrurl.la
+%{_libdir}/libvfile.la
+%{_includedir}/poldek
+%{_includedir}/tndb
+%{_includedir}/trurl
+%{_includedir}/vfile
+%{_pkgconfigdir}/tndb.pc
+%{_pkgconfigdir}/trurlib.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libtndb.a
+%{_libdir}/libtrurl.a
 
 %if %{with python}
 %files -n python-poldek