[mingw-libxslt: 20/20] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 15:48:48 UTC 2012


commit b8b1e543ec0d821674ea2e827cd363b20413eed5
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 17:45:58 2012 +0200

    Use mingw macros without leading underscore

 mingw-libxslt.spec |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/mingw-libxslt.spec b/mingw-libxslt.spec
index 525c115..96feb69 100644
--- a/mingw-libxslt.spec
+++ b/mingw-libxslt.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}
 
 Name:           mingw-libxslt
 Version:        1.1.26
@@ -56,7 +56,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows LibXSLT library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -74,8 +74,8 @@ autoreconf
 
 
 %build
-PATH=%{_mingw32_bindir}:$PATH \
-%{_mingw32_configure} --without-python --enable-shared
+PATH=%{mingw32_bindir}:$PATH \
+%{mingw32_configure} --without-python --enable-shared
 make %{?_smp_mflags}
 
 
@@ -83,37 +83,38 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove doc and man which duplicate stuff already in Fedora native package.
-rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}
-rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -r $RPM_BUILD_ROOT%{mingw32_docdir}
+rm -r $RPM_BUILD_ROOT%{mingw32_mandir}
 
 
 %files -n mingw32-libxslt
 %doc COPYING Copyright
-%{_mingw32_bindir}/xslt-config
-%{_mingw32_bindir}/xsltproc.exe
-%{_mingw32_includedir}/libexslt
-%{_mingw32_includedir}/libxslt
-%{_mingw32_bindir}/libexslt-0.dll
-%{_mingw32_libdir}/libexslt.dll.a
-%{_mingw32_libdir}/libexslt.la
-%{_mingw32_bindir}/libxslt-1.dll
-%{_mingw32_libdir}/libxslt.dll.a
-%{_mingw32_libdir}/libxslt.la
-%{_mingw32_libdir}/pkgconfig/libexslt.pc
-%{_mingw32_libdir}/pkgconfig/libxslt.pc
-%{_mingw32_libdir}/xsltConf.sh
-%{_mingw32_datadir}/aclocal/libxslt.m4
+%{mingw32_bindir}/xslt-config
+%{mingw32_bindir}/xsltproc.exe
+%{mingw32_includedir}/libexslt
+%{mingw32_includedir}/libxslt
+%{mingw32_bindir}/libexslt-0.dll
+%{mingw32_libdir}/libexslt.dll.a
+%{mingw32_libdir}/libexslt.la
+%{mingw32_bindir}/libxslt-1.dll
+%{mingw32_libdir}/libxslt.dll.a
+%{mingw32_libdir}/libxslt.la
+%{mingw32_libdir}/pkgconfig/libexslt.pc
+%{mingw32_libdir}/pkgconfig/libxslt.pc
+%{mingw32_libdir}/xsltConf.sh
+%{mingw32_datadir}/aclocal/libxslt.m4
 
 
 %files -n mingw32-libxslt-static
-%{_mingw32_libdir}/libexslt.a
-%{_mingw32_libdir}/libxslt.a
+%{mingw32_libdir}/libexslt.a
+%{mingw32_libdir}/libxslt.a
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 1.1.26-7
 - Renamed the source package to mingw-libxslt (#800931)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.26-6
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list