X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=2ede830b1164e43c9c1ec0637e5e612c246f9830;hb=77a0fe7fd94229cceae48638158788b77907cccf;hp=1c39076b1107e3c1e94c285f33e6d030319a97f1;hpb=a780e5a40d3cca097035deb33543f45ec411bcf4;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 1c39076..2ede830 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,117 +1,131 @@ -# to build for athlon you need release at least 49 - +# +# TODO: +# - learn find-perl-provides to use the __perl macro instead +# of /usr/bin/perl +# - use system libmagic not internal libfmagic +# +# 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 snap 20030515 +# versions of required libraries +%define reqdb_ver 4.1.25-1 +%define reqpopt_ver 1.9 +%define beecrypt_ver 3.0.0 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.0.2 -Release: 92 +%define ver 4.3 +Version: %{ver} +%define rel 0.%{snap}.8 +Release: %{rel} License: GPL Group: Base -Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz +#Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz +# Source0-md5: b7a16114143a0465aa65daf7a0234cf4 +Source0: http://recesja.icm.edu.pl/~psk/%{name}-%{version}.%{snap}.tar.gz Source1: %{name}.groups -Source2: %{name}.macros +Source2: %{name}.platform Source3: %{name}-install-tree Source4: %{name}-find-rpm-provides -Source5: %{name}-macros.perl -Source6: %{name}-find-perl-provides -Source7: %{name}-find-perl-requires Source8: %{name}-find-spec-bcond Source9: %{name}-find-lang Source10: %{name}-find-provides Source11: %{name}-find-requires -Source12: %{name}-non-english-man-pages.tar.bz2 -Source13: %{name}-macros.python Source14: %{name}-groups-po.awk Source15: %{name}-compress-doc Source16: %{name}-check-files Source17: %{name}-php-provides Source18: %{name}-php-requires -Source19: %{name}-find-php-provides -Source20: %{name}-find-php-requires -Source21: %{name}-macros.php -Patch0: %{name}-rpmrc.patch -Patch1: %{name}-macros.patch +Source20: %{name}.macros +Source30: builder +Source31: adapter.awk +Source32: pldnotify.awk +Source33: perl.prov +Patch0: %{name}-pl.po.patch +Patch1: %{name}-rpmrc.patch Patch2: %{name}-arch.patch Patch3: %{name}-rpmpopt.patch Patch4: %{name}-perl-macros.patch -Patch5: %{name}-db3.patch -Patch6: %{name}-segv.patch -Patch7: %{name}-am_fix.patch -Patch8: %{name}-perl-req-perlfile.patch -Patch9: %{name}-installplatform.patch -Patch10: %{name}-cache.patch -Patch11: %{name}-suggestions.patch -Patch12: %{name}-rh-lame.patch -Patch13: %{name}-glob.patch -Patch14: %{name}-header_h.patch -Patch15: %{name}-fast-alAddPackage.patch -Patch16: %{name}-byKey.patch -Patch17: %{name}-perlprov.patch -Patch18: %{name}-noperldir.patch -Patch19: %{name}-popt-cvs20010530.patch -Patch20: %{name}-noexpand.patch -Patch21: %{name}-scripts-closefds.patch -Patch22: %{name}-python-amfix.patch -Patch23: %{name}-non-english-man-pages.patch -Patch24: %{name}-progress-nontty.patch -Patch25: %{name}-am_ac.patch -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 -Patch32: %{name}-gettext-in-header.patch -Patch33: %{name}-perlprov-perl5.6.patch -Patch34: %{name}-ac25x.patch -Patch35: %{name}-signverify-fix.patch -Patch36: %{name}-compress-doc.patch -Patch37: %{name}-short_circuit.patch -Patch38: %{name}-test_stage.patch -Patch39: %{name}-exclude.patch -Patch40: %{name}-check_files.patch -Patch41: %{name}-choke-on-evil-doc.patch -Patch42: %{name}-rpmlog-fix.patch +Patch5: %{name}-perl-req-perlfile.patch +Patch7: %{name}-glob.patch +Patch11: %{name}-noexpand.patch +Patch12: %{name}-scripts-closefds.patch +Patch13: %{name}-python-macros.patch +#Patch16: %{name}-drop-legacy-CLI.patch +Patch18: %{name}-gettext-in-header.patch +Patch19: %{name}-compress-doc.patch +Patch20: %{name}-lt14d.patch +Patch21: %{name}-gettext0.11.patch +Patch22: %{name}-build.patch +Patch24: %{name}-system_libs.patch +Patch25: %{name}-bb-and-short-circuit.patch +Patch30: %{name}-etc_dir.patch +Patch31: %{name}-system_libs-more.patch +Patch32: %{name}-php-deps.patch +Patch33: %{name}-python-fix.patch +Patch34: %{name}-spec-prep-pre.patch +Patch35: %{name}-perl_req.patch +Patch36: %{name}-system_libs_more.patch +Patch37: %{name}-python_2_3.patch +Patch38: %{name}-no-bin-env.patch +Patch39: %{name}-specflags.patch +Patch40: %{name}-magic-usesystem.patch +Patch41: %{name}-dontneedutils.patch URL: http://www.rpm.org/ Icon: rpm.gif -BuildRequires: autoconf >= 2.50 +BuildRequires: autoconf >= 2.52 BuildRequires: automake +BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.1 -BuildRequires: db1-devel >= 1.85 -BuildRequires: db3-devel >= 3.1.17-9 -BuildRequires: gettext-devel >= 0.10.38-3 +BuildRequires: db-devel >= %{reqdb_ver} +BuildRequires: doxygen +BuildRequires: gettext-devel >= 0.11.4-2 +BuildRequires: elfutils-devel +#BuildRequires: libmagic-devel BuildRequires: libtool BuildRequires: patch >= 2.2 -BuildRequires: python-devel >= 2.2.1 -BuildRequires: python-modules >= 2.2.1 -BuildRequires: zlib-devel >= 1.1.4 -%if %{!?_without_static:1}%{?_without_static:0} +BuildRequires: python-devel >= 2.2 +BuildRequires: python-modules >= 2.2 +BuildRequires: rpm-perlprov +BuildRequires: rpm-pythonprov +BuildRequires: zlib-devel +BuildRequires: popt-devel >= %{reqpopt_ver} +%if %{!?_without_static:1}0 # Require static library only for static build -BuildRequires: bzip2-static >= 1.0.1 -BuildRequires: db1-static >= 1.85 -BuildRequires: db3-static >= 3.1.17-9 -BuildRequires: glibc-static >= 2.2.0 -BuildRequires: zlib-static >= 1.1.4 +BuildRequires: beecrypt-static >= %{beecrypt_ver} +BuildRequires: bzip2-static >= 1.0.2-5 +BuildRequires: db-static >= %{reqdb_ver} +BuildRequires: glibc-static >= 2.2.94 +BuildRequires: elfutils-static +#BuildRequires: libmagic-static +BuildRequires: zlib-static +BuildRequires: popt-static >= %{reqpopt_ver} %endif -Requires: zlib >= 1.1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -Obsoletes: rpm-libs -Conflicts: glibc < 2.2 +Requires: popt >= %{reqpopt_ver} +Conflicts: glibc < 2.2.92 %define __find_provides %{SOURCE4} %define _binary_payload w9.gzdio +%define _noPayloadPrefix 1 -%define py_ver %(echo `python -c "import sys; print sys.version[:3]"`) -%define py_prefix %(echo `python -c "import sys; print sys.prefix"`) -%define py_libdir %{py_prefix}/lib/python%{py_ver} -%define py_sitedir %{py_libdir}/site-packages -%define py_dyndir %{py_libdir}/lib-dynload -%define pyrequires_eq() Requires: %1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`) +# 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, @@ -134,10 +148,10 @@ almacenaje de archivos, y informaci nombre, versión y descripción. %description -l pl -RPM jest doskona³ym mened¿erem pakietów. Dziêki niemu bêdziesz móg³ -przebudowaæ, zainstalowaæ czy zweryfikowaæ dowolny pakiet. Informacje -dotycz±ce ka¿dego pakietu, takie jak jego opis, lista plików -wchodz±cych w sk³ad pakietu, zale¿no¶ci od innych pakietów, s± +RPM jest doskona³ym programem zarz±dzaj±cym pakietami. Umo¿liwia on +przebudowanie, instalacjê czy weryfikacjê dowolnego pakietu. +Informacje dotycz±ce ka¿dego pakietu, takie jak jego opis, lista +plików wchodz±cych w sk³ad pakietu, zale¿no¶ci od innych pakietów, s± przechowywane w bazie danych i mo¿na je uzyskaæ za pomoc± opcji odpytywania programu rpm. @@ -168,11 +182,16 @@ Summary(de): Header-Dateien uns Libraries Summary(es): Archivos de inclusión y bibliotecas para programas de manipulación de paquetes rpm Summary(pl): Pliki nag³ówkowe i biblioteki statyczne Summary(pt_BR): Arquivos de inclusão e bibliotecas para programas de manipulação de pacotes RPM -Summary(ru): èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ. +Summary(ru): èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ Summary(uk): èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm Group: Development/Libraries -Requires: %{name} = %{version} -Requires: popt-devel +Requires: %{name}-lib = %{version} +Requires: beecrypt-devel >= %{beecrypt_ver} +Requires: bzip2-devel +Requires: db-devel +Requires: elfutils-devel +Requires: popt-devel >= %{reqpopt_ver} +Requires: zlib-devel %description devel The RPM packaging system includes a C library that makes it easy to @@ -195,8 +214,8 @@ herramientas que necesiten un conocimiento profundo de paquetes RPM. %description devel -l pl System RPM zawiera bibliotekê C, która u³atwia manipulowanie pakietami RPM oraz bazami danych. W zamiarze ma to upro¶ciæ tworzenie -graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj± -szczegó³owej wiedzy na temat pakietów RPM. +graficznych programów zarz±dzaj±cych pakietami oraz innych narzêdzi, +które wymagaj± szczegó³owej wiedzy na temat pakietów RPM. %description devel -l pt_BR O sistema de empacotamento RPM inclui uma biblioteca C que torna fácil @@ -222,10 +241,16 @@ Summary: RPM static libraries Summary(de): RPMs statische Libraries Summary(pl): Biblioteki statyczne RPM-a Summary(pt_BR): Bibliotecas estáticas para o desenvolvimento de aplicações RPM -Summary(ru): óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ. +Summary(ru): óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ Summary(uk): óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm Group: Development/Libraries Requires: %{name}-devel = %{version} +Requires: beecrypt-static >= %{beecrypt_ver} +Requires: bzip2-static +Requires: db-static +Requires: elfutils-static +Requires: popt-static >= %{reqpopt_ver} +Requires: zlib-static %description static RPM static libraries. @@ -255,6 +280,7 @@ Summary(de): Zusatzwerkzeuge f Summary(pl): Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami Group: Applications/File Requires: %{name} = %{version} +Requires: popt >= %{reqpopt_ver} %description utils Additional utilities for managing rpm packages and database. @@ -265,14 +291,33 @@ Zusatzwerkzeuge f %description utils -l pl Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami. +%package utils-static +Summary: Static rpm utilities +Summary(pl): Statyczne narzêdzia rpm +Group: Applications/System +Requires: %{name} = %{version} + +%description utils-static +Static rpm utilities for repairing system in case something with +shared libraries used by rpm become broken. Currently it contains rpmi +binary, which can be used to install/upgrade/remove packages without +using shared libraries (well, in fact with exception of NSS modules). + +%description utils-static -l pl +Statyczne narzêdzia rpm do naprawy systemu w przypadku zepsucia czego¶ +zwi±zanego z bibliotekami wspó³dzielonymi u¿ywanymi przez rpm-a. +Aktualnie pakiet zawiera binarkê rpmi, któr± mo¿na u¿yæ do instalacji, +uaktualniania lub usuwania pakietów bez udzia³u bibliotek statycznych +(z wyj±tkiem modu³ów NSS). + %package perlprov Summary: Additional utilities for checking perl provides/requires in rpm packages Summary(de): Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen Summary(pl): Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm Group: Applications/File Requires: %{name} = %{version} +Requires: perl-devel Requires: perl-modules -Requires: findutils %description perlprov Additional utilities for checking perl provides/requires in rpm @@ -302,7 +347,7 @@ Pythonie. %package php-pearprov Summary: Additional utilities for managing rpm packages and database -Summary(pl): Dodatkowe narzêdzia do sprawdzania zale¿no¶ci skryptów php w rpm. +Summary(pl): Dodatkowe narzêdzia do sprawdzania zale¿no¶ci skryptów php w rpm Group: Applications/File Requires: %{name} = %{version} @@ -318,7 +363,7 @@ pakietach rpm. Summary: Python interface to RPM library Summary(pl): Pythonowy interfejs do biblioteki RPM-a Summary(pt_BR): Módulo Python para aplicativos que manipulam pacotes RPM -Group: Libraries/Python +Group: Development/Languages/Python Requires: %{name} = %{version} %pyrequires_eq python Obsoletes: rpm-python @@ -346,6 +391,19 @@ RPM (RPM Package Manager). Esse pacote deve ser instalado se você quiser desenvolver programas em Python para manipular pacotes e bancos de dados RPM. +%package lib +Summary: RPMs library +Summary(pl): Biblioteki RPM-a +Group: Libraries +Requires: db >= %{reqdb_ver} +Requires: popt >= %{reqpopt_ver} + +%description lib +RPMs library. + +%description lib -l pl +Biblioteki RPM-a. + %package build Summary: Scripts for building binary RPM packages Summary(de): Scripts fürs Bauen binärer RPM-Pakete @@ -354,12 +412,14 @@ Summary(pt_BR): Scripts e programas execut Summary(ru): óËÒÉÐÔÙ É ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÏ× Summary(uk): óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦× Group: Applications/File +Requires(pre): findutils Requires: %{name} = %{version} +Requires: %{name}-utils = %{version} Requires: /bin/id Requires: awk Requires: binutils Requires: diffutils -Requires: file >= 3.31 +Requires: file >= 4.01 Requires: fileutils Requires: findutils %ifarch athlon @@ -372,7 +432,7 @@ Requires: grep Requires: gzip Requires: make Requires: patch -Requires: popt >= 1.6.2-2 +Requires: popt >= 1.7 Requires: sed Requires: sh-utils Requires: tar @@ -399,85 +459,101 @@ construir pacotes usando o RPM. ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ ÐÏÂÕÄÏ×É RPM'¦×. +%package build-tools +Summary: Scripts for managing .spec files and building RPM packages +Summary(de): Scripts fürs Bauen binärer RPM-Pakete +Summary(pl): Skrypty pomocnicze do zarz±dznia plikami .spec i budowania RPM-ów +Summary(pt_BR): Scripts e programas executáveis usados para construir pacotes +Summary(ru): óËÒÉÐÔÙ É ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÏ× +Summary(uk): óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦× +Group: Applications/File +Requires: %{name}-build = %{version} +# these are optional +#Requires: cvs +#Requires: wget + +%description build-tools +Scripts for managing .spec files and building RPM packages. + +%description build-tools -l de +Scripts fürs Bauen RPM-Pakete. + +%description build-tools -l pl +Skrypty pomocnicze do zarz±dzania plikami .spec i do budowania RPM-ów. + +%description build-tools -l pt_BR +Este pacote contém scripts e programas executáveis que são usados para +construir pacotes usando o RPM. + +%description build-tools -l ru +òÁÚÌÉÞÎÙÅ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÓËÒÉÐÔÙ É ÉÓÐÏÌÎÑÅÍÙÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ +ÉÓÐÏÌØÚÕÀÔÓÑ ÄÌÑ ÓÂÏÒËÉ RPM'Ï×. + +%description build-tools -l uk +ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ +ÐÏÂÕÄÏ×É RPM'¦×. + %prep -%setup -q -a12 +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p0 -%patch12 -p0 +%patch11 -p1 +%patch12 -p1 %patch13 -p1 -%patch14 -p1 -%patch15 -p0 -%patch16 -p0 -%patch17 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p0 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 %patch30 -p1 - -%ifarch athlon %patch31 -p1 -%endif - %patch32 -p1 %patch33 -p1 -%patch34 -p1 +# patch34 -- look down %patch35 -p1 %patch36 -p1 %patch37 -p1 %patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in cp -f platform.in macros.pld.in -install %{SOURCE5} macros.perl.in -install %{SOURCE13} macros.python.in -install %{SOURCE21} macros.php.in -install %{SOURCE6} scripts/find-perl-provides -install %{SOURCE7} scripts/find-perl-requires +echo '# obsoleted file' > macros.perl +echo '# obsoleted file' > macros.python +echo '# obsoleted file' > macros.php install %{SOURCE9} scripts/find-lang.sh 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 +cat %{SOURCE20} >> macros.in +%patch34 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 -(cd scripts; +cd scripts; mv -f perl.req perl.req.in -mv -f perl.prov perl.prov.in) +mv -f perl.prov perl.prov.in +cd .. chmod +x %{SOURCE4} +rm -rf zlib libelf db db3 popt rpmdb/db.h -%build # generate Group translations to *.po awk -f %{SOURCE14} %{SOURCE1} -cd popt +%build +cd file rm -f missing %{__libtoolize} -aclocal -autoheader +%{__aclocal} +%{__autoheader} %{__autoconf} %{__automake} cd .. @@ -485,38 +561,33 @@ cd .. rm -f missing %{__libtoolize} %{__gettextize} -aclocal -autoupdate -autoheader || : +%{__aclocal} +%{__autoheader} %{__autoconf} -# ugly workaround for automake -sed -e 's#cpio.c $(DBLIBOBJS) depends.c#cpio.c depends.c#g' \ - lib/Makefile.am > lib/Makefile.am.new -mv -f lib/Makefile.am.new lib/Makefile.am %{__automake} -sed -e 's#cpio.c depends.c#cpio.c $(DBLIBOBJS) depends.c#g' \ - lib/Makefile.in > lib/Makefile.in.new -mv -f lib/Makefile.in.new lib/Makefile.in - -sed -e 's#python1.5#python%{py_ver}#g' \ - python/Makefile.in > python/Makefile.in.new -mv -f python/Makefile.in.new python/Makefile.in # 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 | \ - sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp +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-v1-packages \ - --with-python + --enable-static \ + --with-apidocs \ + --with-python=auto \ + --without-db -%{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"} +%{__make} \ + %{?_without_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \ + myLDFLAGS="%{rpmldflags}" %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/lib %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -534,8 +605,12 @@ install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires install %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/rpm/compress-doc install %{SOURCE16} $RPM_BUILD_ROOT%{_libdir}/rpm/check-files -install scripts/find-php* $RPM_BUILD_ROOT%{_libdir}/rpm/ -install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_libdir}/rpm/ +install scripts/find-php* $RPM_BUILD_ROOT%{_libdir}/rpm +install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_libdir}/rpm + +install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder +install %{SOURCE31} $RPM_BUILD_ROOT%{_bindir}/adapter.awk +install %{SOURCE32} $RPM_BUILD_ROOT%{_bindir}/pldnotify.awk install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm @@ -547,28 +622,39 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <