Accepting request 718444 from network:cluster
OBS-URL: https://build.opensuse.org/request/show/718444 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/genders?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c646e90df7
@ -33,15 +33,15 @@ index 5d62ae6..86ba50d 100644
|
||||
$(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)
|
||||
+ $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) $(PYDEST)
|
||||
|
||||
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)
|
||||
+ $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) $(PYDEST)
|
||||
|
||||
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)
|
||||
+ $(PYTHON) genderssetup.py install --prefix=$(prefix) --exec-prefix=$(exec_prefix) $(PYDEST)
|
||||
|
||||
clean:
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
From: Egbert Eich <eich@suse.com>
|
||||
Date: Sun Jan 28 01:13:37 2018 +0100
|
||||
Subject: Remove all remains of EXTENSION_DESTDIR
|
||||
Patch-mainline: Not yet
|
||||
Git-commit: eb4fc9e5e149db4e1c8c879ab42eaee3f1685cc7
|
||||
References:
|
||||
|
||||
Now as we use DESTDIR as specified with 'make install', remove
|
||||
any autoconf and spec file bits of EXTENSION_DESTDIR.
|
||||
|
||||
Signed-off-by: Egbert Eich <eich@suse.com>
|
||||
---
|
||||
config/ac_extension_destdir.m4 | 27 ---------------------------
|
||||
genders.spec | 1 -
|
||||
genders.spec.in | 1 -
|
||||
3 files changed, 29 deletions(-)
|
||||
diff --git a/config/ac_extension_destdir.m4 b/config/ac_extension_destdir.m4
|
||||
deleted file mode 100644
|
||||
index 3c5a33c..0000000
|
||||
--- a/config/ac_extension_destdir.m4
|
||||
+++ /dev/null
|
||||
@@ -1,27 +0,0 @@
|
||||
-##*****************************************************************************
|
||||
-## $Id: ac_destdir_destdir.m4,v 1.1 2006-07-17 22:06:43 chu11 Exp $
|
||||
-##*****************************************************************************
|
||||
-
|
||||
-# Used almost exclusively so extensions like perl and python install works
|
||||
-# with rpm builds
|
||||
-AC_DEFUN([AC_EXTENSION_DESTDIR],
|
||||
-[
|
||||
- AC_MSG_CHECKING(for --with-extension-destdir )
|
||||
- AC_ARG_WITH(extension-destdir,
|
||||
- AC_HELP_STRING([--with-extension-destdir=path],
|
||||
- [define extension modules install prefix]),
|
||||
- [ case "$withval" in
|
||||
- yes)
|
||||
- withextensionldestdir=yes
|
||||
- ;;
|
||||
- no)
|
||||
- ;;
|
||||
- *)
|
||||
- withextensionldestdir=yes
|
||||
- EXTENSION_DESTDIR="$withval"
|
||||
- ;;
|
||||
- esac ]
|
||||
- )
|
||||
- AC_MSG_RESULT(${withextensionldestdir=no})
|
||||
- AC_SUBST(EXTENSION_DESTDIR)
|
||||
-])
|
||||
diff --git a/genders.spec b/genders.spec
|
||||
index 92d678f..9ad4b36 100644
|
||||
--- a/genders.spec
|
||||
+++ b/genders.spec
|
||||
@@ -41,7 +41,6 @@ genders API that is compatible with earlier releases of genders
|
||||
|
||||
%build
|
||||
%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
|
||||
- --with-extension-destdir="$RPM_BUILD_ROOT" \
|
||||
%{?_with_perl_extensions} \
|
||||
%{?_without_perl_extensions} \
|
||||
%{?_with_perl_site_arch} \
|
||||
diff --git a/genders.spec.in b/genders.spec.in
|
||||
index dba2ef0..10c3df4 100644
|
||||
--- a/genders.spec.in
|
||||
+++ b/genders.spec.in
|
||||
@@ -41,7 +41,6 @@ genders API that is compatible with earlier releases of genders
|
||||
|
||||
%build
|
||||
%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
|
||||
- --with-extension-destdir="$RPM_BUILD_ROOT" \
|
||||
%{?_with_perl_extensions} \
|
||||
%{?_without_perl_extensions} \
|
||||
%{?_with_perl_site_arch} \
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0ff292825a29201106239c4d47d9ce4c6bda3f51c78c0463eb2634ecc337b774
|
||||
size 595795
|
||||
3
genders-1.26.tar.gz
Normal file
3
genders-1.26.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d690d9e57e2f2b97809b0dbc689b8812c0b1c9c1dcb141bb0135f865cc2fd902
|
||||
size 1103032
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 18 14:27:16 UTC 2019 - Christian Goll <cgoll@suse.com>
|
||||
|
||||
- updated to ver 1.26 which has faster parsing
|
||||
* updated Fix-Python-package-installation-use-root.patch
|
||||
* Removed Remove-all-remains-of-EXTENSION_DESTDIR.patch
|
||||
as not relevant any more
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 1 18:10:22 UTC 2018 - eich@suse.com
|
||||
|
||||
|
||||
15
genders.spec
15
genders.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package genders
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,24 +12,24 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
# Check file META in sources: update so_version to (API_CURRENT - API_AGE)
|
||||
%define c_api 0
|
||||
%define cpp_api 2
|
||||
%define slash_ver 1-26-1
|
||||
|
||||
Name: genders
|
||||
Version: 1.22
|
||||
Version: 1.26
|
||||
Release: 0
|
||||
Summary: Static cluster configuration database
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Management
|
||||
Source: https://github.com/chaos/genders/releases/download/genders-1-22-1/%{name}-%{version}.tar.gz
|
||||
Source: https://github.com/chaos/genders/archive/genders-%{slash_ver}/%{name}-%{version}.tar.gz
|
||||
Patch1: Fix-Python-package-installation-use-root.patch
|
||||
Patch2: Remove-PERL_DESTDIR-use-DESTDIR-instead.patch
|
||||
Patch3: Remove-all-remains-of-EXTENSION_DESTDIR.patch
|
||||
Patch4: lua_bindings.patch
|
||||
Url: https://github.com/chaos/genders
|
||||
BuildRequires: autoconf
|
||||
@ -139,10 +139,11 @@ with genders. This is the C++ API.
|
||||
%define _perldir %(perl -e 'use Config; $T=$Config{installvendorarch}; $P=$Config{vendorprefix}; $T=~/$P\\/(.*)/; print "%{_prefix}/$1\\n"')
|
||||
%endif
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -c -q -n %{name}-%{version}
|
||||
mv genders-genders-%{slash_ver}/* .
|
||||
rm -r genders-genders-%{slash_ver}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1 -R
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user