[mingw-tcl: 25/25] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 17:57:25 UTC 2012 

commit 13591850c110b1ff361a59e0585a27f516e13bfe
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 19:51:33 2012 +0200

    Use mingw macros without leading underscore

 mingw-tcl.spec |   75 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 38 insertions(+), 37 deletions(-)
---
diff --git a/mingw-tcl.spec b/mingw-tcl.spec
index 3716273..edc865a 100644
--- a/mingw-tcl.spec
+++ b/mingw-tcl.spec
@@ -1,6 +1,6 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 %global majorver1 8
 %global majorver2 5
@@ -59,7 +59,7 @@ of web-related tasks and for creating powerful command languages for
 applications.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -76,63 +76,63 @@ chmod -x generic/tclThreadAlloc.c
 %build
 pushd win
 autoconf
-%{_mingw32_configure} --disable-threads --enable-shared
+%{mingw32_configure} --disable-threads --enable-shared
 # builds fail sometimes with %{?_smp_mflags}, so don't use
-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 TCL_LIBRARY=%{_mingw32_datadir}/%{name1}%{majorver}
+make install -C win INSTALL_ROOT=$RPM_BUILD_ROOT TCL_LIBRARY=%{mingw32_datadir}/%{name1}%{majorver}
 
-ln -s tclsh%{majorver1}%{majorver2}.exe $RPM_BUILD_ROOT%{_mingw32_bindir}/tclsh.exe
+ln -s tclsh%{majorver1}%{majorver2}.exe $RPM_BUILD_ROOT%{mingw32_bindir}/tclsh.exe
 
-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
+ln -s lib%{name1}%{majorver1}%{majorver2}.dll.a $RPM_BUILD_ROOT%{mingw32_libdir}/lib%{name1}.dll.a
 
-#mkdir -p $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{name1}%{majorver}
-ln -s ../share/%{name1}%{majorver} $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{name1}%{majorver}
+#mkdir -p $RPM_BUILD_ROOT/%{mingw32_libdir}/%{name1}%{majorver}
+ln -s ../share/%{name1}%{majorver} $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_datadir}/%{name1}%{majorver}/encoding/*.enc
-chmod a-x $RPM_BUILD_ROOT/%{_mingw32_libdir}/*/pkgIndex.tcl
+chmod a-x $RPM_BUILD_ROOT/%{mingw32_datadir}/%{name1}%{majorver}/encoding/*.enc
+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
 
 # move windows packages to where tcl85.dll will find them
-mv $RPM_BUILD_ROOT/%{_mingw32_libdir}/dde* $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{name1}%{majorver}/
-mv $RPM_BUILD_ROOT/%{_mingw32_libdir}/reg* $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{name1}%{majorver}/
+mv $RPM_BUILD_ROOT/%{mingw32_libdir}/dde* $RPM_BUILD_ROOT/%{mingw32_libdir}/%{name1}%{majorver}/
+mv $RPM_BUILD_ROOT/%{mingw32_libdir}/reg* $RPM_BUILD_ROOT/%{mingw32_libdir}/%{name1}%{majorver}/
 
 %files -n mingw32-%{name1}
-%{_mingw32_bindir}/%{name1}sh.exe
-%{_mingw32_bindir}/%{name1}sh%{majorver1}%{majorver2}.exe
-%{_mingw32_bindir}/%{name1}%{majorver1}%{majorver2}.dll
-%{_mingw32_bindir}/%{name1}pip%{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_datadir}/%{name1}%{majorver}
-%{_mingw32_datadir}/%{name1}%{majorver1}
-%{_mingw32_includedir}/*
-%{_mingw32_libdir}/%{name1}%{majorver}/
+%{mingw32_bindir}/%{name1}sh.exe
+%{mingw32_bindir}/%{name1}sh%{majorver1}%{majorver2}.exe
+%{mingw32_bindir}/%{name1}%{majorver1}%{majorver2}.dll
+%{mingw32_bindir}/%{name1}pip%{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_datadir}/%{name1}%{majorver}
+%{mingw32_datadir}/%{name1}%{majorver1}
+%{mingw32_includedir}/*
+%{mingw32_libdir}/%{name1}%{majorver}/
 %doc README changes 
 %doc license.terms
 
@@ -140,6 +140,7 @@ mv $RPM_BUILD_ROOT/%{_mingw32_libdir}/reg* $RPM_BUILD_ROOT/%{_mingw32_libdir}/%{
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 8.5.11-3
 - Renamed the source package to mingw-tcl (#801032)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.5.11-2
 - Rebuild against the mingw-w64 toolchain

More information about the scm-commits mailing list