[mingw-filesystem] Make sure the %mingw_cmake and %mingw_cmake_kde4 macros respect the environment variable MINGW_BUILD
Erik van Pienbroek
epienbro at fedoraproject.org
Mon Aug 13 18:56:23 UTC 2012
commit 7b07576344041388ed773527a561e85c57e5d88a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Mon Aug 13 15:17:25 2012 +0200
Make sure the %mingw_cmake and %mingw_cmake_kde4 macros respect the environment variable MINGW_BUILDDIR_SUFFIX
macros.mingw | 64 ++++++++++++++++++++++++------------------------
mingw-filesystem.spec | 8 ++++-
2 files changed, 38 insertions(+), 34 deletions(-)
---
diff --git a/macros.mingw b/macros.mingw
index 95c4fda..8c8c9d5 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -61,40 +61,40 @@ make -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" \
} \
run_mingw_make
-%mingw_cmake \
-run_mingw_cmake() \
-{ \
-%if 0%{?mingw_build_win32} == 1 \
-mkdir build_win32$suffix \
-pushd build_win32$suffix \
- %{?mingw32_cmake "$@"} \
-popd \
-%endif \
-%if 0%{?mingw_build_win64} == 1 \
-mkdir build_win64$suffix \
-pushd build_win64$suffix \
- %{?mingw64_cmake "$@"} \
-popd \
-%endif \
-} \
+%mingw_cmake \
+run_mingw_cmake() \
+{ \
+%if 0%{?mingw_build_win32} == 1 \
+mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
+pushd build_win32$MINGW_BUILDDIR_SUFFIX \
+ %{?mingw32_cmake "$@"} \
+popd \
+%endif \
+%if 0%{?mingw_build_win64} == 1 \
+mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
+pushd build_win64$MINGW_BUILDDIR_SUFFIX \
+ %{?mingw64_cmake "$@"} \
+popd \
+%endif \
+} \
run_mingw_cmake
-%mingw_cmake_kde4 \
-run_mingw_cmake_kde4() \
-{ \
-%if 0%{?mingw_build_win32} == 1 \
-mkdir build_win32$suffix \
-pushd build_win32$suffix \
- %{?mingw32_cmake_kde4 "$@"} \
-popd \
-%endif \
-%if 0%{?mingw_build_win64} == 1 \
-mkdir build_win64$suffix \
-pushd build_win64$suffix \
- %{?mingw64_cmake_kde4 "$@"} \
-popd \
-%endif \
-} \
+%mingw_cmake_kde4 \
+run_mingw_cmake_kde4() \
+{ \
+%if 0%{?mingw_build_win32} == 1 \
+mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
+pushd build_win32$MINGW_BUILDDIR_SUFFIX \
+ %{?mingw32_cmake_kde4 "$@"} \
+popd \
+%endif \
+%if 0%{?mingw_build_win64} == 1 \
+mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
+pushd build_win64$MINGW_BUILDDIR_SUFFIX \
+ %{?mingw64_cmake_kde4 "$@"} \
+popd \
+%endif \
+} \
run_mingw_cmake_kde4
# Deprecated:
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 3bae3e0..782cca6 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw-filesystem
Version: 95
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries
@@ -246,7 +246,11 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+* Tue Jul 24 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 95-13
+- Make sure the %%mingw_cmake and %%mingw_cmake_kde4 macros respect the
+ environment variable MINGW_BUILDDIR_SUFFIX
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 95-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed Jun 13 2012 Kalev Lember <kalevlember at gmail.com> - 95-11
More information about the scm-commits
mailing list