Ticket #22220: macros.in.rej

***************
*** 187,193 ****
  %_dbpath_rebuild      %{_dbpath}
  
  #
- #     Path to script that creates debug symbols in a /usr/lib/debug
  #     shadow tree.
  #
  #     A spec file can %%define _find_debuginfo_opts to pass options to
--- 187,193 ----
  %_dbpath_rebuild      %{_dbpath}
  
  #
+ #     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
***************
*** 315,321 ****
  #
  %_install_helpers %{rpmhome}/helpers
  %_helperpath  %{?_install_helpers:%{_install_helpers}:}
- %_install_script_path %{_helperpath}/sbin:/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.
--- 315,321 ----
  #
  %_install_helpers %{rpmhome}/helpers
  %_helperpath  %{?_install_helpers:%{_install_helpers}:}
+ %_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.
***************
*** 792,798 ****
  # 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}
  
  #==============================================================================
  # ---- GPG/PGP/PGP5 signature macros.
--- 792,798 ----
  # Export package NEVRA (stamped with install tid) info for HRMIB on this path.
  #
  # XXX Note: escaped %% for use in headerSprintf()
+ #%_hrmib_path @prefix@/var/cache/hrmib/%{___NVRA}
  
  #==============================================================================
  # ---- GPG/PGP/PGP5 signature macros.
***************
*** 880,892 ****
  #     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
  
  #     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/
  
  #     The output binary package file name template used when suggesting
  #     binary packages that solve a dependency. The macro is usually defined
--- 880,892 ----
  #     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       @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      @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
***************
*** 1065,1071 ****
  %_rpmds_perldeps_cmd  %{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
  
  #
- %_varrun              /var/run
  
  #==============================================================================
  # ---- Cache configuration macros.
--- 1065,1071 ----
  %_rpmds_perldeps_cmd  %{__find} %{_libdir}/perl5 | %{_rpmhome}/perl.prov
  
  #
+ %_varrun              @prefix@/var/run
  
  #==============================================================================
  # ---- Cache configuration macros.
***************
*** 1090,1096 ****
  %_bhA           %{nil}
  
  #     The cache database directory.
- %_cache_dbpath                /var/cache/yum/rpmdb
  
  #==============================================================================
  # ---- per-platform macros.
--- 1090,1096 ----
  %_bhA           %{nil}
  
  #     The cache database directory.
+ %_cache_dbpath                @prefix@/var/cache/yum/rpmdb
  
  #==============================================================================
  # ---- per-platform macros.
***************
*** 1329,1335 ****
  %_lib                 lib
  %_libdir              %{_exec_prefix}/%{_lib}
  %_includedir          %{_prefix}/include
- %_oldincludedir               /usr/include
  %_infodir             %{_prefix}/info
  %_mandir              %{_prefix}/man
  %_localedir           %{_datadir}/locale
--- 1329,1335 ----
  %_lib                 lib
  %_libdir              %{_exec_prefix}/%{_lib}
  %_includedir          %{_prefix}/include
+ %_oldincludedir               @prefix@/include
  %_infodir             %{_prefix}/info
  %_mandir              %{_prefix}/man
  %_localedir           %{_datadir}/locale
***************
*** 1618,1624 ****
  # 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
  
  #------------------------------------------------------------------------
  # libtool(...) configuration.
--- 1618,1624 ----
  # 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
  
  #------------------------------------------------------------------------
  # libtool(...) configuration.
***************
*** 1628,1634 ****
  # 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}
  
  #------------------------------------------------------------------------
  # pkgconfig(...) configuration.
--- 1628,1634 ----
  # 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}
  
  #------------------------------------------------------------------------
  # pkgconfig(...) configuration.
***************
*** 1638,1644 ****
  # 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
  
  #------------------------------------------------------------------------
  # mono(...) configuration.
--- 1638,1644 ----
  # 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
  
  #------------------------------------------------------------------------
  # mono(...) configuration.
***************
*** 1659,1665 ****
  # 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
  
  # \endverbatim
  #*/
--- 1659,1665 ----
  # 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
  
  # \endverbatim
  #*/