[stdair] [Build] Fixed the wrong end-of-line CMake build issue.

Denis Arnaud denisarnaud at fedoraproject.org
Mon Dec 5 00:24:03 UTC 2011


commit 9c74b23243364eb5080f1fadc070c2834cce0706
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Mon Dec 5 01:23:06 2011 +0100

    [Build] Fixed the wrong end-of-line CMake build issue.

 sources     |    2 +-
 stdair.spec |   10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/sources b/sources
index 06cf575..2fe757c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1cea71fe1f05d2b177172bd8e9ceb864  stdair-0.45.0.tar.bz2
+352197cdeac7763a828d0308c805e188  stdair-0.45.0.tar.bz2
diff --git a/stdair.spec b/stdair.spec
index 1c6208a..1276795 100644
--- a/stdair.spec
+++ b/stdair.spec
@@ -1,6 +1,5 @@
 #
 %global mydocs __tmp_docdir
-%global mybuild _tmp_builddir
 #
 Name:           stdair
 Version:        0.45.0
@@ -62,17 +61,12 @@ online (http://%{name}.org).
 
 
 %build
-mkdir -p %{mybuild}
-pushd %{mybuild}
-%cmake ..
+%cmake .
 make %{?_smp_mflags}
-popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd %{mybuild}
 make install DESTDIR=$RPM_BUILD_ROOT
-popd
 
 # Fix some permissions
 find $RPM_BUILD_ROOT%{_libexecdir}/%{name} -type f -name '*.sh' -exec chmod +x {} \;
@@ -82,9 +76,7 @@ mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
 rm -f %{mydocs}/html/installdox
 
 %check
-pushd %{mybuild}
 ctest
-popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT


More information about the scm-commits mailing list