commit 4d229d9c134b391a965d889014f339c2406c7b09
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Dec 4 05:33:35 2017 +0100
- added javadoc patch (required with Java 8), fixed JNI build
- genders compat scripts always use /usr/lib/genders path
genders-javadoc.patch | 11 +++++++++++
genders.spec | 9 ++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/genders.spec b/genders.spec
index 4fdec77..6de447a 100644
--- a/genders.spec
+++ b/genders.spec
@@ -15,6 +15,7 @@ Group: Libraries
Source0:
https://github.com/chaos/genders/releases/download/genders-1-22-1/%{name}-%{version}.tar.gz
# Source0-md5: 9ea59a024dcbddb85b0ed25ddca9bc8e
Patch0: %{name}-make.patch
+Patch1: %{name}-javadoc.patch
URL: https://github.com/chaos/genders
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -186,6 +187,7 @@ Interfejs Pythona do biblioteki genders.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -193,6 +195,7 @@ Interfejs Pythona do biblioteki genders.
%{__autoconf}
%{__autoheader}
%{__automake}
+CPPFLAGS="%{rpmcppflags} -I%{_jvmdir}/java/include
-I%{_jvmdir}/java/include/linux"
%configure \
--disable-silent-rules \
%{!?with_static_libs:--disable-static} \
@@ -269,9 +272,9 @@ rm -rf $RPM_BUILD_ROOT
%files compat
%defattr(644,root,root,755)
-%dir %{_libdir}/genders
-%attr(755,root,root) %{_libdir}/genders/gendlib.pl
-%attr(755,root,root) %{_libdir}/genders/hostlist.pl
+%dir %{_prefix}/lib/genders
+%attr(755,root,root) %{_prefix}/lib/genders/gendlib.pl
+%attr(755,root,root) %{_prefix}/lib/genders/hostlist.pl
%{_mandir}/man3/gendlib.3*
%if %{with java}
diff --git a/genders-javadoc.patch b/genders-javadoc.patch
new file mode 100644
index 0000000..95ea7a2
--- /dev/null
+++ b/genders-javadoc.patch
@@ -0,0 +1,11 @@
+--- genders-1.22/src/extensions/java/gov/llnl/lc/chaos/Genders.java.orig
2012-08-27 22:03:58.000000000 +0200
++++ genders-1.22/src/extensions/java/gov/llnl/lc/chaos/Genders.java
2017-12-03 22:08:59.025996109 +0100
+@@ -167,7 +167,7 @@
+
+ /**
+ * Returns nodes specified via the specified query. Signify union
+- * with '||', intersection with '&&', * difference with '--', and
++ * with '||', intersection with '&&', * difference with '--', and
+ * complement with '~'. Operations are performed left to
+ * right. Parentheses can be used to change the order of
+ * operations.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/genders.git/commitdiff/4d229d9c134b391a965d889014f339c2406c7b09
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
