sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce /usr/lib/rpm/macros.d/ (ALT#17948)

Browse Source
This commit is contained in:
Дмитрий Левин 2008-11-20 23:50:00 +00:00
parent d2f32045b0
commit d975fc66c1
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -943,7 +943,7 @@ AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
[Full path to rpm system configuration directory (usually /etc/rpm)]) [Full path to rpm system configuration directory (usually /etc/rpm)])
AC_SUBST(SYSCONFIGDIR) AC_SUBST(SYSCONFIGDIR)
MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target_platform}/macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/macros.specspo:${SYSCONFIGDIR}/macros.db1:${SYSCONFIGDIR}/%{_target_platform}/macros:~/.rpmmacros" MACROFILES="${RPMCONFIGDIR}/macros:${RPMCONFIGDIR}/%{_target}/macros:${RPMCONFIGDIR}/macros.d/*:${SYSCONFIGDIR}/macros.specspo:${SYSCONFIGDIR}/macros.db1:${SYSCONFIGDIR}/macros.cdb:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:${SYSCONFIGDIR}/macros.d/*:~/.rpmmacros"
AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES", AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
[Colon separated paths of macro files to read.]) [Colon separated paths of macro files to read.])
AC_SUBST(MACROFILES) AC_SUBST(MACROFILES)

2
platform.in
View File

@ -260,7 +260,7 @@
@alt@ \ @alt@ \
@alt@ export MAKEFLAGS=\"-w PAM_SO_SUFFIX=%{?_pam_so_suffix}\"\ @alt@ export MAKEFLAGS=\"-w PAM_SO_SUFFIX=%{?_pam_so_suffix}\"\
@alt@ \ @alt@ \
@alt@ %{expand:%(cat @SYSCONFIGDIR@/macros.d/*.env)}\ @alt@ %{expand:%(cat @RPMCONFIGDIR@/macros.d/*.env @SYSCONFIGDIR@/macros.d/*.env 2>/dev/null)}\
@alt@ \ @alt@ \
@alt@ %{verbose:set -x}%{!verbose:exec > /dev/null}\ @alt@ %{verbose:set -x}%{!verbose:exec > /dev/null}\
@alt@ umask 022\ @alt@ umask 022\

12
rpm-4_0.spec
View File

@ -31,12 +31,10 @@ Group: System/Configuration/Packaging
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Packager: Dmitry V. Levin <ldv@altlinux.org> Packager: Dmitry V. Levin <ldv@altlinux.org>
# 1. ftp://ftp.rpm.org/pub/rpm/dist/ # http://git.altlinux.org/people/ldv/packages/?p=rpm.git
# 2. cvs -d :pserver:anonymous@cvs.rpm.org:/cvs/devel export -r rpm-4_0 rpm
# 3. ALT Linux CVS
Source: %srcname.tar Source: %srcname.tar
Provides: %_sysconfdir/%name/macros.d Provides: %_rpmlibdir/macros.d, %_sysconfdir/%name/macros.d
PreReq: lib%name = %version-%release, librpmbuild = %version-%release PreReq: lib%name = %version-%release, librpmbuild = %version-%release
PreReq: alt-gpgkeys, coreutils, /bin/sh PreReq: alt-gpgkeys, coreutils, /bin/sh
@ -271,7 +269,7 @@ chmod a-w %buildroot%_usrsrc/RPM{,/RPMS/*}
#mkdir -p %buildroot%_sysconfdir/logrotate.d #mkdir -p %buildroot%_sysconfdir/logrotate.d
#install -p -m640 scripts/%name.log %buildroot%_sysconfdir/logrotate.d/%name #install -p -m640 scripts/%name.log %buildroot%_sysconfdir/logrotate.d/%name
mkdir -p %buildroot%_sysconfdir/%name/macros.d mkdir -p %buildroot{%_rpmlibdir/macros.d,%_sysconfdir/%name/macros.d}
touch %buildroot%_sysconfdir/%name/macros touch %buildroot%_sysconfdir/%name/macros
cat << E_O_F > %buildroot%_sysconfdir/%name/macros.db1 cat << E_O_F > %buildroot%_sysconfdir/%name/macros.db1
%%_dbapi 1 %%_dbapi 1
@ -415,6 +413,7 @@ fi
#%config(noreplace,missingok) %_sysconfdir/cron.daily/%name #%config(noreplace,missingok) %_sysconfdir/cron.daily/%name
#%config(noreplace,missingok) %_sysconfdir/logrotate.d/%name #%config(noreplace,missingok) %_sysconfdir/logrotate.d/%name
%rpmdirattr %_rpmlibdir/macros.d
%dir %_sysconfdir/%name %dir %_sysconfdir/%name
%dir %_sysconfdir/%name/macros.d %dir %_sysconfdir/%name/macros.d
%config(noreplace,missingok) %_sysconfdir/%name/macros %config(noreplace,missingok) %_sysconfdir/%name/macros
@ -451,7 +450,6 @@ fi
%_bindir/rpminit %_bindir/rpminit
%_bindir/rpm*cmp %_bindir/rpm*cmp
%rpmdirattr %_rpmlibdir
%rpmattr %_rpmlibdir/delayed_rebuilddb %rpmattr %_rpmlibdir/delayed_rebuilddb
%rpmattr %_rpmlibdir/pdeath_execute %rpmattr %_rpmlibdir/pdeath_execute
%rpmattr %_rpmlibdir/rpm[dikq] %rpmattr %_rpmlibdir/rpm[dikq]
@ -477,7 +475,6 @@ fi
%rpmattr %_bindir/gendiff %rpmattr %_bindir/gendiff
%_bindir/rpmbuild %_bindir/rpmbuild
%_bindir/relative %_bindir/relative
%rpmdirattr %_rpmlibdir
%_rpmlibdir/rpmt %_rpmlibdir/rpmt
%rpmattr %_rpmlibdir/rpmb %rpmattr %_rpmlibdir/rpmb
%rpmattr %_rpmlibdir/dump_ld_config %rpmattr %_rpmlibdir/dump_ld_config
@ -532,7 +529,6 @@ fi
%if_with contrib %if_with contrib
%files contrib %files contrib
%rpmattr %dir %_rpmlibdir
%rpmattr %_rpmlibdir/cpanflute* %rpmattr %_rpmlibdir/cpanflute*
%rpmattr %_rpmlibdir/cross-build %rpmattr %_rpmlibdir/cross-build
%rpmattr %_rpmlibdir/find-prov.pl %rpmattr %_rpmlibdir/find-prov.pl

2
rpmrc.in
View File

@ -420,7 +420,7 @@ buildarch_compat: ia64: noarch
buildarch_compat: s390: noarch buildarch_compat: s390: noarch
buildarch_compat: s390x: noarch buildarch_compat: s390x: noarch
macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros.cdb:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.d/*:~/.rpmmacros macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@RPMCONFIGDIR@/macros.d/*:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros.cdb:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.d/*:~/.rpmmacros
# \endverbatim # \endverbatim
#*/ #*/

2
scripts/0common-files.req.list
View File

@ -23,3 +23,5 @@
/etc/tex-fonts.d tetex-core /etc/tex-fonts.d tetex-core
/etc/udev/rules.d udev-rules /etc/udev/rules.d udev-rules
/etc/xinetd.d xinetd /etc/xinetd.d xinetd
/usr/lib/rpm librpm
/usr/lib/rpm/macros.d rpm