besser82 pushed to swig2 (master). "make ccache-swig aware of being renamed, so it works properly"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 3 10:52:02 UTC 2015


>From f1163ad9b8b3f77de6548cbdf0ca558f20cc7d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <bjoern.esser at gmail.com>
Date: Fri, 3 Apr 2015 12:16:48 +0200
Subject: make ccache-swig aware of being renamed, so it works properly


diff --git a/swig2.spec b/swig2.spec
index e09b8a0..4d75be6 100644
--- a/swig2.spec
+++ b/swig2.spec
@@ -37,7 +37,7 @@
 
 Name:		%{orig_name}2
 Version:	2.0.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Connects C/C++/Objective C to some high-level programming languages
 Group:		Development/Tools
 
@@ -167,6 +167,11 @@ do
 	%{__mv} -f $all.new $all
 done
 
+# Make ccache-swig aware of being renamed, so it works properly.
+%{__sed} -i -e 's!#define MYNAME .*!#define MYNAME "ccache-%{name}"!'	\
+	CCache/ccache.h
+%{__sed} -i -e 's!CCACHE=\.\./ccache-%{orig_name}!&2!' CCache/test.sh
+
 
 %build
 # Disable maximum compile warnings when octave is supported, because Octave
@@ -271,8 +276,12 @@ done
 
 %check
 %if %{with testsuite}
+# Rename ccache-swig properly.
+%{__mv} -f CCache/ccache-%{orig_name} CCache/ccache-%{name}
 # Run test-suite.
 %{__make} check
+# Revert 'Rename ccache-swig properly.'.
+%{__mv} -f CCache/ccache-%{name} CCache/ccache-%{orig_name}
 %endif
 
 
@@ -320,6 +329,9 @@ done
 
 
 %changelog
+* Fri Apr 03 2015 Björn Esser <bjoern.esser at gmail.com> - 2.0.12-2
+- make ccache-swig aware of being renamed, so it works properly
+
 * Wed Apr 01 2015 Björn Esser <bjoern.esser at gmail.com> - 2.0.12-1
 - initial rpm release (#1208217)
 - based on spec-file taken from fedora scm swig-pkg @b1604a3cc8b0
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/swig2.git/commit/?h=master&id=f1163ad9b8b3f77de6548cbdf0ca558f20cc7d5d


More information about the scm-commits mailing list