X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=0443d3d690806179499f526d8c96c587f0bc9ba6;hb=2ff25e9a98ec05a5986c9672bde2f0e716ae313b;hp=fa2fa8c047a33f4729a2d23f5a103842ff05c92e;hpb=169dcb3908d8e171cd6c2f7032ba54facab3a0cc;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index fa2fa8c..0443d3d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,5 +1,11 @@
 #
 # TODO:
+# - manuals are not compressed
+# - %{_arch} = i686 not as used to be i386:
+#   5.0.2: rpm -E '%_target_base_arch %_arch'
+#          i386 i686
+#   4.4.9: rpm -E '%_target_base_arch %_arch'
+#          i386 i386
 # - python(abi) cap is not provided automatically because /usr/lib*/libpython2*.so.*
 #   matches ELF first
 # - repackaging when lzma is not installed (todo: fix digest signature of header)
@@ -8,6 +14,24 @@
 #   repackaging uses unchanged "immutable header" image from original rpm, also
 #   preserving payload format and compressor from original rpm, _not_ current settings
 # - TODO: add macros for some ppc, mipsel, alpha and sparc
+# - uppackaged list:
+#   /usr/lib/rpm/http.req
+#   /usr/lib/rpm/install-sh
+#   /usr/lib/rpm/mono-find-provides
+#   /usr/lib/rpm/mono-find-requires
+#   /usr/lib/rpm/osgideps.pl
+#   /usr/lib/rpm/perldeps.pl
+#   /usr/lib/rpm/rpm2cpio
+#   /usr/lib/rpm/symclash.py
+#   /usr/lib/rpm/symclash.sh
+#   /usr/lib/rpm/vcheck
+#   /usr/share/man/ja/man8/rpmcache.8
+#   /usr/share/man/ja/man8/rpmgraph.8
+#   /usr/share/man/man8/rpmcache.8
+#   /usr/share/man/man8/rpmconstant.8
+#   /usr/share/man/man8/rpmgraph.8
+#   /usr/share/man/pl/man8/rpmcache.8
+#   /usr/share/man/pl/man8/rpmgraph.8
 #
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
@@ -37,6 +61,7 @@ ERROR
 %define	reqdb_ver	4.6.18
 %define	reqpopt_ver	1.10.8
 %define	beecrypt_ver	2:4.1.2-4
+%define	find_lang_rev	1.27
 %define	sover	5.0
 Summary:	RPM Package Manager
 Summary(de.UTF-8):	RPM Packet-Manager
@@ -46,12 +71,12 @@ Summary(pt_BR.UTF-8):	Gerenciador de pacotes RPM
 Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
-Version:	5.0
+Version:	5.0.2
 Release:	0.1
-License:	GPL
+License:	LGPL
 Group:		Base
-Source0:	%{name}-20071020.tar.bz2
-# Source0-md5:	35d63697b6c7ff752473f43822f9d010
+Source0:	http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz
+# Source0-md5:	596aaf5cd9dea7195f625530bc89e684
 Source1:	%{name}.groups
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
@@ -85,8 +110,8 @@ Source109:	%{name}-macros-x86_64
 Source110:	%{name}-macros-ia32e
 Source111:	%{name}-macros-amd64
 
-Patch0:		%{name}-pl.po.patch
-
+#Patch0:		%{name}-pl.po.patch
+Patch1:		%{name}-man_pl.patch
 Patch3:		%{name}-rpmpopt.patch
 Patch4:		%{name}-perl-macros.patch
 Patch5:		%{name}-perl-req-perlfile.patch
@@ -106,14 +131,11 @@ Patch23:	%{name}-pkgconfigdeps.patch
 Patch26:	%{name}-notsc.patch
 Patch27:	%{name}-hack-norpmlibdep.patch
 
-Patch31:	%{name}-missing-prototypes.patch
 Patch32:	%{name}-pld-autodep.patch
-Patch34:	%{name}-epoch0.patch
 Patch35:	%{name}-perl_req-INC_dirs.patch
 Patch36:	%{name}-debuginfo.patch
 Patch37:	%{name}-doxygen_hack.patch
 
-Patch41:	%{name}-reduce-stack-usage.patch
 Patch42:	%{name}-old-fileconflicts-behaviour.patch
 
 Patch46:	%{name}-mono.patch
@@ -138,6 +160,7 @@ BuildRequires:	elfutils-devel >= 0.108
 # -fPIE/-pie
 BuildRequires:	gcc >= 5:3.4
 %endif
+BuildRequires:	gettext-autopoint >= 0.11.4-2
 BuildRequires:	gettext-devel >= 0.11.4-2
 BuildRequires:	libmagic-devel
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
@@ -271,14 +294,14 @@ Summary(pl.UTF-8):	Biblioteki RPM-a
 Group:		Libraries
 Requires:	beecrypt >= %{beecrypt_ver}
 %{?with_db:Requires:	db >= %{reqdb_ver}}
-%{?with_selinux:Requires:	libselinux >= 1.18}
 Requires:	libmagic >= 1.15-2
+%{?with_selinux:Requires:	libselinux >= 1.18}
 Requires:	popt >= %{reqpopt_ver}
-Obsoletes:	rpm-libs
+%{?with_suggest_tags:Suggests:	lzma}
 Obsoletes:	rpm-apidocs
+Obsoletes:	rpm-libs
 # avoid SEGV caused by mixed db versions
 Conflicts:	poldek < 0.18.1-16
-%{?with_suggest_tags:Suggests:	lzma}
 
 %description lib
 RPMs library.
@@ -451,7 +474,7 @@ Summary(ru.UTF-8):	Скрипты и утилиты, необходимые дл
 Summary(uk.UTF-8):	Скрипти та утиліти, необхідні для побудови пакетів
 Group:		Applications/File
 Requires(pre):	findutils
-Requires:	%{name}-build-macros >= 1.314
+Requires:	%{name}-build-macros >= 1.417
 Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
@@ -476,6 +499,7 @@ Requires:	sed
 Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
+Provides:	rpmbuild(find_lang) = %{find_lang_rev}
 Provides:	rpmbuild(monoautodeps)
 Provides:	rpmbuild(noauto) = 3
 %ifarch %{x8664}
@@ -606,10 +630,11 @@ Esse pacote deve ser instalado se você quiser desenvolver programas em
 Python para manipular pacotes e bancos de dados RPM.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
-# APPLIED ALREADY?
-#%patch0 -p1
+# APPLIED ALREADY? translationproject.org is used now
+#%%patch0 -p1
+%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -618,8 +643,8 @@ Python para manipular pacotes e bancos de dados RPM.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-# CHECK ME
-#%patch14 -p1
+# CHECK ME - macrofiles: ~/etc could be used
+#%%patch14 -p1
 %patch16 -p1
 %patch18 -p1
 echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -640,21 +665,15 @@ install %{SOURCE12} scripts/perl.prov
 %patch26 -p1
 %endif
 %patch27 -p1
-# CHECK ME
-#%patch31 -p1
 %patch32 -p1
-%patch34 -p1
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
-# CHECK ME
-#%patch41 -p1
 %patch42 -p1
-# CHECK ME, PROBABLY WILL NEED TO HANLE IN OTHER WAY since rpmfcSCRIPT already handles mono
-#%patch46 -p1
+%patch46 -p1
 %patch47 -p1
 # OLD COMMENTED OUT
-#%patch52 -p1
+#%%patch52 -p1
 %patch55 -p1
 %patch58 -p1
 %patch59 -p1
@@ -677,6 +696,12 @@ awk -f %{SOURCE6} %{SOURCE1}
 #done
 
 %build
+rev=$(awk '/^#.*Id:.*/{print $4}' scripts/find-lang.sh)
+if [ "$rev" != "%find_lang_rev" ]; then
+	: Update find_lang_rev define to $rev, and retry
+	exit 1
+fi
+
 %{__libtoolize}
 %{__autopoint}
 %{__aclocal}
@@ -698,7 +723,7 @@ awk -f %{SOURCE6} %{SOURCE1}
 	%{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \
 	--enable-shared \
 	--enable-static \
-	%{?with_python:--with-python=2.5 --with-python-lib-dir=%{py_libdir}} \
+	%{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \
 	%{!?with_python:--without-python} \
 	--with%{!?with_selinux:out}-selinux \
 	--with-libelf \
@@ -711,8 +736,8 @@ awk -f %{SOURCE6} %{SOURCE1}
 	--with-db=%{?with_db:external}%{!?with_db:no} \
 	--with-sqlite=%{?with_sqlite:external}%{!?with_sqlite:no} \
 	--with-dbapi=%{!?sqlite_dbapi:db}%{?sqlite_dbapi:sqlite} \
-	--with-lua=none \
-	--with-pcre=external \
+	--with-lua=internal \
+	--with-pcre=no \
 	--with-keyutils=none \
 	--without-path-versioned \
 	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
@@ -766,12 +791,10 @@ echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_sysconfdir}/rp
 echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-
 %ifarch amd64
 echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
-
 %ifarch ia32e
 echo "ia32e-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
@@ -800,10 +823,41 @@ echo "i486-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
-# ppc
+%ifarch alpha
+echo "alpha-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+
+%ifarch ia64
+echo "ia64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+
+%ifarch ppc64
+echo "powerpc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "ppc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
 %ifarch ppc
-echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 echo "powerpc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+
+%ifarch s390x
+echo "s390x-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch s390 s390x
+echo "s390-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+
+%ifarch sparc64
+echo "sparc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch sparcv9
+echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
+%endif
+%ifarch sparc sparcv9 sparc64
+echo "sparc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 %endif
 
 # noarch
@@ -972,10 +1026,20 @@ rm -f manual/Makefile*
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun lib -- %{name}-lib < %{version}
+rm -f /var/lib/rpm/__db*
+
+%pretrans
+# this needs to be a dir
+if [ -f %{_sysconfdir}/rpm/sysinfo ]; then
+	mv -f %{_sysconfdir}/rpm/sysinfo{,.rpmsave}
+	mkdir %{_sysconfdir}/rpm/sysinfo
+fi
+
 %post	lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
 
-%pre build
+%pretrans build
 find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %files -f %{name}.lang
@@ -1037,8 +1101,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_pkgconfigdir}/*.pc
 %attr(755,root,root) %{_libdir}/librpm.so
 %attr(755,root,root) %{_libdir}/librpm-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmconstant.so
+%attr(755,root,root) %{_libdir}/librpmconstant-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmio.so
 %attr(755,root,root) %{_libdir}/librpmio-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmmisc.so
+%attr(755,root,root) %{_libdir}/librpmmisc-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmdb.so
 %attr(755,root,root) %{_libdir}/librpmdb-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmbuild.so