X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=e2d937c4e5b9cb0d166d90b843812ad416da11a2;hp=15a020191716b3649e51b0771c0db2d34d5a3143;hb=1da879ec9c0232219daf532c1baeb13a525cd4c1;hpb=72cdb9f47fe96d153a9856bb2c420508d1686383

diff --git a/rpm.spec b/rpm.spec
index 15a0201..e2d937c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -4,7 +4,6 @@
 #   ELF first; it should be provided by python-libs not binary anyway)
 # - consider using system libmagic not internal libfmagic
 #   (but internal has different method of passing output)
-# - after ac drop amd64 patch and make x86_64 generic arch + subarchs amd64 and ia32e
 # 
 # Conditional build:
 %bcond_with	static		# build static rpmi (not supported at the moment)
@@ -20,7 +19,7 @@
 %define	reqdb_ver	4.3.27-1
 %define	reqpopt_ver	1.10.1
 %define	beecrypt_ver	2:4.1.0
-%define	rpm_macros_rev	1.210
+%define	rpm_macros_rev	1.231
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
@@ -31,7 +30,7 @@ Summary(uk):	
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.1
-Release:	1.3
+Release:	1.99
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -80,7 +79,7 @@ Patch21:	%{name}-dontneedutils.patch
 Patch22:	%{name}-provides-dont-obsolete.patch
 Patch23:	%{name}-examplesaredoc.patch
 Patch24:	%{name}-po.patch
-Patch25:	%{name}-amd64.patch
+Patch25:	%{name}-getcwd.patch
 Patch26:	%{name}-notsc.patch
 Patch27:	%{name}-hack-norpmlibdep.patch
 Patch28:	%{name}-makefile-no_myLDADD_deps.patch
@@ -97,6 +96,7 @@ Patch38:	%{name}-gcc4.patch
 Patch39:	%{name}-pythondeps.patch
 Patch40:	%{name}-print-requires.patch
 Patch41:	%{name}-reduce-stack-usage.patch
+Patch42:	%{name}-glob.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
@@ -148,7 +148,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # don't require very fresh rpm.macros to build
 %define		__gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,}
-%define		ix86 i386 i486 i586 i686 athlon pentium3 pentium4
+%define		ix86	i386 i486 i586 i686 athlon pentium3 pentium4
+%define		x8664	amd64 ia32e x86_64
 
 # stabilize new build environment
 %define		__newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
@@ -397,16 +398,8 @@ Requires:	elfutils
 Requires:	file >= 4.13-2
 Requires:	fileutils
 Requires:	findutils
-%ifarch athlon
-Requires:	gcc >= 3.0.3
-%else
-%ifarch i686
-# because of -mtune in rpmrc
-Requires:	gcc >= 5:3.4
-%else
-Requires:	gcc
-%endif
-%endif
+# because of -fvisibility... related fixes
+Requires:	gcc >= 5:4.0.1-0.20050514.2
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
@@ -419,9 +412,7 @@ Requires:	tar
 Requires:	textutils
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Provides:	rpmbuild(noauto) = 3
-# because of -fvisibility-inlines-hidden in rpm.macros
-Conflicts:	gcc-c++ < 5:3.4
-%ifarch amd64
+%ifarch %{x8664}
 Conflicts:	automake < 1:1.7.9-2
 Conflicts:	libtool < 2:1.5-13
 %endif
@@ -506,7 +497,7 @@ Summary:	Python macros, which simplifies creation of rpm packages with Python so
 Summary(pl):	Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie
 Group:		Applications/File
 Requires:	%{name} = %{version}-%{release}
-Requires:	python-modules
+Requires:	python
 
 %description pythonprov
 Python macros, which simplifies creation of rpm packages with Python
@@ -632,6 +623,7 @@ cat %{SOURCE11} >> macros.in
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 %patch0 -p1
 %patch3 -p1
 
@@ -654,10 +646,6 @@ for f in doc{,/ja,/pl}/rpm.8 doc{,/ja,/pl}/rpmbuild.8 ; do
 	mv -f ${f}.tmp $f
 done
 
-# ... and make some cleanings
-rm -fr $(find ./ -type d -name CVS )
-rm -f  $(find ./ -type f -name ".cvsignore" )
-
 %build
 cd file
 %{__libtoolize}
@@ -680,6 +668,8 @@ 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
 
+CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
+
 # pass CC and CXX too in case of building with some older configure macro
 %configure \
 	CC="%{__newcc}" \
@@ -692,6 +682,7 @@ mv -f macros.tmp macros.in
 	%{?with_python:--with-python=auto} \
 	%{!?with_python:--without-python} \
 	%{!?with_selinux:--without-selinux} \
+	--with-glob \
 	--without-db
 
 # file_LDFLAGS, debugedit_LDADD - no need to link "file" and "debugedit" statically
@@ -1004,9 +995,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch alpha
 %{_rpmlibdir}/alpha*
 %endif
-%ifarch amd64
-%{_rpmlibdir}/amd64*
-%endif
 %ifarch ia64
 %{_rpmlibdir}/ia64*
 %endif
@@ -1019,6 +1007,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch sparc sparc64
 %{_rpmlibdir}/sparc*
 %endif
+%ifarch %{x8664}
+%{_rpmlibdir}/x86_64*
+%endif
 # must be here for "Requires: rpm-*prov" to work
 %{_rpmlibdir}/macros.perl
 %{_rpmlibdir}/macros.php