--- macros.in.orig 2008-10-20 03:22:51.000000000 +0200 +++ macros.in 2008-02-29 09:25:14.000000000 +0100 @@ -186,7 +186,7 @@ %_dbpath_rebuild %{_dbpath} # -# Path to script that creates debug symbols in a /usr/lib/debug +# Path to script that creates debug symbols in a @prefix@/lib/debug # shadow tree. # # A spec file can %%define _find_debuginfo_opts to pass options to @@ -314,7 +314,7 @@ # %_install_helpers %{rpmhome}/helpers %_helperpath %{?_install_helpers:%{_install_helpers}:} -%_install_script_path %{_helperpath}/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin +%_install_script_path %{_helperpath}/sbin:@prefix@/bin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin # A colon separated list of desired locales to be installed; # "all" means install all locale specific files. @@ -791,7 +791,7 @@ # Export package NEVRA (stamped with install tid) info for HRMIB on this path. # # XXX Note: escaped %% for use in headerSprintf() -#%_hrmib_path /var/cache/hrmib/%{___NVRA} +#%_hrmib_path @prefix@/var/cache/hrmib/%{___NVRA} #============================================================================== # ---- GPG/PGP/PGP5 signature macros. @@ -879,13 +879,13 @@ # The path to the dependency universe database. The default value # is the rpmdb-vendor location. The macro is usually defined in # %{_etcrpm}/macros.solve, installed with the rpmdb-vendor package. -#%_solve_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm +#%_solve_dbpath @prefix@/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/rpm # The path to the dependency universe packages. This should # be a path to the packages contained in the solve database. # # XXX Note: needs a pesky trailing / -#%_solve_pkgsdir /mnt/rpm/test/latest-i386/RedHat/RPMS/ +#%_solve_pkgsdir @prefix@/src/%{_vendor}/RPMS/%{_arch}/ # The output binary package file name template used when suggesting # binary packages that solve a dependency. The macro is usually defined @@ -1064,7 +1064,7 @@ %_rpmds_perldeps_cmd %{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov # -%_varrun /var/run +%_varrun @prefix@/var/run #============================================================================== # ---- Cache configuration macros. @@ -1089,7 +1089,7 @@ %_bhA %{nil} # The cache database directory. -%_cache_dbpath /var/cache/yum/rpmdb +%_cache_dbpath @prefix@/var/cache/yum/rpmdb #============================================================================== # ---- per-platform macros. @@ -1328,7 +1328,7 @@ %_lib lib %_libdir %{_exec_prefix}/%{_lib} %_includedir %{_prefix}/include -%_oldincludedir /usr/include +%_oldincludedir @prefix@/include %_infodir %{_prefix}/info %_mandir %{_prefix}/man %_localedir %{_datadir}/locale @@ -1617,7 +1617,7 @@ # Note: Used iff _use_internal_dependency_generator is non-zero. The # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. %__java_provides %{_rpmhome}/javadeps.sh --provides -%__java_requires %{_rpmhome}/javadeps.sh --requires +#%__java_requires %{_rpmhome}/javadeps.sh --requires #------------------------------------------------------------------------ # libtool(...) configuration. @@ -1627,7 +1627,7 @@ # Note: Used iff _use_internal_dependency_generator is non-zero. The # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. %__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name} -%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name} +#%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name} #------------------------------------------------------------------------ # pkgconfig(...) configuration. @@ -1637,7 +1637,7 @@ # Note: Used iff _use_internal_dependency_generator is non-zero. The # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. %__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides -%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires +#%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires #------------------------------------------------------------------------ # mono(...) configuration. @@ -1658,7 +1658,7 @@ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. #%__executable_provides %{_rpmhome}/executabledeps.sh --provides #%__executable_requires %{_rpmhome}/executabledeps.sh --requires -%__scriptlet_requires %{__bash} --rpm-requires +#%__scriptlet_requires %{__bash} --rpm-requires # \endverbatim #*/