diff options
| -rw-r--r-- | Library/Formula/rpm.rb | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/Library/Formula/rpm.rb b/Library/Formula/rpm.rb index 0fcc5574c..bd025575e 100644 --- a/Library/Formula/rpm.rb +++ b/Library/Formula/rpm.rb @@ -20,10 +20,10 @@ end class Rpm < Formula homepage 'http://www.rpm5.org/' - url 'http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm', + url 'http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.11-0.20130708.src.rpm', :using => RpmDownloadStrategy, :name => 'rpm' - version '5.4.10' - sha1 'ce43b5871c4f884bea679f6c37d5cb9df7f2e520' + version '5.4.11' + sha1 'a40328cf49f43d33746c503a390e3955f5bd3680' depends_on 'berkeley-db' depends_on 'libmagic' @@ -36,11 +36,9 @@ class Rpm < Formula depends_on 'ossp-uuid' depends_on 'pcre' depends_on 'rpm2cpio' => :build - depends_on 'libtool' => :build - # nested functions are not std C def patches - 'http://rpm5.org/cvs/patchset?cn=16840' + { :p0 => DATA } if MacOS.version >= :mountain_lion end def install @@ -52,19 +50,41 @@ class Rpm < Formula --disable-openmp --disable-nls --disable-dependency-tracking - --with-libtasn1 - --with-neon - --with-uuid - --with-pcre - --with-lua - --with-syck + --with-db=external + --with-file=external + --with-popt=external + --with-beecrypt=external + --with-libtasn1=external + --with-neon=external + --with-uuid=external + --with-pcre=external + --with-lua=internal + --with-syck=internal --without-apidocs varprefix=#{var} ] - system 'glibtoolize -if' # needs updated ltmain.sh system "./configure", *args system "make" system "make install" end end + +__END__ +diff -u -rrpm-5_4_11-release -rrpm-5_4 +--- system.h 26 Jul 2012 12:56:08 -0000 2.129.2.5 ++++ system.h 9 Aug 2013 10:30:22 -0000 2.129.2.8 +@@ -323,7 +323,13 @@ + #endif + + #if defined(HAVE_GRP_H) ++#define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */ ++#define uuid_create unistd_uuid_create ++#define uuid_compare unistd_uuid_compare + #include <grp.h> ++#undef unistd_uuid_t /* XXX Mac OS X dares to be different. */ ++#undef unistd_uuid_create ++#undef unistd_uuid_compare + #endif + + #if defined(HAVE_LIMITS_H) |