[genders] new patch imported from Debian

3 files changed, 27 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d507545d0432..a6bca95ef2f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = genders
 	pkgdesc = Static cluster configuration database used for cluster configuration management.
-	pkgver = 1.20
+	pkgver = 1.21
 	pkgrel = 1
 	url = https://computing.llnl.gov/linux/genders.html
 	arch = x86_64
 	arch = i686
 	license = GPL
 	options = !makeflags
-	source = http://sourceforge.net/projects/genders/files/genders/1.20-1/genders-1.20.tar.gz
+	source = http://sourceforge.net/projects/genders/files/genders/1.21-1/genders-1.21.tar.gz
 	source = 624078.patch
-	md5sums = 26a3bc4b6d5eeae3ade7b719c6165d85
-	md5sums = 76431ec248c0ee9a2d1b9971cc13ce57
+	md5sums = 8915780924dc4fa83432ea1c25907835
+	md5sums = 4c5c7b85ee0641a66e885b647fd669fd
 
 pkgname = genders
 
diff --git a/624078.patch b/624078.patch
index ec7a692529eb..a96cb87eea8a 100644
--- a/624078.patch
+++ b/624078.patch
@@ -1,7 +1,7 @@
-diff -Nru genders-1.20.old/configure.ac genders-1.20/configure.ac
---- genders-1.20.old/configure.ac	2012-08-15 16:58:20.000000000 -0500
-+++ genders-1.20/configure.ac	2013-05-04 23:15:03.834998392 -0500
-@@ -65,6 +65,7 @@
+diff -Nru genders-1.21.orig/configure.ac genders-1.21/configure.ac
+--- genders-1.21.orig/configure.ac	2013-01-28 18:03:04.000000000 -0600
++++ genders-1.21/configure.ac	2014-07-05 18:11:02.314411959 -0500
+@@ -72,6 +72,7 @@
  # Checks for programs.
  ##
  AC_PROG_CC
@@ -9,9 +9,9 @@ diff -Nru genders-1.20.old/configure.ac genders-1.20/configure.ac
  AC_PROG_CXX
  AC_PROG_LIBTOOL
  AC_PROG_MAKE_SET
-diff -Nru genders-1.20.old/Makefile.am genders-1.20/Makefile.am
---- genders-1.20.old/Makefile.am	2007-10-17 12:31:14.000000000 -0500
-+++ genders-1.20/Makefile.am	2013-05-04 23:15:03.834998392 -0500
+diff -Nru genders-1.21.orig/Makefile.am genders-1.21/Makefile.am
+--- genders-1.21.orig/Makefile.am	2013-01-28 18:03:04.000000000 -0600
++++ genders-1.21/Makefile.am	2014-07-05 18:11:02.314411959 -0500
 @@ -6,6 +6,8 @@
  
  DISTCHECK_CONFIGURE_FLAGS = --with-perl-destdir=$$dc_install_base
@@ -21,9 +21,9 @@ diff -Nru genders-1.20.old/Makefile.am genders-1.20/Makefile.am
  SUBDIRS = \
          src \
          compat \
-diff -Nru genders-1.20.old/src/extensions/perl/Genders/Makefile.am genders-1.20/src/extensions/perl/Genders/Makefile.am
---- genders-1.20.old/src/extensions/perl/Genders/Makefile.am	2011-03-10 18:07:01.000000000 -0600
-+++ genders-1.20/src/extensions/perl/Genders/Makefile.am	2013-05-04 23:15:03.834998392 -0500
+diff -Nru genders-1.21.orig/src/extensions/perl/Genders/Makefile.am genders-1.21/src/extensions/perl/Genders/Makefile.am
+--- genders-1.21.orig/src/extensions/perl/Genders/Makefile.am	2013-01-28 18:02:57.000000000 -0600
++++ genders-1.21/src/extensions/perl/Genders/Makefile.am	2014-07-05 18:11:02.314411959 -0500
 @@ -15,7 +15,7 @@
  
  Genders.$(PERLMAN3EXT):
@@ -33,9 +33,9 @@ diff -Nru genders-1.20.old/src/extensions/perl/Genders/Makefile.am genders-1.20/
  		cp $(srcdir)/Genders.pm .; \
  	fi
  	$(POD2MAN) Genders.pm Genders.$(PERLMAN3EXT)
-diff -Nru genders-1.20.old/src/extensions/perl/Libgenders/Makefile.am genders-1.20/src/extensions/perl/Libgenders/Makefile.am
---- genders-1.20.old/src/extensions/perl/Libgenders/Makefile.am	2011-03-10 18:07:01.000000000 -0600
-+++ genders-1.20/src/extensions/perl/Libgenders/Makefile.am	2013-05-04 23:15:03.834998392 -0500
+diff -Nru genders-1.21.orig/src/extensions/perl/Libgenders/Makefile.am genders-1.21/src/extensions/perl/Libgenders/Makefile.am
+--- genders-1.21.orig/src/extensions/perl/Libgenders/Makefile.am	2013-01-28 18:02:58.000000000 -0600
++++ genders-1.21/src/extensions/perl/Libgenders/Makefile.am	2014-07-05 18:11:02.314411959 -0500
 @@ -32,16 +32,16 @@
  
  Makefile.xs: Makefile.PL Libgenders.xs Libgenders.pm
diff --git a/PKGBUILD b/PKGBUILD
index 5132f16a41b0..7067efc09190 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
 # Contributor: snafu <regflx@web.de>
 pkgname=genders
-pkgver=1.20
+pkgver=1.21
 pkgrel=1
 pkgdesc="Static cluster configuration database used for cluster configuration management."
 arch=('x86_64' 'i686')
@@ -9,15 +9,20 @@ url='https://computing.llnl.gov/linux/genders.html'
 license=('GPL')
 source=("http://sourceforge.net/projects/genders/files/genders/$pkgver-$pkgrel/$pkgname-$pkgver.tar.gz"
         '624078.patch')
-md5sums=('26a3bc4b6d5eeae3ade7b719c6165d85'
-         '76431ec248c0ee9a2d1b9971cc13ce57')
+md5sums=('8915780924dc4fa83432ea1c25907835'
+         '4c5c7b85ee0641a66e885b647fd669fd')
+
 options=('!makeflags')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 < ../624078.patch
-  ./configure --prefix=/usr --without-python-extensions
-  make
+  # export CPPFLAGS="-I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux ${CPPFLAGS}"
+  ./configure --prefix=/usr               \
+              --with-perl-vendor-arch     \
+              --with-cplusplus-extensions \
+              --without-java-extensions   \
+              --without-python-extensions
 }
 
 package() {