- added few macros defining some program paths

diff --git a/rpm-macros.patch b/rpm-macros.patch
index e0e14fe661323cc005c21071b26e62f1a86e395b..567b85261ac844f1d10932bdf509ebd0da9e443b 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,5 +1,37 @@
 --- rpm-4.4.9/macros.in        2008-04-04 23:15:28.121279270 +0300
 +++ rpm-4.5/macros.in  2008-09-03 16:47:30.861766714 +0300
+@@ -53,6 +53,7 @@
+ %__ditto              @__DITTO@
+ %__file                       @__FILE@
+ %__find                       @__FIND@
++%__git                        @__GIT@
+ %__gpg                        @__GPG@
+ %__grep                       @__GREP@
+ %__gzip                       @__GZIP@
+@@ -62,6 +62,7 @@
+ %__install_info               @__INSTALL_INFO@
+ %__ldconfig           @__LDCONFIG@
+ %__lua                        @__LUA@
++%__ln                 @__LN@
+ %__ln_s                       @LN_S@
+ %__lzma                       @__LZMA@
+ %__lzop                       @__LZOP@
+@@ -77,6 +78,7 @@
+ %__php                        @__PHP@
+ %__python             @__PYTHON@
+ %__rm                 @__RM@
++%__rmdir              @__RMDIR@
+ %__rsh                        @__RSH@
+ %__sed                        @__SED@
+ %__sh                 @__SH@
+@@ -87,6 +89,7 @@
+ %__unzip              @__UNZIP@
+ %__wget                       @__WGET@
+ %__xar                        @__XAR@
++%__xz                 @__XZ@
+ 
+ #==============================================================================
+ # ---- Build system path macros.
 @@ -109,6 +109,10 @@
  %__automake           automake
  %__autoconf           autoconf
@@ -149,6 +181,38 @@
  #*/
 --- rpm-4.5/configure.ac~      2008-06-10 02:03:07.000000000 +0300
 +++ rpm-4.5/configure.ac       2008-06-10 02:04:18.395836371 +0300
+@@ -246,6 +246,7 @@
+ AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
+ AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
+ AC_PATH_PROG(__FIND, find, %{_bindir}/find, $MYPATH)
++AC_PATH_PROG(__GIT, git, %{_bindir}/git, $MYPATH)
+ AC_PATH_PROG(__GPG, gpg, %{_bindir}/gpg, $MYPATH)
+ AC_PATH_PROG(__GREP, grep, /bin/grep, $MYPATH)
+ AC_PATH_PROG(__GZIP, gzip, /bin/gzip, $MYPATH)
+@@ -265,6 +265,7 @@
+ 
+ AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH)
+ AC_PATH_PROG(__INSTALL_INFO, install-info, /sbin/install-info, $MYPATH)
++AC_PATH_PROG(__LN, ln, /bin/ln, $MYPATH)
+ AC_PATH_PROG(__LDCONFIG, ldconfig, /sbin/ldconfig, $MYPATH)
+ AC_PATH_PROG(__LUA, lua, %{_bindir}/lua, $MYPATH)
+ AC_PATH_PROG(__LZMA, lzma, %{_bindir}/lzma, $MYPATH)
+@@ -290,6 +291,7 @@
+ AC_PATH_PROG(__PHP, php, %{_bindir}/php, $MYPATH)
+ AC_PATH_PROG(__PYTHON, python, %{_bindir}/python, $MYPATH)
+ AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
++AC_PATH_PROG(__RMDIR, rmdir, /bin/rmdir, $MYPATH)
+ AC_PATH_PROG(__RSH, rsh, %{_bindir}/rsh, $MYPATH)
+ AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
+ AC_PATH_PROG(__SH, sh, /bin/sh, $MYPATH)
+@@ -300,6 +302,7 @@
+ AC_PATH_PROG(__UNZIP, unzip, %{_bindir}/unzip, $MYPATH)
+ AC_PATH_PROG(__WGET, wget, %{_bindir}/wget, $MYPATH)
+ AC_PATH_PROG(__XAR, xar, %{_bindir}/xar, $MYPATH)
++AC_PATH_PROG(__XZ, xz, %{_bindir}/xz, $MYPATH)
+ 
+ AC_PATH_PROG(__LD, ld, %{_bindir}/ld, $MYPATH)
+ AC_PATH_PROG(__NM, nm, %{_bindir}/nm, $MYPATH)
 @@ -1479,7 +1479,7 @@
        [Full path to rpm system configuration directory (usually /etc/rpm)])
  AC_SUBST(SYSCONFIGDIR)

diff --git a/rpm.spec b/rpm.spec
index 1898db76244e27bdb45ed592d7856d5ffc9fe6ae..5fa200ddeda1089396cb9388c8c3767e818ea476 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -42,7 +42,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.5
-Release:       73
+Release:       74
 License:       LGPL
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz