ellert pushed to globus-common (el5). "GT6 update (..more)"

[notifications at fedoraproject.org]

>From cbec8c6510da9f4c1fb103e4d247142a6ed2f2a6 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed, 8 Apr 2015 10:33:47 +0200
Subject: GT6 update

- Drop patch globus-common-disable-network-tests.patch
  Use NO_EXTERNAL_NET environment variable implemented upstream instead

diff --git a/globus-common-disable-network-tests.patch b/globus-common-disable-network-tests.patch
deleted file mode 100644
index 0bf0786..0000000
--- a/globus-common-disable-network-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur globus_common-15.25.orig/test/globus_args_scan_test.c globus_common-15.25/test/globus_args_scan_test.c
---- globus_common-15.25.orig/test/globus_args_scan_test.c	2014-09-06 12:48:00.011231425 +0200
-+++ globus_common-15.25/test/globus_args_scan_test.c	2014-09-15 11:37:02.356956957 +0200
-@@ -246,7 +246,7 @@
- 
-     globus_module_activate(GLOBUS_COMMON_MODULE);
- 
--    printf("1..13\n");
-+    printf("1..11\n");
-     ok(do_test(test1) == 1, "test1");
-     ok(do_test(test2) == 1, "test2");
-     ok(do_test(test3) == 1, "test3");
-@@ -258,8 +258,6 @@
-     ok(do_test(test7) < 0, "test7");
-     ok(do_test(test8) < 0, "test8");
-     ok(do_test(test9) < 0, "test9");
--    ok(do_test(testhnok) == 1, "testhnok");
--    ok(do_test(testhnfail) < 0, "testhnfail");
- 
-     globus_module_deactivate(GLOBUS_COMMON_MODULE);
- 
diff --git a/globus-common.spec b/globus-common.spec
index faee123..c78dc25 100644
--- a/globus-common.spec
+++ b/globus-common.spec
@@ -2,8 +2,8 @@
 
 Name:		globus-common
 %global _name %(tr - _ <<< %{name})
-Version:	15.27
-Release:	2%{?dist}
+Version:	15.29
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -12,8 +12,6 @@ URL:		http://www.globus.org/
 Source:		http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-CCOMMONLIB
-#		Disable tests that require network access
-Patch0:		%{name}-disable-network-tests.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -115,7 +113,6 @@ Common Library Documentation Files
 
 %prep
 %setup -q -n %{_name}-%{version}
-%patch0 -p1
 
 %build
 # Reduce overlinking
@@ -159,7 +156,7 @@ Version: 9
 EOF
 
 %check
-make %{?_smp_mflags} check VERBOSE=1
+make %{?_smp_mflags} check VERBOSE=1 NO_EXTERNAL_NET=1
 
 %clean
 rm -rf %{buildroot}
@@ -219,6 +216,11 @@ rm -rf %{buildroot}
 %{?_licensedir: %license GLOBUS_LICENSE}
 
 %changelog
+* Wed Apr 08 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 15.29-1
+- GT6 update
+- Drop patch globus-common-disable-network-tests.patch
+  Use NO_EXTERNAL_NET environment variable implemented upstream instead
+
 * Fri Jan 23 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 15.27-2
 - Implement updated license packaging guidelines
 
diff --git a/sources b/sources
index 4170db3..abd62fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d9d94839827ec93e562519ca03846bd  globus_common-15.27.tar.gz
+4f9fd1771cf05703a570aeff9a4b9cc3  globus_common-15.29.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/globus-common.git/commit/?h=el5&id=cbec8c6510da9f4c1fb103e4d247142a6ed2f2a6