[genders] Import Debian patch & update to 1.20

3 files changed, 87 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97cb61feb826..3aaa12596853 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = genders
-	pkgdesc = Static cluster configuration datatbase used for cluster configuration management.
-	pkgver = 1.14
+	pkgdesc = Static cluster configuration database used for cluster configuration management.
+	pkgver = 1.20
 	pkgrel = 1
-	url = http://sourceforge.net/projects/genders
+	url = https://computing.llnl.gov/linux/genders.html
 	arch = x86_64
 	arch = i686
 	license = GPL
-	source = http://sourceforge.net/projects/genders/files/genders/1.14-1/genders-1.14.tar.gz
-	md5sums = 8d645f331fd8636b2d8e830c65d06255
+	source = http://sourceforge.net/projects/genders/files/genders/1.20-1/genders-1.20.tar.gz
+	source = 624078.patch
+	md5sums = 26a3bc4b6d5eeae3ade7b719c6165d85
+	md5sums = 76431ec248c0ee9a2d1b9971cc13ce57
 
 pkgname = genders
 
diff --git a/624078.patch b/624078.patch
new file mode 100644
index 000000000000..ec7a692529eb
--- /dev/null
+++ b/624078.patch
@@ -0,0 +1,68 @@
+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 @@
+ # Checks for programs.
+ ##
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ 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
+@@ -6,6 +6,8 @@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --with-perl-destdir=$$dc_install_base
+ 
++ACLOCAL_AMFLAGS = -I config --install
++
+ 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
+@@ -15,7 +15,7 @@
+ 
+ Genders.$(PERLMAN3EXT):
+ # Hacks to make distcheck work
+-	if ! test -a Genders.pm; then \
++	if ! test -e Genders.pm; then \
+ 		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
+@@ -32,16 +32,16 @@
+ 
+ Makefile.xs: Makefile.PL Libgenders.xs Libgenders.pm
+ # Hacks to make distcheck work
+-	if ! test -a Makefile.PL; then \
++	if ! test -e Makefile.PL; then \
+ 		cp $(srcdir)/Makefile.PL .; \
+ 	fi
+-	if ! test -a typemap; then \
++	if ! test -e typemap; then \
+ 		cp $(srcdir)/typemap .; \
+ 	fi
+-	if ! test -a Libgenders.pm; then \
++	if ! test -e Libgenders.pm; then \
+ 		cp $(srcdir)/Libgenders.pm .; \
+ 	fi
+-	if ! test -a Libgenders.xs; then \
++	if ! test -e Libgenders.xs; then \
+ 		cp $(srcdir)/Libgenders.xs .; \
+ 	fi
+ 	$(PERL) Makefile.PL $(MAKEMAKERFLAGS)
+@@ -62,7 +62,7 @@
+ 	$(MAKE) -f Makefile.xs uninstall
+ 
+ clean: 
+-	if test -a Makefile.xs; then \
++	if test -e Makefile.xs; then \
+ 		$(MAKE) -f Makefile.xs clean; \
+ 	fi
+ 	rm -f *.c
diff --git a/PKGBUILD b/PKGBUILD
index e1700ac91121..6e6bc88f65dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,26 @@
-# This is an example PKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: snafu <regflx@web.de>
+# Maintainer: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
+# Contributor: snafu <regflx@web.de>
 pkgname=genders
-pkgver=1.14
+pkgver=1.20
 pkgrel=1
-pkgdesc="Static cluster configuration datatbase used for cluster configuration management."
-arch=(x86_64 i686)
-url="http://sourceforge.net/projects/genders"
+pkgdesc="Static cluster configuration database used for cluster configuration management."
+arch=('x86_64' 'i686')
+url='https://computing.llnl.gov/linux/genders.html'
 license=('GPL')
-groups=()
-depends=()
-makedepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=(http://sourceforge.net/projects/genders/files/genders/$pkgver-$pkgrel/$pkgname-$pkgver.tar.gz)
-noextract=()
-md5sums=('8d645f331fd8636b2d8e830c65d06255')
+source=("http://sourceforge.net/projects/genders/files/genders/$pkgver-$pkgrel/$pkgname-$pkgver.tar.gz"
+        '624078.patch')
+md5sums=('26a3bc4b6d5eeae3ade7b719c6165d85'
+         '76431ec248c0ee9a2d1b9971cc13ce57')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
+  patch -p1 < ../624078.patch
+  ./configure --without-python-extensions
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir/" install
 }