[mingw-libsoup] Simplify the use of mingw macros

Kalev Lember kalev at fedoraproject.org
Mon Mar 26 20:30:29 UTC 2012


commit b9a31469ff721e40050026e7bbebdf59e3a2a419
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Mon Mar 26 23:22:20 2012 +0300

    Simplify the use of mingw macros

 mingw-libsoup.spec |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/mingw-libsoup.spec b/mingw-libsoup.spec
index b3f63be..8cda38a 100644
--- a/mingw-libsoup.spec
+++ b/mingw-libsoup.spec
@@ -1,8 +1,5 @@
 %?mingw_package_header
 
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
@@ -126,11 +123,11 @@ MINGW_BUILDDIR_SUFFIX=shared %mingw_make %{?_smp_mflags}
 
 %install
 # First install all the files belonging to the shared build
-MINGW_BUILDDIR_SUFFIX=shared %mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+MINGW_BUILDDIR_SUFFIX=shared %mingw_make install DESTDIR=$RPM_BUILD_ROOT
 
 # Install all the files from the static build in a seperate folder
 # and move the static libraries to the right location
-MINGW_BUILDDIR_SUFFIX=static %mingw_make_install DESTDIR=$RPM_BUILD_ROOT/build_static
+MINGW_BUILDDIR_SUFFIX=static %mingw_make install DESTDIR=$RPM_BUILD_ROOT/build_static
 mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
 mv $RPM_BUILD_ROOT/build_static%{mingw64_libdir}/*.a $RPM_BUILD_ROOT%{mingw64_libdir}
 


More information about the scm-commits mailing list