From: jbj Date: Fri, 25 Feb 2000 16:29:44 +0000 (+0000) Subject: - fix: filter excluded paths before adding install prefixes (#8709). X-Git-Tag: rpm-4.4-release~2336 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=601d666d4825619b9ecd12b839efbe6b0ebe4516;p=platform%2Fupstream%2Frpm.git - fix: filter excluded paths before adding install prefixes (#8709). - add i18n lookaside to PO catalogue(s) for i18n strings. - try for /etc/rpm/macros.specspo so that specspo autoconfigures rpm. - per-platform configuration factored into /usr/lib/rpm subdir. CVS patchset: 3588 CVS date: 2000/02/25 16:29:44 --- diff --git a/.cvsignore b/.cvsignore index ce744d2..11bcc8b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -21,6 +21,7 @@ libtool ltconfig ltmain.sh macros +platform rpm rpm2cpio rpmconvert diff --git a/CHANGES b/CHANGES index 61c8951..7d3be74 100644 --- a/CHANGES +++ b/CHANGES @@ -59,6 +59,8 @@ - permit cli setting of build root policies. - fix: filter excluded paths before adding install prefixes (#8709). - add i18n lookaside to PO catalogue(s) for i18n strings. + - try for /etc/rpm/macros.specspo so that specspo autoconfigures rpm. + - per-platform configuration factored into /usr/lib/rpm subdir. 3.0.2 -> 3.0.3 - add --eval to find result of macro expansion. diff --git a/Makefile.am b/Makefile.am index fd117fa..87e3673 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,6 +80,7 @@ install-data-local: @$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SPECS @$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SRPMS @$(mkinstalldirs) $(DESTDIR)/var/tmp + ./installplatform ./rpmrc ./macros ./platform .PHONY: tar tar: diff --git a/autogen.sh b/autogen.sh index e94c2f8..d998e60 100755 --- a/autogen.sh +++ b/autogen.sh @@ -29,7 +29,7 @@ if [ "$1" = "--noconfigure" ]; then fi if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then - ./configure --prefix=/usr --enable-shared "$@" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var "$@" else ./configure "$@" fi diff --git a/configure.in b/configure.in index 07e8b9d..4828a24 100644 --- a/configure.in +++ b/configure.in @@ -903,7 +903,7 @@ dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE AC_CONFIG_SUBDIRS(popt) -AC_OUTPUT([Doxyfile Makefile rpmrc macros rpmpopt scripts/brp-redhat +AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat lib/Makefile build/Makefile tools/Makefile scripts/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile po/Makefile.in intl/Makefile diff --git a/installplatform b/installplatform new file mode 100755 index 0000000..6de6bc5 --- /dev/null +++ b/installplatform @@ -0,0 +1,33 @@ +#!/bin/sh + +DESTDIR="${DESTDIR:-/}" +pkglibdir="${pkglibdir:-/usr/lib/rpm}" + +RPMRC="${1:-rpmrc}" +MACROS="${2:-macros}" +PLATFORM="${3:-platform}" + +TEMPRC="/tmp/rpmrc.$$" +cat << E_O_F > $TEMPRC +include: $RPMRC +macrofiles: $MACROS +E_O_F + +RPM="rpm --rcfile $TEMPRC" + +ARCH="$($RPM --eval '%{_arch}')" +VENDOR="$($RPM --eval '%{_vendor}')" +OS="$($RPM --eval '%{_os}')" + +PPD="${DESTDIR}/${pkglibdir}/${ARCH}-${VENDOR}-${OS}" + +[ -d $PPD ] || mkdir $PPD + +RPMRC_OPTFLAGS="$($RPM --eval '%{optflags}')" +RPMRC_OPTFLAGS="$(echo $RPMRC_OPTFLAGS | sed -e 's, ,\ ,g')" + +cat $PLATFORM | + sed -e s,\\\$\{,\%\{_, \ + -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," > ${PPD}/macros + +rm $TEMPRC diff --git a/platform.in b/platform.in new file mode 100644 index 0000000..37fbe5e --- /dev/null +++ b/platform.in @@ -0,0 +1,46 @@ +# Per-platform rpm configuration file. + +#============================================================================== +# ---- per-platform macros. +# +%_arch @RPMCANONARCH@ +%_vendor @RPMCANONVENDOR@ +%_os @RPMCANONOS@ +%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os} +%optflags @RPMRC_OPTFLAGS@ + +#============================================================================== +# ---- configure macros. +# +%_prefix @prefix@ +%_exec_prefix @exec_prefix@ +%_bindir @bindir@ +%_sbindir @sbindir@ +%_libexecdir @libexecdir@ +%_datadir @datadir@ +%_sysconfdir @sysconfdir@ +%_sharedstatedir @sharedstatedir@ +%_localstatedir @localstatedir@ +%_libdir @libdir@ +%_includedir @includedir@ +%_oldincludedir @oldincludedir@ +%_infodir @infodir@ +%_mandir @mandir@ + +#============================================================================== +# ---- Build policy macros. +# +#------------------------------------------------------------------------ +# Expanded at end of %install (Red Hat uses these for 6.2) +# +#%__spec_install_post \ +# /usr/lib/rpm/brp-compress \ +# /usr/lib/rpm/brp-strip \ +# /usr/lib/rpm/brp-strip-comment-note \ +#%{nil} +#------------------------------------------------------------------------ +# Expanded at end of %prep (Red Hat uses these for 6.2) +# +%_fixowner [ `%{__id} -u` = '0' ] && %{__chown} -Rhf root +%_fixgroup [ `%{__id} -u` = '0' ] && %{__chgrp} -Rhf root +%_fixperms %{__chmod} -Rf a+rX,g-w,o-w diff --git a/rpm.spec b/rpm.spec index 5b3c144..d804a51 100644 --- a/rpm.spec +++ b/rpm.spec @@ -2,7 +2,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 3.0.4 Version: %{version} -Release: 0.44 +Release: 0.45 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -217,6 +217,12 @@ fi /usr/include/popt.h %changelog +* Fri Feb 25 2000 Jeff Johnson +- fix: filter excluded paths before adding install prefixes (#8709). +- add i18n lookaside to PO catalogue(s) for i18n strings. +- try for /etc/rpm/macros.specspo so that specspo autoconfigures rpm. +- per-platform configuration factored into /usr/lib/rpm subdir. + * Tue Feb 15 2000 Jeff Johnson - new rpm-build package to isolate rpm dependencies on perl/bash2. - always remove duplicate identical package entries on --rebuilddb. diff --git a/rpmrc.in b/rpmrc.in index 2f66b05..77bf1cd 100644 --- a/rpmrc.in +++ b/rpmrc.in @@ -1,4 +1,4 @@ -# $Id: rpmrc.in,v 2.16 1999/09/29 23:29:57 jbj Exp $ +# $Id: rpmrc.in,v 2.17 2000/02/25 16:29:44 jbj Exp $ ############################################################# @@ -255,10 +255,5 @@ buildarch_compat: atariclone: m68kmint noarch buildarch_compat: milan: m68kmint noarch buildarch_compat: hades: m68kmint noarch -############################################################# -#macrofiles: @RPMCONFIGDIR@/macros:@SYSCONFIGDIR@/macros:~/.rpmmacros - -macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros - -#include: @RPMCONFIGDIR@/%{_target}/rpmrc +macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros diff --git a/tools/.cvsignore b/tools/.cvsignore index 8167dd6..db94675 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -1,5 +1,6 @@ .deps .depend +.libs Makefile Makefile.in dump @@ -8,7 +9,7 @@ javadeps rpmarchive rpmgettext rpmheader +rpminject rpmlead rpmputtext rpmsignature -.libs