[mingw-libidn: 16/18] Use mingw macros without leading underscore
epienbro
epienbro at fedoraproject.org
Wed Mar 7 19:23:40 UTC 2012
commit 279c2021a0bb328d79070f24cc1dc5209bc54182
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Mar 7 20:20:29 2012 +0100
Use mingw macros without leading underscore
mingw-libidn.spec | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/mingw-libidn.spec b/mingw-libidn.spec
index 24073b5..aae44d9 100644
--- a/mingw-libidn.spec
+++ b/mingw-libidn.spec
@@ -1,9 +1,9 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%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}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
+%define __debug_install_post %{mingw32_debug_install_post}
# Native Fedora package is ancient, 0.6.14, which doesn't even
# exist on the upstream servers any more. I have gone for the
@@ -57,7 +57,7 @@ Group: Development/Libraries
Static version of the MinGW Windows IDN library.
-%{_mingw32_debug_package}
+%{mingw32_debug_package}
%prep
@@ -65,7 +65,7 @@ Static version of the MinGW Windows IDN library.
%build
-%{_mingw32_configure} --disable-csharp --enable-static --enable-shared
+%{mingw32_configure} --disable-csharp --enable-static --enable-shared
# The compilation fails when using -j2, so leave the %{?_smp_mflags} behind for now
make
@@ -75,12 +75,12 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
# Remove documentation which duplicates native Fedora package.
-rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/emacs
-rm -r $RPM_BUILD_ROOT%{_mingw32_infodir}
-rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man*
+rm -r $RPM_BUILD_ROOT%{mingw32_datadir}/emacs
+rm -r $RPM_BUILD_ROOT%{mingw32_infodir}
+rm -r $RPM_BUILD_ROOT%{mingw32_mandir}/man*
# The .def file isn't interesting for other libraries/applications
-rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/libidn-11.def
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/libidn-11.def
%find_lang libidn
@@ -92,22 +92,23 @@ rm -rf $RPM_BUILD_ROOT
%files -n mingw32-libidn -f libidn.lang
%defattr(-,root,root,-)
%doc COPYING COPYING.LIB
-%{_mingw32_bindir}/idn.exe
-%{_mingw32_bindir}/libidn-11.dll
-%{_mingw32_libdir}/libidn.dll.a
-%{_mingw32_libdir}/libidn.la
-%{_mingw32_libdir}/pkgconfig/libidn.pc
-%{_mingw32_includedir}/*.h
+%{mingw32_bindir}/idn.exe
+%{mingw32_bindir}/libidn-11.dll
+%{mingw32_libdir}/libidn.dll.a
+%{mingw32_libdir}/libidn.la
+%{mingw32_libdir}/pkgconfig/libidn.pc
+%{mingw32_includedir}/*.h
%files -n mingw32-libidn-static
%defattr(-,root,root,-)
-%{_mingw32_libdir}/libidn.a
+%{mingw32_libdir}/libidn.a
%changelog
* Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-12
- Renamed the source package to mingw-libidn (RHBZ #800914)
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.14-11
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list