X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=2e08d2caf936fd208841a2e27eaf7ba8fcb7818e;hb=290c1c301f6c440b7985cd079a30c2d0a0da1a7f;hp=1c83672bb105b9733c30334ce73aa9a7654df5fe;hpb=2ec200752ce411469cefd9222918971a19b35d7a;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 1c83672..2e08d2c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,19 +1,35 @@
+#
+# TODO:
+# - learn find-perl-provides to use the __perl macro instead
+#   of /usr/bin/perl
+#
+# Conditional build:
+# _without_static	- build shared /bin/rpm (doesn't work at the moment)
+# force_cc		- force using __cc other than "%{_target_cpu}-pld-linux-gcc"
+# force_cxx		- force using __cxx other than "%{_target_cpu}-pld-linux-g++"
+# force_cpp		- force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E"
+#
 %include        /usr/lib/rpm/macros.python
 %define	beecrypt_ver	2.2.0
-%define	beecrypt_rel	2
+# versions of required libraries
+%define	reqdb_ver	4.1.25-1
+%define	reqpopt_ver	1.7
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
 Summary(pl):	Aplikacja do zarz±dzania pakietami RPM
 Summary(pt_BR):	Gerenciador de pacotes RPM
-Summary(ru):	íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ Red Hat
-Summary(uk):	íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä Red Hat
+Summary(ru):	íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM
+Summary(uk):	íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:		rpm
-Version:	4.1
-Release:	10
+%define	ver	4.2
+Version:	%{ver}
+%define	rel	0.1
+Release:	%{rel}
+%define	beecrypt_rel	%{ver}_%{rel}
 License:	GPL
 Group:		Base
-Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.rpm.org/pub/rpm/test-4.2/%{name}-%{version}.tar.gz
 Source1:	%{name}.groups
 Source2:	%{name}.macros
 Source3:	%{name}-install-tree
@@ -37,6 +53,7 @@ Source20:	%{name}-find-php-requires
 Source30:	builder
 Source31:	adapter.awk
 Source32:	pldnotify.awk
+Source33:	perl.prov
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-%{name}rc.patch
 Patch2:		%{name}-arch.patch
@@ -52,9 +69,8 @@ Patch11:	%{name}-noexpand.patch
 Patch12:	%{name}-scripts-closefds.patch
 Patch13:	%{name}-python-macros.patch
 Patch14:	%{name}-perlprov-regonly.patch
-Patch15:	%{name}-4.1-branch.patch
 Patch16:	%{name}-drop-legacy-CLI.patch
-Patch17:	%{name}-perlprov-perl5.6.patch
+Patch15:	%{name}-4.1-branch.patch
 Patch18:	%{name}-gettext-in-header.patch
 Patch19:	%{name}-compress-doc.patch
 Patch20:	%{name}-lt14d.patch
@@ -67,30 +83,35 @@ Patch26:	%{name}-4.1-branch-po-updates.patch
 Patch27:	%{name}-link.patch
 Patch28:	%{name}-beecrypt-opt.patch
 Patch29:	%{name}-python-pic.patch
+Patch30:	%{name}-home_etc.patch
+Patch31:	%{name}-system_libs-more.patch
+Patch32:	%{name}-nofile.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	bzip2-devel >= 1.0.1
-BuildRequires:	db-devel >= 4.1.24-4
+BuildRequires:	db-devel >= %{reqdb_ver}
 BuildRequires:	doxygen
 BuildRequires:	gettext-devel >= 0.11.4-2
-BuildRequires:	libelf-devel
+BuildRequires:	elfutils-devel
+BuildRequires:	libmagic-devel
 BuildRequires:	libtool
 BuildRequires:	patch >= 2.2
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	python-modules >= 2.2
 BuildRequires:	rpm-pythonprov
 BuildRequires:	zlib-devel
-BuildRequires:	popt-devel >= 1.7
+BuildRequires:	popt-devel >= %{reqpopt_ver}
 %if %{!?_without_static:1}%{?_without_static:0}
 # Require static library only for static build
 BuildRequires:	bzip2-static >= 1.0.2-5
-BuildRequires:	db-static >= 4.1
+BuildRequires:	db-static >= %{reqdb_ver}
 BuildRequires:	glibc-static >= 2.2.94
-BuildRequires:	libelf-static
+BuildRequires:	elfutils-static
+BuildRequires:	libmagic-devel
 BuildRequires:	zlib-static
-BuildRequires:	popt-static >= 1.7
+BuildRequires:	popt-static >= %{reqpopt_ver}
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:	glibc < 2.2.92
@@ -101,6 +122,11 @@ Conflicts:	glibc < 2.2.92
 # don't require very fresh rpm.macros to build
 %define		__gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,}
 
+# stabilize new build environment
+%define		__cc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
+%define		__cxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++}
+%define		__cpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}
+
 %description
 RPM is a powerful package manager, which can be used to build,
 install, query, verify, update, and uninstall individual software
@@ -160,7 +186,6 @@ Summary(ru):	
 Summary(uk):	èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
-Requires:	beecrypt-devel
 Requires:	bzip2-devel
 Requires:	db-devel
 Requires:	libelf-devel
@@ -219,6 +244,11 @@ Summary(ru):	
 Summary(uk):	óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}
+Requires:	bzip2-static
+Requires:	db-static
+Requires:	libelf-static
+Requires:	popt-static >= 1.7
+Requires:	zlib-static
 
 %description static
 RPM static libraries.
@@ -342,14 +372,16 @@ Python para manipular pacotes e bancos de dados RPM.
 
 %package lib
 Summary:	RPMs library
-Summary(pl):	Biblioteki RPMa
+Summary(pl):	Biblioteki RPM-a
 Group:		Libraries
+Requires:	db >= %{reqdb_ver}
+Requires:	popt >= %{reqpopt_ver}
 
 %description lib
 RPMs library.
 
 %description lib -l pl
-Biblioteki RPMa.
+Biblioteki RPM-a.
 
 %package build
 Summary:	Scripts for building binary RPM packages
@@ -485,9 +517,12 @@ Statyczna wersja biblioteki kryptograficznej.
 
 %prep
 %setup -q
-%patch0 -p1
+# need update
+#%%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+# find-spec-bcond need update
+# po/pl.po need update
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -504,21 +539,24 @@ Statyczna wersja biblioteki kryptograficznej.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
+# need review
+#%%patch23 -p1
 %patch24 -p1
 %patch25 -p1
-%patch26 -p1
+# need review
+#%%patch26 -p1
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
 
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
@@ -532,6 +570,7 @@ install %{SOURCE17} scripts/php.prov.in
 install %{SOURCE18} scripts/php.req.in
 install %{SOURCE19} scripts/find-php-provides
 install %{SOURCE20} scripts/find-php-requires
+install %{SOURCE33} scripts/perl.prov
 
 cd scripts;
 mv -f perl.req perl.req.in
@@ -558,6 +597,7 @@ rm -f missing
 %{__automake}
 cd ..
 
+
 rm -f missing
 %{__libtoolize}
 %{__gettextize}
@@ -572,7 +612,9 @@ sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|'  \
 	-e 's|@host_cpu@|%{_target_cpu}|'  macros.in  > macros.tmp
 mv -f macros.tmp macros.in
 
+# pass CC and CXX too in case of building with some older configure macro
 %configure \
+	CC="%{__cc}" CXX="%{__cxx}" CPP="%{__cpp}" \
 	--enable-shared \
 	--enable-static \
 	--with-apidocs \
@@ -739,25 +781,33 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 
 %files utils
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/debugedit
 %attr(755,root,root) %{_bindir}/rpm2cpio
-%attr(755,root,root) %{_libdir}/rpm/rpmdiff*
-%attr(755,root,root) %{_libdir}/rpm/tgpg
-%attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
-%attr(755,root,root) %{_bindir}/rpmgraph
 %attr(755,root,root) %{_bindir}/rpmcache
+%attr(755,root,root) %{_bindir}/rpmdeps
+%attr(755,root,root) %{_bindir}/rpmgraph
 %attr(755,root,root) %{_bindir}/striptofile
 %attr(755,root,root) %{_bindir}/unstripfile
+%attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
+%attr(755,root,root) %{_libdir}/rpm/rpm2cpio.sh
+%attr(755,root,root) %{_libdir}/rpm/rpmd
+%attr(755,root,root) %{_libdir}/rpm/rpmdiff*
+%attr(755,root,root) %{_libdir}/rpm/rpmi
+%attr(755,root,root) %{_libdir}/rpm/rpmk
+%attr(755,root,root) %{_libdir}/rpm/rpmq
+%attr(755,root,root) %{_libdir}/rpm/tgpg
+
 # not here
-#%{_libdir}/rpm/rpm.daily
-#%{_libdir}/rpm/rpm.log
-#%{_libdir}/rpm/rpm.xinetd
-%{_libdir}/rpm/rpm2cpio.sh
+#%%{_libdir}/rpm/rpm.daily
+#%%{_libdir}/rpm/rpm.log
+#%%{_libdir}/rpm/rpm.xinetd
 
 %{_mandir}/man8/rpm2cpio.8*
 %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
 %lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
 %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
 %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
+%{_mandir}/man8/rpmdeps.8*
 %{_mandir}/man8/rpmcache.8*
 %{_mandir}/man8/rpmgraph.8*