[xmlstarlet] Fix noisy git related spew (#1171864)

Paul W. Frields pfrields at fedoraproject.org
Mon Dec 8 22:43:55 UTC 2014


commit 6d5c843a5fbeef1e9bb8f0caaacde785cb34ce25
Author: Paul W. Frields <stickster at gmail.com>
Date:   Mon Dec 8 15:01:59 2014 -0500

    Fix noisy git related spew (#1171864)

 xmlstarlet-1.6.1-nogit.patch |   10 ++++++++++
 xmlstarlet.spec              |    9 ++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xmlstarlet-1.6.1-nogit.patch b/xmlstarlet-1.6.1-nogit.patch
new file mode 100644
index 0000000..4cc5ad9
--- /dev/null
+++ b/xmlstarlet-1.6.1-nogit.patch
@@ -0,0 +1,10 @@
+diff -uNr xmlstarlet-1.6.1-orig/configure.ac xmlstarlet-1.6.1/configure.ac
+--- xmlstarlet-1.6.1-orig/configure.ac	2013-12-22 17:00:28.000000000 -0500
++++ xmlstarlet-1.6.1/configure.ac	2014-12-08 17:12:47.836499274 -0500
+@@ -1,5 +1,5 @@
+ AC_PREREQ([2.62])
+-AC_INIT([XMLStarlet], [m4_esyscmd_s([git describe --tags --dirty])],
++AC_INIT([XMLStarlet], [m4_esyscmd_s([if test -d .git ; then git describe --tags --dirty ; fi])],
+         [http://sourceforge.net/projects/xmlstar/support],
+         [],
+         [http://xmlstar.sourceforge.net/])
diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index 1ed340c..dee2396 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -1,11 +1,13 @@
 Name: xmlstarlet
 Version: 1.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Command Line XML Toolkit
 Group: Applications/Text
 License: MIT
 URL: http://xmlstar.sourceforge.net/
 Source0: http://downloads.sourceforge.net/xmlstar/%{name}-%{version}.tar.gz
+# https://sourceforge.net/p/xmlstar/bugs/109/
+Patch0: xmlstarlet-1.6.1-nogit.patch
 # http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -13,6 +15,7 @@ BuildRequires: xmlto automake autoconf libxslt-devel
 BuildRequires: libxml2-devel >= 2.6.23
 BuildRequires: docbook5-schemas
 
+
 %description
 XMLStarlet is a set of command line utilities which can be used
 to transform, query, validate, and edit XML documents and files
@@ -22,6 +25,7 @@ commands.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nogit
 
 
 %build
@@ -53,6 +57,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Dec  8 2014 Paul W. Frields <stickster at gmail.com> - 1.6.1-3
+- Fix noisy git related spew (#1171864)
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list