rpm 5.4.14

Closes Homebrew/homebrew#23827.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
master
Devin Bayer 2013-10-31 11:50:19 +01:00 committed by Mike McQuaid
parent f2fcf50d7e
commit 2c9a8a864d
1 changed files with 6 additions and 27 deletions

View File

@ -19,10 +19,10 @@ end
class Rpm < Formula
homepage 'http://www.rpm5.org/'
url 'http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.11-0.20130708.src.rpm',
url 'http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm',
:using => RpmDownloadStrategy
version '5.4.11'
sha1 'a40328cf49f43d33746c503a390e3955f5bd3680'
version '5.4.14'
sha1 'ea1a5f073ba4923d32f98b4e95a3f2555824f22c'
depends_on 'berkeley-db'
depends_on 'libmagic'
@ -36,17 +36,14 @@ class Rpm < Formula
depends_on 'pcre'
depends_on 'rpm2cpio' => :build
def patches
{ :p0 => DATA } if MacOS.version >= :mountain_lion
end
def install
args = %W[
--prefix=#{prefix}
--localstatedir=#{var}
--with-path-cfg=#{etc}/rpm
--with-path-magic=#{share}/misc/magic
--with-path-magic=#{HOMEBREW_PREFIX}/opt/libmagic/share/misc/magic
--with-extra-path-macros=#{lib}/rpm/macros.*
--with-libiconv-prefix=/usr
--disable-openmp
--disable-nls
--disable-dependency-tracking
@ -59,6 +56,7 @@ class Rpm < Formula
--with-uuid=external
--with-pcre=external
--with-lua=internal
--with-sqlite=external
--with-syck=internal
--without-apidocs
varprefix=#{var}
@ -69,22 +67,3 @@ class Rpm < Formula
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)