[mingw-qpid-cpp: 27/28] Modernize the spec file
Kalev Lember
kalev at fedoraproject.org
Wed Mar 7 17:19:04 UTC 2012
commit 5002a026801862c898fc994707226ddf9f4deebf
Author: Kalev Lember <kalevlember at gmail.com>
Date: Wed Mar 7 19:06:10 2012 +0200
Modernize the spec file
mingw-qpid-cpp.spec | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/mingw-qpid-cpp.spec b/mingw-qpid-cpp.spec
index 7bec7a1..3e4a4f5 100644
--- a/mingw-qpid-cpp.spec
+++ b/mingw-qpid-cpp.spec
@@ -1,8 +1,5 @@
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw-qpid-cpp
@@ -30,13 +27,11 @@ Patch2: qpid-dont-build-docs.patch
# Make sure QMF2 support is enabled
Patch3: qpid-build-qmf2-on-win32.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: redhat-rpm-config cmake make ruby ruby-devel python-devel
BuildRequires: mingw32-gcc-c++ mingw32-boost mingw32-libxslt mingw32-gnutls
-BuildRequires: mingw32-filesystem >= 57
+BuildRequires: mingw32-filesystem
%description
MinGW cross-compiled daemons and run-time libraries for AMQP client
@@ -54,7 +49,7 @@ applications developed using Qpid C++. Clients exchange messages with
an AMQP message broker using the AMQP protocol.
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
%prep
%setup -q -n qpid-%{version}
@@ -88,7 +83,6 @@ popd
make -C build VERBOSE=1 %{?_smp_mflags}
%install
-%{__rm} -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT make -C build VERBOSE=1 install
# Don't package sources in the examples directory
@@ -107,11 +101,7 @@ mv $RPM_BUILD_ROOT%{_mingw32_bindir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
# Maybe install some test programs for validation
#{__install} -d $RPM_BUILD_ROOT $RPM_BUILD_ROOT{_mingw32_bindir}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files -n mingw32-qpid-cpp
-%defattr(-,root,root,-)
%doc %{_mingw32_prefix}/LICENSE
%doc %{_mingw32_prefix}/NOTICE
%doc cpp/RELEASE_NOTES
@@ -143,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.14-2
- Renamed the source package to mingw-qpid-cpp (#801018)
+- Modernize the spec file
* Sun Feb 26 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.14-1
- Update to 0.14
More information about the scm-commits
mailing list