Use %{_rpmconfigdir} throughout configuration macros and such
This commit is contained in:
Panu Matilainen
parent
eac0666a1f
commit
68230da9ce
40
macros.in
40
macros.in
|
|
@ -166,7 +166,7 @@
|
|||
# the script. See the script for details.
|
||||
#
|
||||
%__debug_install_post \
|
||||
@RPMCONFIGDIR@/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
|
||||
%{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
|
||||
%{nil}
|
||||
|
||||
# Template for debug information sub-package.
|
||||
|
|
@ -364,7 +364,7 @@ package or when debugging this package.\
|
|||
# Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not packaged.
|
||||
#
|
||||
# Note: Disable (by commenting out) for legacy compatibility.
|
||||
%__check_files @RPMCONFIGDIR@/check-files %{buildroot}
|
||||
%__check_files %{_rpmconfigdir}/check-files %{buildroot}
|
||||
|
||||
#
|
||||
# Should unpackaged files in a build root terminate a build?
|
||||
|
|
@ -461,10 +461,10 @@ print (t)\
|
|||
# Path to scripts to autogenerate package dependencies,
|
||||
#
|
||||
# Note: Used iff _use_internal_dependency_generator is zero.
|
||||
#%__find_provides @RPMCONFIGDIR@/rpmdeps --provides
|
||||
#%__find_requires @RPMCONFIGDIR@/rpmdeps --requires
|
||||
%__find_provides @RPMCONFIGDIR@/find-provides
|
||||
%__find_requires @RPMCONFIGDIR@/find-requires
|
||||
#%__find_provides %{_rpmconfigdir}/rpmdeps --provides
|
||||
#%__find_requires %{_rpmconfigdir}/rpmdeps --requires
|
||||
%__find_provides %{_rpmconfigdir}/find-provides
|
||||
%__find_requires %{_rpmconfigdir}/find-requires
|
||||
#%__find_conflicts ???
|
||||
#%__find_obsoletes ???
|
||||
|
||||
|
|
@ -472,23 +472,23 @@ print (t)\
|
|||
# Path to scripts to autogenerate per-interpreter package dependencies,
|
||||
#
|
||||
# Note: Used iff _use_internal_dependency_generator is non-zero. The
|
||||
# helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
|
||||
#%__perl_provides @RPMCONFIGDIR@/perldeps.pl --provides
|
||||
#%__perl_requires @RPMCONFIGDIR@/perldeps.pl --requires
|
||||
%__perl_provides @RPMCONFIGDIR@/perl.prov
|
||||
%__perl_requires @RPMCONFIGDIR@/perl.req
|
||||
# helpers are also used by %{_rpmconfigdir}/rpmdeps {--provides|--requires}.
|
||||
#%__perl_provides %{_rpmconfigdir}/perldeps.pl --provides
|
||||
#%__perl_requires %{_rpmconfigdir}/perldeps.pl --requires
|
||||
%__perl_provides %{_rpmconfigdir}/perl.prov
|
||||
%__perl_requires %{_rpmconfigdir}/perl.req
|
||||
|
||||
%__python_provides @RPMCONFIGDIR@/pythondeps.sh --provides
|
||||
%__python_requires @RPMCONFIGDIR@/pythondeps.sh --requires
|
||||
%__python_provides %{_rpmconfigdir}/pythondeps.sh --provides
|
||||
%__python_requires %{_rpmconfigdir}/pythondeps.sh --requires
|
||||
|
||||
%__mono_provides @RPMCONFIGDIR@/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir}
|
||||
%__mono_requires @RPMCONFIGDIR@/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir}
|
||||
%__mono_provides %{_rpmconfigdir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir}
|
||||
%__mono_requires %{_rpmconfigdir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir}
|
||||
|
||||
%__libtool_provides @RPMCONFIGDIR@/libtooldeps.sh --provides %{buildroot} %{name}
|
||||
%__libtool_requires @RPMCONFIGDIR@/libtooldeps.sh --requires %{buildroot} %{name}
|
||||
%__libtool_provides %{_rpmconfigdir}/libtooldeps.sh --provides %{buildroot} %{name}
|
||||
%__libtool_requires %{_rpmconfigdir}/libtooldeps.sh --requires %{buildroot} %{name}
|
||||
|
||||
%__pkgconfig_provides @RPMCONFIGDIR@/pkgconfigdeps.sh --provides
|
||||
%__pkgconfig_requires @RPMCONFIGDIR@/pkgconfigdeps.sh --requires
|
||||
%__pkgconfig_provides %{_rpmconfigdir}/pkgconfigdeps.sh --provides
|
||||
%__pkgconfig_requires %{_rpmconfigdir}/pkgconfigdeps.sh --requires
|
||||
|
||||
#==============================================================================
|
||||
# ---- Database configuration macros.
|
||||
|
|
@ -1188,7 +1188,7 @@ done \
|
|||
# ...
|
||||
# %files -f %{name}.lang
|
||||
#
|
||||
%find_lang @RPMCONFIGDIR@/find-lang.sh %{buildroot}
|
||||
%find_lang %{_rpmconfigdir}/find-lang.sh %{buildroot}
|
||||
|
||||
# Commands + opts to use for retrieving remote files
|
||||
%__urlhelpercmd @__CURL@
|
||||
|
|
|
|||
10
platform.in
10
platform.in
|
|
@ -53,10 +53,10 @@
|
|||
%__arch_install_post @ARCH_INSTALL_POST@
|
||||
|
||||
%__os_install_post \
|
||||
@RPMCONFIGDIR@/brp-compress \
|
||||
@RPMCONFIGDIR@/brp-strip \
|
||||
@RPMCONFIGDIR@/brp-strip-static-archive \
|
||||
@RPMCONFIGDIR@/brp-strip-comment-note \
|
||||
%{_rpmconfigdir}/brp-compress \
|
||||
%{_rpmconfigdir}/brp-strip \
|
||||
%{_rpmconfigdir}/brp-strip-static-archive \
|
||||
%{_rpmconfigdir}/brp-strip-comment-note \
|
||||
%{nil}
|
||||
|
||||
%__spec_install_post\
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
@mandrake@# XXX A copy of brp-mandrake, please. I'd suggest break down by
|
||||
@mandrake@# functionality rather than vendor <shrug>.
|
||||
@mandrake@%__os_install_post \
|
||||
@mandrake@ @RPMCONFIGDIR@/brp-mandrake \
|
||||
@mandrake@ %{_rpmconfigdir}/brp-mandrake \
|
||||
@mandrake@%{nil}
|
||||
@mandrake@
|
||||
@mandrake@# make
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ rpmbuild alias --without --define "_without_!#:+ --without-!#:+" \
|
|||
--POPTdesc=$"disable configure <option> for build" \
|
||||
--POPTargs=$"<option>"
|
||||
# Build policies enabled from command line. Last policy applies.
|
||||
rpmbuild alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
|
||||
rpmbuild alias --buildpolicy --define '__os_install_post %{_rpmconfigdir}/brp-!#:+' \
|
||||
--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
|
||||
--POPTargs=$"<policy>"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Perl specific macro definitions.
|
||||
# To make use of these macros insert the following line into your spec file:
|
||||
# %include @RPMCONFIGDIR@/macros.perl
|
||||
# %include %{_rpmconfigdir}/macros.perl
|
||||
|
||||
%define __find_requires @RPMCONFIGDIR@/find-perl-requires
|
||||
%define __find_provides @RPMCONFIGDIR@/find-perl-provides
|
||||
%define __find_requires %{_rpmconfigdir}/find-perl-requires
|
||||
%define __find_provides %{_rpmconfigdir}/find-perl-provides
|
||||
|
||||
%define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib)
|
||||
%define perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Perl specific macro definitions.
|
||||
# To make use of these macros insert the following line into your spec file:
|
||||
# %include @RPMCONFIGDIR@/macros.php
|
||||
# %include %{_rpmconfigdir}/macros.php
|
||||
|
||||
%define __find_requires @RPMCONFIGDIR@/find-php-requires
|
||||
%define __find_provides @RPMCONFIGDIR@/find-php-provides
|
||||
%define __find_requires %{_rpmconfigdir}/find-php-requires
|
||||
%define __find_provides %{_rpmconfigdir}/find-php-provides
|
||||
|
||||
%define php_pear_dir %{_datadir}/pear
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Python specific macro definitions.
|
||||
# To make use of these macros insert the following line into your spec file:
|
||||
# %include @RPMCONFIGDIR@/macros.python
|
||||
# %include %{_rpmconfigdir}/macros.python
|
||||
|
||||
# python main version
|
||||
%define py_ver %(echo `python -c "import sys; print sys.version[:3]"`)
|
||||
|
|
|
|||
Loading…
Reference in New Issue