From: Jakub Bogusz Date: Tue, 26 Jul 2022 19:48:46 +0000 (+0200) Subject: - updated to 1.27.3 X-Git-Tag: auto/th/genders-1.27.3-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgenders.git;a=commitdiff_plain;h=a8ac33909959a20de7f9928663e1fef6459edc9f - updated to 1.27.3 --- diff --git a/genders-javadoc.patch b/genders-javadoc.patch deleted file mode 100644 index 95ea7a2..0000000 --- a/genders-javadoc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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. diff --git a/genders-make.patch b/genders-make.patch index 66a82db..73cf342 100644 --- a/genders-make.patch +++ b/genders-make.patch @@ -9,22 +9,22 @@ -I $(srcdir)/../../libgenders/ src_libGendersjni_la_SOURCES = src/Gendersjni.c ---- genders-1.22/src/extensions/python/Makefile.am.orig 2011-01-07 00:11:33.000000000 +0100 -+++ genders-1.22/src/extensions/python/Makefile.am 2017-12-03 16:36:51.170374833 +0100 -@@ -17,13 +17,13 @@ +--- genders-genders-1-27-3/src/extensions/python/Makefile.am.orig 2022-07-26 20:10:38.900983547 +0200 ++++ genders-genders-1-27-3/src/extensions/python/Makefile.am 2022-07-26 20:11:20.930755853 +0200 +@@ -17,13 +17,13 @@ all: genderssetup.py libgendersmodule.c $(PYTHON) genderssetup.py build install: -- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) -+ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) --optimize=2 +- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix) ++ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix) --optimize=2 pure_install: -- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) -+ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) --optimize=2 +- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix) ++ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix) --optimize=2 install-data-local: -- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) -+ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)/$(prefix) --exec-prefix=$(PYTHON_DESTDIR)/$(exec_prefix) --optimize=2 +- $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix) ++ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix) --optimize=2 clean: rm -rf build diff --git a/genders.spec b/genders.spec index 2b59e1b..c68043a 100644 --- a/genders.spec +++ b/genders.spec @@ -6,15 +6,15 @@ Summary: Static cluster configuration database Summary(pl.UTF-8): Statyczna baza danych konfiguracji klastra Name: genders -Version: 1.22 -Release: 8 +Version: 1.27.3 +%define gittag %(echo %{version} | tr . -) +Release: 1 License: GPL v2+ Group: Libraries #Source0Download: https://github.com/chaos/genders/releases -Source0: https://github.com/chaos/genders/releases/download/genders-1-22-1/%{name}-%{version}.tar.gz -# Source0-md5: 9ea59a024dcbddb85b0ed25ddca9bc8e +Source0: https://github.com/chaos/genders/archive/genders-%{gittag}/%{name}-%{gittag}.tar.gz +# Source0-md5: c86a3bc3a0b2c7e5b79c525de50e2f3b Patch0: %{name}-make.patch -Patch1: %{name}-javadoc.patch URL: https://github.com/chaos/genders BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -22,12 +22,13 @@ BuildRequires: bison BuildRequires: flex %{?with_java:BuildRequires: jdk} BuildRequires: libstdc++-devel -BuildRequires: libtool >= 2:1.5 +BuildRequires: libtool >= 2:2 BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-tools-pod BuildRequires: python-devel BuildRequires: rpm-perlprov BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.745 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -172,9 +173,8 @@ Python interface to genders library. Interfejs Pythona do biblioteki genders. %prep -%setup -q +%setup -q -n %{name}-%{name}-%{gittag} %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -274,7 +274,7 @@ rm -rf $RPM_BUILD_ROOT %files -n java-genders-javadoc %defattr(644,root,root,755) -%doc %{_docdir}/%{name}-%{version}-javadoc +%doc %{_docdir}/%{name}-1.27-javadoc %endif %files -n perl-genders