diff --git a/globus-net-manager-python-embed.patch b/globus-net-manager-python-embed.patch deleted file mode 100644 index fc0638b..0000000 --- a/globus-net-manager-python-embed.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -ur globus_net_manager-1.3.orig/configure.ac globus_net_manager-1.3/configure.ac ---- globus_net_manager-1.3.orig/configure.ac 2019-02-26 15:54:28.706823015 +0100 -+++ globus_net_manager-1.3/configure.ac 2019-06-12 14:38:47.070102036 +0200 -@@ -28,15 +28,17 @@ - AC_PATH_PROGS([PYTHON_CONFIG], [python-config python2.6-config]) - if test x"$PYTHON_CONFIG" != x; then - PYTHON_CPPFLAGS="$CPPFLAGS $($PYTHON_CONFIG --includes)" -- PYTHON_LDFLAGS="$LDFLAGS $($PYTHON_CONFIG --ldflags)" -- PYTHON_LIBS="$LIBS $($PYTHON_CONFIG --libs)" -+ if $PYTHON_CONFIG --embed >/dev/null 2>&1; then -+ PYTHON_LIBS="$LIBS $($PYTHON_CONFIG --libs --embed)" -+ else -+ PYTHON_LIBS="$LIBS $($PYTHON_CONFIG --libs)" -+ fi - else - AC_MSG_ERROR([Cannot find usable python-config]) - fi - fi - ]) - AC_SUBST(PYTHON_CPPFLAGS) --AC_SUBST(PYTHON_LDFLAGS) - AC_SUBST(PYTHON_LIBS) - - AC_ARG_VAR([LIBLTDL],[libltdl library path]) -diff -ur globus_net_manager-1.3.orig/configure globus_net_manager-1.3/configure ---- globus_net_manager-1.3.orig/configure 2019-02-26 16:00:26.141560876 +0100 -+++ globus_net_manager-1.3/configure 2019-06-12 14:39:46.901466778 +0200 -@@ -642,7 +642,6 @@ - LTDLDEPS - LIBLTDL - PYTHON_LIBS --PYTHON_LDFLAGS - PYTHON_CPPFLAGS - PYTHON_CONFIG - DOXYGEN -@@ -12166,8 +12165,11 @@ - - if test x"$PYTHON_CONFIG" != x; then - PYTHON_CPPFLAGS="$CPPFLAGS $($PYTHON_CONFIG --includes)" -- PYTHON_LDFLAGS="$LDFLAGS $($PYTHON_CONFIG --ldflags)" -- PYTHON_LIBS="$LIBS $($PYTHON_CONFIG --libs)" -+ if $PYTHON_CONFIG --embed >/dev/null 2>&1; then -+ PYTHON_LIBS="$LIBS $($PYTHON_CONFIG --libs --embed)" -+ else -+ PYTHON_LIBS="$LIBS $($PYTHON_CONFIG --libs)" -+ fi - else - as_fn_error $? "Cannot find usable python-config" "$LINENO" 5 - fi -diff -ur globus_net_manager-1.3.orig/attr/Makefile.in globus_net_manager-1.3/attr/Makefile.in ---- globus_net_manager-1.3.orig/attr/Makefile.in 2019-02-26 16:00:26.745563007 +0100 -+++ globus_net_manager-1.3/attr/Makefile.in 2019-06-12 14:35:42.494061768 +0200 -@@ -235,7 +235,6 @@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PYTHON_CONFIG = @PYTHON_CONFIG@ - PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ --PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ - PYTHON_LIBS = @PYTHON_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ -diff -ur globus_net_manager-1.3.orig/context/Makefile.in globus_net_manager-1.3/context/Makefile.in ---- globus_net_manager-1.3.orig/context/Makefile.in 2019-02-26 16:00:26.777563120 +0100 -+++ globus_net_manager-1.3/context/Makefile.in 2019-06-12 14:35:42.501061694 +0200 -@@ -237,7 +237,6 @@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PYTHON_CONFIG = @PYTHON_CONFIG@ - PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ --PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ - PYTHON_LIBS = @PYTHON_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ -diff -ur globus_net_manager-1.3.orig/logging/Makefile.in globus_net_manager-1.3/logging/Makefile.in ---- globus_net_manager-1.3.orig/logging/Makefile.in 2019-02-26 16:00:26.809563233 +0100 -+++ globus_net_manager-1.3/logging/Makefile.in 2019-06-12 14:35:42.547061205 +0200 -@@ -235,7 +235,6 @@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PYTHON_CONFIG = @PYTHON_CONFIG@ - PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ --PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ - PYTHON_LIBS = @PYTHON_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ -diff -ur globus_net_manager-1.3.orig/Makefile.in globus_net_manager-1.3/Makefile.in ---- globus_net_manager-1.3.orig/Makefile.in 2019-02-26 16:00:26.709562880 +0100 -+++ globus_net_manager-1.3/Makefile.in 2019-06-12 14:35:42.504061662 +0200 -@@ -351,7 +351,6 @@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PYTHON_CONFIG = @PYTHON_CONFIG@ - PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ --PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ - PYTHON_LIBS = @PYTHON_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ -diff -ur globus_net_manager-1.3.orig/python/Makefile.am globus_net_manager-1.3/python/Makefile.am ---- globus_net_manager-1.3.orig/python/Makefile.am 2019-02-26 15:54:28.706823015 +0100 -+++ globus_net_manager-1.3/python/Makefile.am 2019-06-12 14:35:42.499061715 +0200 -@@ -5,6 +5,5 @@ - endif - - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/attr $(PYTHON_CPPFLAGS) $(PACKAGE_DEP_CFLAGS) --AM_LDFLAGS = $(PYTHON_LDFLAGS) - libglobus_net_manager_python_la_SOURCES = globus_net_manager_python.c globus_net_manager_python.h - libglobus_net_manager_python_la_LIBADD = $(PACKAGE_DEP_LIBS) $(PYTHON_LIBS) -diff -ur globus_net_manager-1.3.orig/python/Makefile.in globus_net_manager-1.3/python/Makefile.in ---- globus_net_manager-1.3.orig/python/Makefile.in 2019-02-26 16:00:26.849563374 +0100 -+++ globus_net_manager-1.3/python/Makefile.in 2019-06-12 14:35:42.499061715 +0200 -@@ -239,7 +239,6 @@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PYTHON_CONFIG = @PYTHON_CONFIG@ - PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ --PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ - PYTHON_LIBS = @PYTHON_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ -@@ -302,7 +301,6 @@ - @ENABLE_PYTHON_TRUE@noinst_LTLIBRARIES = libglobus_net_manager_python.la - @ENABLE_PYTHON_FALSE@EXTRA_LTLIBRARIES = libglobus_net_manager_python.la - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/attr $(PYTHON_CPPFLAGS) $(PACKAGE_DEP_CFLAGS) --AM_LDFLAGS = $(PYTHON_LDFLAGS) - libglobus_net_manager_python_la_SOURCES = globus_net_manager_python.c globus_net_manager_python.h - libglobus_net_manager_python_la_LIBADD = $(PACKAGE_DEP_LIBS) $(PYTHON_LIBS) - all: all-am -diff -ur globus_net_manager-1.3.orig/test/Makefile.in globus_net_manager-1.3/test/Makefile.in ---- globus_net_manager-1.3.orig/test/Makefile.in 2019-02-26 16:00:26.909563586 +0100 -+++ globus_net_manager-1.3/test/Makefile.in 2019-06-12 14:35:42.497061736 +0200 -@@ -489,7 +489,6 @@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PYTHON_CONFIG = @PYTHON_CONFIG@ - PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ --PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ - PYTHON_LIBS = @PYTHON_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ -diff -ur globus_net_manager-1.3.orig/xio_driver/Makefile.in globus_net_manager-1.3/xio_driver/Makefile.in ---- globus_net_manager-1.3.orig/xio_driver/Makefile.in 2019-02-26 16:00:26.949563726 +0100 -+++ globus_net_manager-1.3/xio_driver/Makefile.in 2019-06-12 14:35:42.550061173 +0200 -@@ -278,7 +278,6 @@ - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - PYTHON_CONFIG = @PYTHON_CONFIG@ - PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ --PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ - PYTHON_LIBS = @PYTHON_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ diff --git a/globus-net-manager.spec b/globus-net-manager.spec index 7fdf73f..6c39c79 100644 --- a/globus-net-manager.spec +++ b/globus-net-manager.spec @@ -1,17 +1,13 @@ Name: globus-net-manager %global _name %(tr - _ <<< %{name}) -Version: 1.3 -Release: 4%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Grid Community Toolkit - Network Manager Library License: ASL 2.0 URL: https://github.com/gridcf/gct/ Source: https://repo.gridcf.org/gct6/sources/%{_name}-%{version}.tar.gz Source8: README -# Check python-config for --embed flag (python 3.8 compatibility) -# https://github.com/gridcf/gct/issues/87 -# https://github.com/gridcf/gct/pull/88 -Patch0: %{name}-python-embed.patch BuildRequires: gcc BuildRequires: globus-common-devel >= 15.27 @@ -103,8 +99,6 @@ Network Manager Library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 -touch -r configure.ac aclocal.m4 %build # Reduce overlinking @@ -176,6 +170,10 @@ GLOBUS_HOSTNAME=localhost make %{?_smp_mflags} check VERBOSE=1 %{?_licensedir: %license GLOBUS_LICENSE} %changelog +* Fri Aug 30 2019 Mattias Ellert - 1.4-1 +- Check python-config for --embed flag (python 3.8 compatibility) +- Drop patch globus-net-manager-python-embed.patch + * Mon Aug 19 2019 Miro Hrončok - 1.3-4 - Rebuilt for Python 3.8 diff --git a/sources b/sources index b4ce5ec..056fbc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (globus_net_manager-1.3.tar.gz) = 5273ca1aae64f2246cf4ef77cd79f3be0183ac6b3dee0182d85b3b2e650e36b739acfe7e811ec9cfeb430b2feb3d59377422bb94918848d0e58da3f908091330 +SHA512 (globus_net_manager-1.4.tar.gz) = d66c96f377f1be2a455230962802387a4a4ebc5317e542ffcdf8cc96daeddfe6ace7130ca44d076e5fc99567858aabc1b5b1b3fcf4c375877d444a40643489bf