- fixed macros.in changing

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 7f536bae34554b5236a3a6fb721dce0bdf7f1685..b5868c7b06b7b503695f5931998caf4167f8845f 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,3 +1,5 @@
+# to build for athlon you need release at least 49
+
 Summary:       Red Hat (and now also PLD) Package Manager
 Summary(de):   Red Hat (und jetzt auch PLD) Packet-Manager
 Summary(es):   Gestor de paquetes RPM
@@ -5,7 +7,7 @@ Summary(pl):    Aplikacja do zarz
 Summary(pt_BR):        Gerenciador de pacotes RPM
 Name:          rpm
 Version:       4.0.2
-Release:       48
+Release:       49
 License:       GPL
 Group:         Base
 Group(de):     Gründsätzlich
@@ -56,6 +58,8 @@ Patch26:      %{name}-python-macros.patch
 Patch27:       %{name}-hardlink-fixes.patch
 Patch28:       %{name}-perlprov-regonly.patch
 Patch29:       %{name}-cxx.patch
+Patch30:       %{name}-athlon.patch
+Patch31:       %{name}-athlon-identify.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 URL:           http://www.rpm.org/
@@ -75,6 +79,7 @@ BuildRequires:        zlib-devel >= 1.1.4
 BuildRequires: db3-static >= 3.1.17-9
 BuildRequires: db1-static >= 1.85
 BuildRequires: zlib-static
+BuildRequires: glibc-static >= 2.2.0
 BuildRequires: zlib-static >= 1.1.4
 Obsoletes:     rpm-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -194,7 +199,7 @@ RPM static libraries.
 RPMs statische Libraries.
 
 %description static -l pl
-%description static l pt_BR
+Biblioteki statyczne RPM-a.
 
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento.
@@ -277,7 +282,7 @@ Pakiet rpm-python zawiera modu
 Pythonie na u¿ywanie interfejsu dostarczanego przez biblioteki RPM-a.
 
 Pakiet ten powinien zostaæ zainstalowany, je¶li chcesz pisaæ w
-%description python -l pt_BR -n
+%description python -l pt_BR
 
 %description -n python-rpm -l pt_BR
 O pacote rpm-python contém um módulo que permite que aplicações
@@ -295,12 +300,17 @@ Group(de):        Applikationen/Datei
 Group(pl):     Aplikacje/Pliki
 Summary(pt_BR):        Scripts e programas executáveis usados para construir pacotes
 Group:         Applications/File
+Requires:      %{name} = %{version}
 Requires:      /bin/id
 Requires:      awk
 Requires:      binutils
 Requires:      diffutils
 Requires:      file >= 3.31
+Requires:      fileutils
+Requires:      findutils
+%ifarch athlon
 Requires:      gcc >= 3.0.3
+%else
 Requires:      gcc
 Requires:      glibc-devel
 Requires:      grep
@@ -355,6 +365,11 @@ construir pacotes usando o RPM.
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+
+%ifarch athlon
+%patch31 -p1
+%endif
 %patch31 -p1
 %patch36 -p1
 %patch37 -p1
@@ -403,7 +418,7 @@ mv -f python/Makefile.in.new python/Makefile.in
 sed -e 's#python1.5#python%{py_ver}#g' \
        python/Makefile.in > python/Makefile.in.new
 sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
-       sed 's|@host_cpu@|%{_target_cpu}|' | \
+       sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
 # config.guess doesn't handle athlon, so we have to change it by hand.
 # rpm checks for CPU type at runtime, but it looks better
 sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
@@ -486,8 +501,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/rpm/macros.python
 %{_libdir}/rpm/noarch-linux
 %{_libdir}/rpm/noarch-pld-linux
-%ifarch i386 i486 i586 i686
+%{_libdir}/rpm/rpmrc
 %{_libdir}/rpm/rpmpopt*
+%{_libdir}/rpm/macros
 %{_libdir}/rpm/noarch-linux
 %{_libdir}/rpm/noarch-pld-linux
 %ifarch i386 i486 i586 i686 athlon