[mingw-libgeotiff: 9/11] Use mingw macros without leading underscore

[epienbro]

commit 80e3b9d20d18de3105cdf15373034237d982ebf8
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 18:54:07 2012 +0100

    Use mingw macros without leading underscore

 mingw-libgeotiff.spec |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/mingw-libgeotiff.spec b/mingw-libgeotiff.spec
index 3dc1dea..12fd798 100644
--- a/mingw-libgeotiff.spec
+++ b/mingw-libgeotiff.spec
@@ -1,8 +1,8 @@
-%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}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
 %global svnver 1664
 
 Name:      mingw-libgeotiff
@@ -89,7 +89,7 @@ sed -i 's| \| sed \"s\/-g \/\/\"||g' configure
 # use gcc -shared instead of ld -shared to build with -fstack-protector
 sed -i 's|LD_SHARED=@LD_SHARED@|LD_SHARED=@CC@ -shared|' Makefile.in
 
-%{_mingw32_configure} --with-proj --with-jpeg --with-zip
+%{mingw32_configure} --with-proj --with-jpeg --with-zip
 
 make %{?_smp_mflags}
 
@@ -99,28 +99,28 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 # install pkgconfig file
 cat > libgeotiff.pc <<EOF
-prefix=%{_mingw32_prefix}
-exec_prefix=%{_mingw32_prefix}
-libdir=%{_mingw32_libdir}
-includedir=%{_mingw32_includedir}/%{name}
+prefix=%{mingw32_prefix}
+exec_prefix=%{mingw32_prefix}
+libdir=%{mingw32_libdir}
+includedir=%{mingw32_includedir}/%{name}
 
 Name: libgeotiff
 Description: GeoTIFF file format library
 Version: %{version}
-Libs: -L\%{_mingw32_libdir} -lgeotiff
-Cflags: -I\%{_mingw32_includedir}
+Libs: -L\%{mingw32_libdir} -lgeotiff
+Cflags: -I\%{mingw32_includedir}
 EOF
 
-mkdir -p %{buildroot}%{_mingw32_libdir}/pkgconfig/
-install -p -m 644 libgeotiff.pc %{buildroot}%{_mingw32_libdir}/pkgconfig/
+mkdir -p %{buildroot}%{mingw32_libdir}/pkgconfig/
+install -p -m 644 libgeotiff.pc %{buildroot}%{mingw32_libdir}/pkgconfig/
 
 # Remove unnecessary files
-rm $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgeotiff.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libgeotiff.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 
 # Remove the empty file
-rm $RPM_BUILD_ROOT%{_mingw32_datadir}/epsg_csv/codes.csv
+rm $RPM_BUILD_ROOT%{mingw32_datadir}/epsg_csv/codes.csv
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,15 +131,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -n mingw32-libgeotiff
 %defattr(-,root,root,-)
 %doc ChangeLog README
-%{_mingw32_bindir}/libgeotiff-1.dll
-%{_mingw32_includedir}/*
-%{_mingw32_datadir}/*
-%{_mingw32_libdir}/libgeotiff.dll.a
-%{_mingw32_libdir}/pkgconfig/libgeotiff.pc
+%{mingw32_bindir}/libgeotiff-1.dll
+%{mingw32_includedir}/*
+%{mingw32_datadir}/*
+%{mingw32_libdir}/libgeotiff.dll.a
+%{mingw32_libdir}/pkgconfig/libgeotiff.pc
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.0-0.5.svn1664
 - Renamed the source package to mingw-libgeotiff (RHBZ #800905)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.0-0.4.svn1664
 - Rebuild against the mingw-w64 toolchain