[mingw-qpid-cpp] Made the package compliant to the latest MinGW Packaging Guidelines

Erik van Pienbroek epienbro at fedoraproject.org
Sun Dec 30 14:50:13 UTC 2012


commit a24887183c029331cf973b2a431438f6f2cf483c
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Dec 30 15:00:15 2012 +0100

    Made the package compliant to the latest MinGW Packaging Guidelines

 mingw-qpid-cpp.spec |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/mingw-qpid-cpp.spec b/mingw-qpid-cpp.spec
index d601a56..2ce8e36 100644
--- a/mingw-qpid-cpp.spec
+++ b/mingw-qpid-cpp.spec
@@ -1,10 +1,10 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%{?mingw_package_header}
+
+%global mingw_build_win64 0
 
 Name:		mingw-qpid-cpp
 Version:	0.14
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	MinGW Windows port of AMQP C++ Daemons and Libraries
 
 Group:		Development/Libraries
@@ -49,7 +49,7 @@ applications developed using Qpid C++. Clients exchange messages with
 an AMQP message broker using the AMQP protocol.
 
 
-%{?mingw32_debug_package}
+%{?mingw_debug_package}
 
 %prep
 %setup -q -n qpid-%{version}
@@ -70,20 +70,17 @@ sed -i s/'-Wcast-qual'/'-Wno-error=delete-non-virtual-dtor -Wno-error=narrowing
 
 
 %build
-%{__mkdir_p} build
-pushd build
-%mingw32_cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%mingw_cmake	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DBUILD_MSCLFS:BOOL=OFF		  \
 		-DBUILD_MSSQL:BOOL=OFF		  \
 		-DBUILD_SSL:BOOL=OFF		  \
 		-DCMAKE_SHARED_LINKER_FLAGS:STRING=-Wl,--export-all-symbols \
 		../cpp
-popd
 
-make -C build VERBOSE=1 %{?_smp_mflags}
+%mingw_make VERBOSE=1 %{?_smp_mflags}
 
 %install
-DESTDIR=$RPM_BUILD_ROOT make -C build VERBOSE=1 install
+%mingw_make install VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT
 
 # Don't package sources in the examples directory
 rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/examples
@@ -135,6 +132,9 @@ mv $RPM_BUILD_ROOT%{mingw32_bindir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
 %{mingw32_libdir}/libqpidtypes.dll.a
 
 %changelog
+* Sun Dec 30 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.14-5
+- Made the package compliant to the latest MinGW Packaging Guidelines
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list