[globus-gram-audit/el5] Remove unexpanded configure macro

Mattias Ellert ellert at fedoraproject.org
Sun Oct 19 13:31:26 UTC 2014


commit 7dd14c3929451edf5b275893d76002a76ca237d7
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sun Oct 19 15:28:49 2014 +0200

    Remove unexpanded configure macro

 globus-gram-audit-macro.patch |   26 ++++++++++++++++++++++++++
 globus-gram-audit.spec        |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/globus-gram-audit-macro.patch b/globus-gram-audit-macro.patch
new file mode 100644
index 0000000..488b9b7
--- /dev/null
+++ b/globus-gram-audit-macro.patch
@@ -0,0 +1,26 @@
+diff --git a/globus-gram-audit.cron.in b/globus-gram-audit.cron.in
+index 35013bf..5000fc2 100644
+--- a/globus-gram-audit.cron.in
++++ b/globus-gram-audit.cron.in
+@@ -1,6 +1,7 @@
+ #! /bin/sh
+ 
+- at GLOBUS_SCRIPT_INITIALIZER@
++prefix="${GLOBUS_LOCATION- at prefix@}"
++exec_prefix="@exec_prefix@"
+ 
+ if [ -x @sbindir@/globus-gram-audit ] ; then
+ @sbindir@/globus-gram-audit --quiet
+diff --git a/globus-gram-audit.in b/globus-gram-audit.in
+index 5446516..bb35926 100644
+--- a/globus-gram-audit.in
++++ b/globus-gram-audit.in
+@@ -67,8 +67,6 @@ Perform the give SQL query on the audit database.
+ 
+ =cut
+ 
+- at GLOBUS_PERL_INITIALIZER@
+-
+ use Getopt::Long;
+ use strict;
+ use DBI qw(:sql_types);
diff --git a/globus-gram-audit.spec b/globus-gram-audit.spec
index f546a06..dcc08ba 100644
--- a/globus-gram-audit.spec
+++ b/globus-gram-audit.spec
@@ -3,7 +3,7 @@
 Name:		globus-gram-audit
 %global _name %(tr - _ <<< %{name})
 Version:	4.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - GRAM Jobmanager Auditing
 
 Group:		Applications/Internet
@@ -12,6 +12,8 @@ URL:		http://www.globus.org/
 Source:		http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRAM5
+#		Remove unexpanded configure macro
+Patch0:		%{name}-macro.patch
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,6 +69,9 @@ rm -rf %{buildroot}
 %doc %{_pkgdocdir}/README
 
 %changelog
+* Sun Oct 19 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.3-2
+- Remove unexpanded configure macro
+
 * Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.3-1
 - Update to Globus Toolkit 6.0
 - Drop GPT build system and GPT packaging metadata


More information about the scm-commits mailing list