[systemtap] BZ1022483: don't ship the sourcedir 'examples' symlink.

Josh Stone jistone at fedoraproject.org
Wed Oct 23 17:27:44 UTC 2013


commit fdee748f5988a8661e7f9e15b0464de093070475
Author: Josh Stone <jistone at redhat.com>
Date:   Wed Oct 23 10:27:08 2013 -0700

    BZ1022483: don't ship the sourcedir 'examples' symlink.

 systemtap.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/systemtap.spec b/systemtap.spec
index d108b55..35ed6dd 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -49,7 +49,7 @@
 
 Name: systemtap
 Version: 2.4
-Release: 0.173.g2576d05%{?dist}
+Release: 0.173.g2576d05.1%{?dist}
 # for version, see also configure.ac
 
 
@@ -450,6 +450,10 @@ rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang %{name}
 
+# Temporary kludge, don't let the examples symlink collide with the following mv.
+# Upstream is renaming the symlink to EXAMPLES, commit c878e1d3.
+test -L examples && rm -f examples
+
 # We want the examples in the special doc dir, not the build install dir.
 # We build it in place and then move it away so it doesn't get installed
 # twice. rpm can specify itself where the (versioned) docs go with the
@@ -970,6 +974,9 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
+* Wed Oct 23 2013 Josh Stone <jistone at redhat.com> - 2.4-0.173.g2576d05.1
+- BZ1022483: don't ship the sourcedir 'examples' symlink.
+
 * Mon Oct 21 2013 Lukas Berk <lberk at redhat.com> - 2.4-0.173.g2576d05
 - Automated weekly rawhide release
 - Applied spec changes from upstream git


More information about the scm-commits mailing list