SPECS (AC-branch): rpm.spec - merged fro HEAD - version 4.4.1 - re...
baggins
baggins at pld-linux.org
Fri Jun 17 16:43:35 CEST 2005
Author: baggins Date: Fri Jun 17 14:43:35 2005 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged fro HEAD
- version 4.4.1
- release 0.1
- please STBR test
---- Files affected:
SPECS:
rpm.spec (1.555.2.67 -> 1.555.2.68)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.67 SPECS/rpm.spec:1.555.2.68
--- SPECS/rpm.spec:1.555.2.67 Mon Jun 6 10:24:54 2005
+++ SPECS/rpm.spec Fri Jun 17 16:43:30 2005
@@ -1,20 +1,24 @@
# $Revision$, $Date$
#
+# TODO:
+# - python(abi) cap is not provided automatically (because /usr/bin/python matches
+# 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)
+#
# Conditional build:
-%bcond_with static # build static rpmi (not supported at the moment)
-%bcond_without doc # don't generate documentation with doxygen
-%bcond_without python # don't build python bindings
-%bcond_without selinux # dont enable selinux support
-%bcond_with distver # enable distversion patch
+%bcond_with static # build static rpmi (not supported at the moment)
+%bcond_without apidoc # don't generate documentation with doxygen
+%bcond_without autoreqdep # autogenerate package name deps in addition to sonames/perl(X)
+%bcond_without python # don't build python bindings
+%bcond_without selinux # build without selinux support
# 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 20040107
# versions of required libraries
%define reqdb_ver 4.2.50-1
-%define reqpopt_ver 1.9
+%define reqpopt_ver 1.10.1
%define beecrypt_ver 3.0.0-0.20030610.1
%define rpm_macros_rev 1.222
Summary: RPM Package Manager
@@ -25,14 +29,13 @@
Summary(ru): íĹÎĹÄÖĹŇ ĐÁËĹÔĎ× ĎÔ RPM
Summary(uk): íĹÎĹÄÖĹŇ ĐÁËĹÔŚ× ×ŚÄ RPM
Name: rpm
-%define ver 4.3
-Version: %{ver}
-Release: 0.%{snap}.62%{?with_distver:+distver}
+%define sover 4.4
+Version: 4.4.1
+Release: 0.1
License: GPL
Group: Base
-#Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
-Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.%{snap}.tar.bz2
-# Source0-md5: c1bc4a2ae441fbd4da8dd90149bab2f2
+Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
+# Source0-md5: 90ded9047b1b69d918c6c7c7b56fd7a9
Source1: %{name}.groups
Source2: %{name}.platform
Source3: %{name}-install-tree
@@ -58,51 +61,44 @@
Patch3: %{name}-rpmpopt.patch
Patch4: %{name}-perl-macros.patch
Patch5: %{name}-perl-req-perlfile.patch
-Patch6: %{name}-glob.patch
-Patch7: %{name}-noexpand.patch
-Patch8: %{name}-scripts-closefds.patch
-Patch9: %{name}-python-macros.patch
-Patch10: %{name}-gettext-in-header.patch
-Patch11: %{name}-compress-doc.patch
-Patch12: %{name}-build.patch
-Patch13: %{name}-system_libs.patch
-Patch14: %{name}-bb-and-short-circuit.patch
-Patch15: %{name}-etc_dir.patch
-Patch16: %{name}-system_libs-more.patch
-Patch17: %{name}-php-deps.patch
-Patch18: %{name}-python-fix.patch
-Patch19: %{name}-ldconfig-always.patch
-Patch20: %{name}-perl_req.patch
-Patch21: %{name}-no-bin-env.patch
-Patch22: %{name}-magic-usesystem.patch
-Patch23: %{name}-dontneedutils.patch
-Patch24: %{name}-provides-dont-obsolete.patch
-Patch25: %{name}-examplesaredoc.patch
-Patch26: %{name}-po.patch
-Patch27: %{name}-amd64.patch
-Patch28: %{name}-notsc.patch
-Patch29: %{name}-hack-norpmlibdep.patch
-Patch30: %{name}-makefile-no_myLDADD_deps.patch
-Patch31: %{name}-libdir64.patch
-Patch32: %{name}-libdir-links.patch
-Patch33: %{name}-context.patch
-Patch34: %{name}-nls-fixes.patch
-Patch35: %{name}-missing-prototypes.patch
-Patch36: %{name}-pld-autodep.patch
-Patch37: %{name}-rpmsq.patch
-Patch38: %{name}-file-readelf.patch
-Patch39: %{name}-pentiumX.patch
-Patch40: %{name}-epoch0.patch
-Patch41: %{name}-file-readelf-fix.patch
-Patch42: %{name}-cpuid.patch
-Patch43: %{name}-perl_req-INC_dirs.patch
-Patch44: %{name}-debuginfo.patch
-Patch45: %{name}-no_version_check_in_obsoletes.patch
-Patch46: %{name}-python24.patch
-Patch47: %{name}-distver.patch
-Patch48: %{name}-python24-dictiter.patch
-Patch49: %{name}-patch-quote.patch
-Patch50: %{name}-getcwd.patch
+Patch6: %{name}-noexpand.patch
+Patch7: %{name}-scripts-closefds.patch
+Patch8: %{name}-python-macros.patch
+Patch9: %{name}-gettext-in-header.patch
+Patch10: %{name}-compress-doc.patch
+Patch11: %{name}-build.patch
+Patch12: %{name}-system_libs.patch
+Patch13: %{name}-bb-and-short-circuit.patch
+Patch14: %{name}-etc_dir.patch
+Patch15: %{name}-system_libs-more.patch
+Patch16: %{name}-php-deps.patch
+Patch17: %{name}-ldconfig-always.patch
+Patch18: %{name}-perl_req.patch
+Patch19: %{name}-no-bin-env.patch
+Patch20: %{name}-magic-usesystem.patch
+Patch21: %{name}-dontneedutils.patch
+Patch22: %{name}-provides-dont-obsolete.patch
+Patch23: %{name}-examplesaredoc.patch
+Patch24: %{name}-po.patch
+Patch25: %{name}-getcwd.patch
+Patch26: %{name}-notsc.patch
+Patch27: %{name}-hack-norpmlibdep.patch
+Patch28: %{name}-makefile-no_myLDADD_deps.patch
+Patch29: %{name}-libdir64.patch
+Patch30: %{name}-libdir-links.patch
+Patch31: %{name}-missing-prototypes.patch
+Patch32: %{name}-pld-autodep.patch
+Patch33: %{name}-rpmsq.patch
+Patch34: %{name}-epoch0.patch
+Patch35: %{name}-perl_req-INC_dirs.patch
+Patch36: %{name}-debuginfo.patch
+Patch37: %{name}-doxygen_hack.patch
+Patch38: %{name}-gcc4.patch
+Patch39: %{name}-pythondeps.patch
+Patch40: %{name}-print-requires.patch
+Patch41: %{name}-reduce-stack-usage.patch
+Patch42: %{name}-amd64.patch
+Patch43: %{name}-patch-quote.patch
URL: http://www.rpm.org/
Icon: rpm.gif
BuildRequires: autoconf >= 2.52
@@ -110,19 +106,23 @@
BuildRequires: beecrypt-devel >= %{beecrypt_ver}
BuildRequires: bzip2-devel >= 1.0.1
BuildRequires: db-devel >= %{reqdb_ver}
-%{?with_doc:BuildRequires: doxygen}
+%{?with_apidoc:BuildRequires: doxygen}
BuildRequires: elfutils-devel
BuildRequires: findutils
BuildRequires: gettext-devel >= 0.11.4-2
+BuildRequires: home-etc-devel
#BuildRequires: libmagic-devel
-%{?with_selinux:BuildRequires: libselinux-devel}
+%{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
# needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
BuildRequires: libstdc++-devel
BuildRequires: libtool
+BuildRequires: libxml2-devel
+BuildRequires: neon-devel >= 0.24.7-3
BuildRequires: patch >= 2.2
BuildRequires: popt-devel >= %{reqpopt_ver}
%{?with_python:BuildRequires: python-devel >= 2.2}
BuildRequires: python-modules >= 2.2
+BuildRequires: readline-devel
BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
BuildRequires: zlib-devel
@@ -134,10 +134,11 @@
BuildRequires: glibc-static >= 2.2.94
BuildRequires: elfutils-static
#BuildRequires: libmagic-static
-%{?with_selinux:BuildRequires: libselinux-static}
+%{?with_selinux:BuildRequires: libselinux-static >= 1.18}
BuildRequires: popt-static >= %{reqpopt_ver}
BuildRequires: zlib-static
%endif
+Requires: beecrypt >= %{beecrypt_ver}
Requires: popt >= %{reqpopt_ver}
Requires: %{name}-lib = %{version}-%{release}
%{!?with_static:Obsoletes: rpm-utils-static}
@@ -151,7 +152,8 @@
# 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 __cc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
@@ -209,6 +211,22 @@
ÓĚŐÖÂĎ×ϧ ŚÎĆĎŇÍÁĂŚ§, ÝĎ ÍŚÓÔÉÔŘ ÎÁÚ×Ő, ×ĹŇÓŚŔ, ĎĐÉÓ ÔÁ ŚÎŰŐ
ŚÎĆĎŇÍÁĂŚŔ ĐŇĎ ĐÁËĹÔ.
+%package lib
+Summary: RPMs library
+Summary(pl): Biblioteki RPM-a
+Group: Libraries
+Requires: db >= %{reqdb_ver}
+Requires: popt >= %{reqpopt_ver}
+Obsoletes: rpm-libs
+# avoid SEGV caused by mixed db versions
+Conflicts: poldek < 0.18.1-16
+
+%description lib
+RPMs library.
+
+%description lib -l pl
+Biblioteki RPM-a.
+
%package devel
Summary: Header files for rpm libraries
Summary(de): Header-Dateien für rpm Libraries
@@ -363,104 +381,6 @@
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}-%{release}
-Requires: perl-devel
-Requires: perl-modules
-
-%description perlprov
-Additional utilities for checking perl provides/requires in rpm
-packages.
-
-%description perlprov -l de
-Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.
-
-%description perlprov -l pl
-Dodatkowe narzędzia do sprawdzenia zależności skryptów perla w
-pakietach rpm.
-
-%package pythonprov
-Summary: Python macros, which simplifies creation of rpm packages with Python software
-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
-
-%description pythonprov
-Python macros, which simplifies creation of rpm packages with Python
-software.
-
-%description pythonprov -l pl
-Makra ułatwiające tworzenie pakietów rpm z programami napisanymi w
-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
-Group: Applications/File
-Requires: %{name} = %{version}-%{release}
-
-%description php-pearprov
-Additional utilities for checking php pear provides/requires in rpm
-packages.
-
-%description php-pearprov -l pl
-Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w
-pakietach rpm.
-
-%package -n python-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: Development/Languages/Python
-Requires: %{name} = %{version}-%{release}
-%pyrequires_eq python
-Obsoletes: rpm-python
-
-%description -n python-rpm
-The rpm-python package contains a module which permits applications
-written in the Python programming language to use the interface
-supplied by RPM (RPM Package Manager) libraries.
-
-This package should be installed if you want to develop Python
-programs that will manipulate RPM packages and databases.
-
-%description -n python-rpm -l pl
-Pakiet rpm-python zawiera moduł, który pozwala aplikacjom napisanym w
-Pythonie na używanie interfejsu dostarczanego przez biblioteki RPM-a.
-
-Pakiet ten powinien zostać zainstalowany, jeśli chcesz pisać w
-Pythonie programy manipulujące pakietami i bazami danych rpm.
-
-%description -n python-rpm -l pt_BR
-O pacote rpm-python contém um módulo que permite que aplicaçőes
-escritas em Python utilizem a interface fornecida pelas bibliotecas
-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}
-Obsoletes: rpm-libs
-%{?with_distver:Provides: rpm-lib(distver)}
-# avoid SEGV caused by mixed db versions
-Conflicts: poldek < 0.18.1-16
-
-%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
@@ -479,7 +399,7 @@
Requires: cpio
Requires: diffutils
Requires: elfutils
-Requires: file >= 4.01
+Requires: file >= 4.13-2
Requires: fileutils
Requires: findutils
%ifarch athlon
@@ -499,7 +419,7 @@
Requires: textutils
Provides: rpmbuild(macros) = %{rpm_macros_rev}
Provides: rpmbuild(noauto) = 3
-%ifarch amd64
+%ifarch %{x8664}
Conflicts: automake < 1:1.7.9-2
Conflicts: libtool < 2:1.5-13
%endif
@@ -559,12 +479,106 @@
ňŚÚÎĎÍÁÎŚÔÎŚ ÄĎĐĎÍŚÖÎŚ ÓËŇÉĐÔÉ ÔÁ ŐÔÉĚŚÔÉ, ŃËŚ ×ÉËĎŇÉÓÔĎ×ŐŔÔŘÓŃ ÄĚŃ
ĐĎÂŐÄĎ×É RPM'Ś×.
+%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}-%{release}
+Requires: perl-devel
+Requires: perl-modules
+
+%description perlprov
+Additional utilities for checking perl provides/requires in rpm
+packages.
+
+%description perlprov -l de
+Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.
+
+%description perlprov -l pl
+Dodatkowe narzędzia do sprawdzenia zależności skryptów perla w
+pakietach rpm.
+
+%package pythonprov
+Summary: Python macros, which simplifies creation of rpm packages with Python software
+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
+
+%description pythonprov
+Python macros, which simplifies creation of rpm packages with Python
+software.
+
+%description pythonprov -l pl
+Makra ułatwiające tworzenie pakietów rpm z programami napisanymi w
+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
+Group: Applications/File
+Requires: %{name} = %{version}-%{release}
+
+%description php-pearprov
+Additional utilities for checking php pear provides/requires in rpm
+packages.
+
+%description php-pearprov -l pl
+Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w
+pakietach rpm.
+
+%package -n python-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: Development/Languages/Python
+Requires: %{name} = %{version}-%{release}
+%pyrequires_eq python
+Obsoletes: rpm-python
+
+%description -n python-rpm
+The rpm-python package contains a module which permits applications
+written in the Python programming language to use the interface
+supplied by RPM (RPM Package Manager) libraries.
+
+This package should be installed if you want to develop Python
+programs that will manipulate RPM packages and databases.
+
+%description -n python-rpm -l pl
+Pakiet rpm-python zawiera moduł, który pozwala aplikacjom napisanym w
+Pythonie na używanie interfejsu dostarczanego przez biblioteki RPM-a.
+
+Pakiet ten powinien zostać zainstalowany, jeśli chcesz pisać w
+Pythonie programy manipulujące pakietami i bazami danych rpm.
+
+%description -n python-rpm -l pt_BR
+O pacote rpm-python contém um módulo que permite que aplicaçőes
+escritas em Python utilizem a interface fornecida pelas bibliotecas
+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 apidocs
+Summary: RPM API documentation and guides
+Summary(pl): Documentacja API RPM-a i przewodniki
+Group: Documentation
+
+%description apidocs
+Documentation for RPM API and guides in HTML format generated
+from rpm sources by doxygen.
+
+%description apidocs -l pl
+Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane
+ze źrodeł RPM-a przez doxygen.
+
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+# temporarily moved after patch0 - messes too much in pl.po
+#%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -581,8 +595,6 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
-%patch20 -p1
-%patch21 -p1
sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
cp -f platform.in macros.pld.in
echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -595,6 +607,8 @@
install %{SOURCE10} scripts/php.req.in
install %{SOURCE12} scripts/perl.prov
cat %{SOURCE11} >> macros.in
+%patch20 -p1
+%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
@@ -608,7 +622,7 @@
%patch32 -p1
%patch33 -p1
%patch34 -p1
-%patch35 -p1
+%patch35 -p0
%patch36 -p1
%patch37 -p1
%patch38 -p1
@@ -616,16 +630,9 @@
%patch40 -p1
%patch41 -p1
%patch42 -p1
-%patch43 -p0
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%{?with_distver:%patch47 -p1}
-%if "%{py_ver}" == "2.4"
-%patch48 -p1
-%endif
-%patch49 -p1
-%patch50 -p1
+%patch43 -p1
+%patch0 -p1
+%patch3 -p1
cd scripts;
mv -f perl.req perl.req.in
@@ -635,7 +642,7 @@
mv -f po/{no,nb}.po
mv -f po/{sr,sr at Latn}.po
-rm -rf zlib libelf db db3 popt rpmdb/db.h
+rm -rf neon zlib libelf db db3 popt rpmdb/db.h
# generate Group translations to *.po
awk -f %{SOURCE6} %{SOURCE1}
@@ -672,16 +679,15 @@
-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.
-# Use internal glob due to change in glibc glob(): https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126460.
+# 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-glob \
- %{?with_doc:--with-apidocs} \
+ %{?with_apidoc:--with-apidocs} \
+ %{?with_pkgnameinautoreq:--enable-adding-packages-names-in-autogenerated-dependancies} \
%{?with_python:--with-python=auto} \
%{!?with_python:--without-python} \
%{!?with_selinux:--without-selinux} \
@@ -696,9 +702,11 @@
# %{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \
+%{?with_apidocs:%{__make} doxygen}
+
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm}
+install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -726,7 +734,6 @@
install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder
install %{SOURCE31} $RPM_BUILD_ROOT%{_bindir}/adapter.awk
install %{SOURCE32} $RPM_BUILD_ROOT%{_bindir}/pldnotify.awk
-
install %{SOURCE33} $RPM_BUILD_ROOT%{_bindir}/banner.sh
install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
@@ -767,15 +774,15 @@
# global list of capabilities (SONAME, perl(module), php(module) regexps)
# which don't generate dependencies on package NAMES
# -- OpenGL implementation
-^libGL.so.1$
-^libGLU.so.1$
+^libGL.so.1
+^libGLU.so.1
^libOSMesa.so
# -- Glide
-^libglide3.so.3$
+^libglide3.so.3
# -- mozilla
-^libgtkmozembed.so$
-^libgtksuperwin.so$
-^libxpcom.so$
+^libgtkmozembed.so
+^libgtksuperwin.so
+^libxpcom.so
# -- X11 implementation
^libFS.so
^libI810XvMC.so
@@ -785,8 +792,13 @@
^libXRes.so
^libXTrap.so
^libXaw.so
+^libXcomposite.so
^libXcursor.so
+^libXdamage.so
+^libXdmcp.so
+^libXevie.so
^libXext.so
+^libXfixes.so
^libXfont.so
^libXfontcache.so
^libXft.so
@@ -819,14 +831,18 @@
EOF
# for rpm -e|-U --repackage
-install -d $RPM_BUILD_ROOT/var/spool/repackage
+install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm}
+touch $RPM_BUILD_ROOT/var/lock/rpm/transaction
# move libs to /lib
-for a in librpm-%{ver}.so librpmdb-%{ver}.so librpmio-%{ver}.so ; do
+for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so ; do
mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/%{_lib}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.67&r2=1.555.2.68&f=u
More information about the pld-cvs-commit
mailing list