From c778d6aca75cf3c98246f5c5506903f255ab03b1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mar 26 2012 14:21:33 +0000 Subject: Simplify the use of new mingw macros --- diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 568699f..8227034 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -1,8 +1,5 @@ %?mingw_package_header -%global mingw_build_win32 1 -%global mingw_build_win64 1 - Name: mingw-glib2 Version: 2.31.20 Release: 2%{?dist} @@ -97,8 +94,8 @@ MINGW_BUILDDIR_SUFFIX=shared %mingw_make %{?_smp_mflags} %install -MINGW_BUILDDIR_SUFFIX=static %mingw_make_install DESTDIR=$RPM_BUILD_ROOT/build_static -MINGW_BUILDDIR_SUFFIX=shared %mingw_make_install DESTDIR=$RPM_BUILD_ROOT +MINGW_BUILDDIR_SUFFIX=static %mingw_make install DESTDIR=$RPM_BUILD_ROOT/build_static +MINGW_BUILDDIR_SUFFIX=shared %mingw_make install DESTDIR=$RPM_BUILD_ROOT # Move the static libraries to the right location mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}