[mingw-libzip: 10/10] Use mingw macros without leading underscore
Kalev Lember
kalev at fedoraproject.org
Wed Mar 7 15:53:59 UTC 2012
commit ac4d578e70fcc1b83c18af5210a5422333f6f97e
Author: Kalev Lember <kalevlember at gmail.com>
Date: Wed Mar 7 17:52:01 2012 +0200
Use mingw macros without leading underscore
mingw-libzip.spec | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/mingw-libzip.spec b/mingw-libzip.spec
index 68a6e08..10df1c3 100644
--- a/mingw-libzip.spec
+++ b/mingw-libzip.spec
@@ -1,5 +1,5 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
%global nativename libzip
@@ -41,7 +41,7 @@ The API is documented by man pages.
%setup -q -n %{nativename}-%{version}
%build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
make %{?_smp_mflags}
@@ -50,23 +50,24 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
#Remove files we don't need
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*
+rm -R $RPM_BUILD_ROOT%{mingw32_datadir}/*
%files -n mingw32-%{nativename}
%doc AUTHORS NEWS README THANKS TODO
-%{_mingw32_bindir}/zipcmp.exe
-%{_mingw32_bindir}/zipmerge.exe
-%{_mingw32_bindir}/ziptorrent.exe
-%{_mingw32_bindir}/*.dll
-%{_mingw32_libdir}/libzip.dll.a
-%{_mingw32_libdir}/pkgconfig/libzip.pc
-%{_mingw32_includedir}/*.h
+%{mingw32_bindir}/zipcmp.exe
+%{mingw32_bindir}/zipmerge.exe
+%{mingw32_bindir}/ziptorrent.exe
+%{mingw32_bindir}/*.dll
+%{mingw32_libdir}/libzip.dll.a
+%{mingw32_libdir}/pkgconfig/libzip.pc
+%{mingw32_includedir}/*.h
%changelog
* Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.9-6
- Renamed the source package to mingw-libzip (#800932)
- Modernize the spec file
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.9-5
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list