[mingw-filesystem] Simplify the %mingw_make_install macro

Kalev Lember kalev at fedoraproject.org
Fri Mar 16 20:21:20 UTC 2012


commit f14297dd843127a8521159e868a69b6c3fe29553
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Mar 16 22:19:00 2012 +0200

    Simplify the %mingw_make_install macro
    
    ... and move it to the deprecated section.

 macros.mingw          |   12 ++----------
 mingw-filesystem.spec |    6 +++++-
 2 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/macros.mingw b/macros.mingw
index dce6978..bd8c96f 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -51,16 +51,6 @@ make -C build_win64$MINGW_BUILDDIR_SUFFIX $@}          \
 }                                                      \
 run_mingw_make
 
-%mingw_make_install                                    \
-run_mingw_make_install()                               \
-{                                                      \
-%{?mingw_build_win32:                                  \
-make -C build_win32$MINGW_BUILDDIR_SUFFIX install $@}  \
-%{?mingw_build_win64:                                  \
-make -C build_win64$MINGW_BUILDDIR_SUFFIX install $@}  \
-}                                                      \
-run_mingw_make_install
-
 %mingw_cmake                            \
 run_mingw_cmake()                       \
 {                                       \
@@ -93,3 +83,5 @@ popd }                                  \
 }                                       \
 run_mingw_cmake_kde4
 
+# Deprecated:
+%mingw_make_install         %mingw_make install
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index c6fd0e6..d836f88 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-filesystem
 Version:        95
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -250,6 +250,10 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Fri Mar 16 2012 Kalev Lember <kalevlember at gmail.com> - 95-5
+- Simplify the mingw_make_install macro, also moving it to the deprecated
+  section
+
 * Mon Mar 12 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 95-4
 - Added a manual provides for the native windows library ksuser.dll as
   wine doesn't have an implementation for this library at the moment


More information about the scm-commits mailing list