[mingw-tk: 10/10] Use mingw macros without leading underscore

[Kalev Lember]

commit c51a99dc72e3500e12cd28a212133fe33bc85175
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 20:01:20 2012 +0200

    Use mingw macros without leading underscore

 mingw-tk.spec |   69 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 35 insertions(+), 34 deletions(-)
---
diff --git a/mingw-tk.spec b/mingw-tk.spec
index 72f5867..ac28837 100644
--- a/mingw-tk.spec
+++ b/mingw-tk.spec
@@ -1,5 +1,5 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
 
 %global majorver1 8
 %global majorver2 5
@@ -61,68 +61,68 @@ mv changes.utf8 changes
 %build
 pushd win
 autoconf
-MINGW32_CFLAGS="%{_mingw32_cflags} -D_WIN32_IE=0x0501"
-%{_mingw32_configure} --with-tcl=%{_mingw32_libdir}/tcl%{majorver} 
+MINGW32_CFLAGS="%{mingw32_cflags} -D_WIN32_IE=0x0501"
+%{mingw32_configure} --with-tcl=%{mingw32_libdir}/tcl%{majorver}
 # builds fail sometimes with %%{?_smp_mflags}, so don't use
 sed -i -e 's,mingw32-tcl,tcl,g' Makefile
-sed -i -e 's,/usr/include,%{_mingw32_includedir},g' Makefile
+sed -i -e 's,/usr/include,%{mingw32_includedir},g' Makefile
 sed -i -e 's,libtclstub85.a,libtclstub85.dll.a,g' Makefile
 sed -i -e 's,tcl8.5/libtclstub85,libtclstub85,g' Makefile
 sed -i -e 's,libtcl85.a,libtcl85.dll.a,g' Makefile
 sed -i -e 's,tcl8.5/libtcl85,libtcl85,g' Makefile
-make TCL_LIBRARY=%{_mingw32_datadir}/%{name1}%{majorver}
+make TCL_LIBRARY=%{mingw32_datadir}/%{name1}%{majorver}
 popd
 
 %install
-make install -C win INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{_mingw32_datadir}/%{name1}%{majorver}
+make install -C win INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{mingw32_datadir}/%{name1}%{majorver}
 
-pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
+pushd $RPM_BUILD_ROOT%{mingw32_bindir}
 ln -s wish%{majorver1}%{majorver2}.exe wish.exe
 popd
 
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/lib%{name1}%{majorver1}%{majorver2}.a \
-   $RPM_BUILD_ROOT%{_mingw32_libdir}/lib%{name1}%{majorver1}%{majorver2}.dll.a
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/lib%{name1}stub%{majorver1}%{majorver2}.a \
-   $RPM_BUILD_ROOT%{_mingw32_libdir}/lib%{name1}stub%{majorver1}%{majorver2}.dll.a
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/lib%{name1}%{majorver1}%{majorver2}.a \
+   $RPM_BUILD_ROOT%{mingw32_libdir}/lib%{name1}%{majorver1}%{majorver2}.dll.a
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/lib%{name1}stub%{majorver1}%{majorver2}.a \
+   $RPM_BUILD_ROOT%{mingw32_libdir}/lib%{name1}stub%{majorver1}%{majorver2}.dll.a
 
 # for linking with -lib%%{name1}
 ln -s lib%{name1}%{majorver1}%{majorver2}.dll.a \
-      $RPM_BUILD_ROOT%{_mingw32_libdir}/lib%{name1}.dll.a
+      $RPM_BUILD_ROOT%{mingw32_libdir}/lib%{name1}.dll.a
 
-mkdir -p $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{name1}%{majorver}
+mkdir -p $RPM_BUILD_ROOT/%{mingw32_libdir}/%{name1}%{majorver}
 
 # postgresql and maybe other packages too need tclConfig.sh
 # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now
-ln -s %{_mingw32_libdir}/%{name1}Config.sh \
-      $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{name1}%{majorver}/%{name1}Config.sh
+ln -s %{mingw32_libdir}/%{name1}Config.sh \
+      $RPM_BUILD_ROOT/%{mingw32_libdir}/%{name1}%{majorver}/%{name1}Config.sh
 
-mkdir -p $RPM_BUILD_ROOT/%{_mingw32_includedir}/%{name1}-private/{generic,win}
-find generic win -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_mingw32_includedir}/%{name1}-private/'{}' ';'
-( cd $RPM_BUILD_ROOT/%{_mingw32_includedir}
+mkdir -p $RPM_BUILD_ROOT/%{mingw32_includedir}/%{name1}-private/{generic,win}
+find generic win -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{mingw32_includedir}/%{name1}-private/'{}' ';'
+( cd $RPM_BUILD_ROOT/%{mingw32_includedir}
      for i in *.h ; do
-         [ -f $RPM_BUILD_ROOT/%{_mingw32_includedir}/%{name1}-private/generic/$i ] && \
-         ln -sf ../../$i $RPM_BUILD_ROOT/%{_mingw32_includedir}/%{name1}-private/generic ;
+         [ -f $RPM_BUILD_ROOT/%{mingw32_includedir}/%{name1}-private/generic/$i ] && \
+         ln -sf ../../$i $RPM_BUILD_ROOT/%{mingw32_includedir}/%{name1}-private/generic ;
      done
 ) || true
 
 # fix executable bits
-chmod a-x $RPM_BUILD_ROOT/%{_mingw32_libdir}/*/pkgIndex.tcl
+chmod a-x $RPM_BUILD_ROOT/%{mingw32_libdir}/*/pkgIndex.tcl
 
 # remove buildroot traces
-sed -i -e "s|$PWD/win|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{name1}Config.sh
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/%{name1}%{majorver}/tclAppInit.c
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/%{name1}%{majorver}/ldAix
+sed -i -e "s|$PWD/win|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{mingw32_libdir}/%{name1}Config.sh
+rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/%{name1}%{majorver}/tclAppInit.c
+rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/%{name1}%{majorver}/ldAix
 
 %files -n mingw32-%{name1}
-%{_mingw32_bindir}/wish*
-%{_mingw32_bindir}/%{name1}%{majorver1}%{majorver2}.dll
-%{_mingw32_libdir}/lib%{name1}%{majorver1}%{majorver2}.dll.a
-%{_mingw32_libdir}/lib%{name1}stub%{majorver1}%{majorver2}.dll.a
-%{_mingw32_libdir}/lib%{name1}.dll.a
-%{_mingw32_libdir}/%{name1}Config.sh
-%{_mingw32_includedir}/*
-%{_mingw32_libdir}/%{name1}%{majorver}/
-%{_mingw32_datadir}/%{name1}%{majorver1}.%{majorver2}
+%{mingw32_bindir}/wish*
+%{mingw32_bindir}/%{name1}%{majorver1}%{majorver2}.dll
+%{mingw32_libdir}/lib%{name1}%{majorver1}%{majorver2}.dll.a
+%{mingw32_libdir}/lib%{name1}stub%{majorver1}%{majorver2}.dll.a
+%{mingw32_libdir}/lib%{name1}.dll.a
+%{mingw32_libdir}/%{name1}Config.sh
+%{mingw32_includedir}/*
+%{mingw32_libdir}/%{name1}%{majorver}/
+%{mingw32_datadir}/%{name1}%{majorver1}.%{majorver2}
 %doc README changes 
 %doc license.terms
 
@@ -130,6 +130,7 @@ rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/%{name1}%{majorver}/ldAix
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 8.5.9-5
 - Renamed the source package to mingw-tk (#801037)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.5.9-4
 - Rebuild against the mingw-w64 toolchain