[mingw-libltdl: 40/42] Use mingw macros without leading underscore
epienbro
epienbro at fedoraproject.org
Wed Mar 7 19:32:20 UTC 2012
commit 6acc6bbec59ebb425c2e0027c659db30e21b7269
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Mar 7 20:27:09 2012 +0100
Use mingw macros without leading underscore
mingw-libltdl.spec | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/mingw-libltdl.spec b/mingw-libltdl.spec
index 1f865ae..e2be2be 100644
--- a/mingw-libltdl.spec
+++ b/mingw-libltdl.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}
# Note: For some reason, there must be a define here to make the
# debuginfo magic work.
@@ -49,7 +49,7 @@ BuildArch: noarch
# Use a ? to expand to nothing if undefined, enabling F13 mock builds on F11.
# This avoids the trick of hiding the macro in %%description which in turn
# confuses the koji webinterface.
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
%description
@@ -83,7 +83,7 @@ the rest of the GNU Autotools (including GNU Autoconf and GNU Automake).
%build
-export PATH=%{_mingw32_bindir}:$PATH
+export PATH=%{mingw32_bindir}:$PATH
#./bootstrap
@@ -92,8 +92,8 @@ export CXX=false
export F77=false
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
# dumb redhat-rpm-config replaces config.{sub,guess} with ancient ones in %%configure, use ./configure instead:
-# %%_mingw32_configure does not make that error :)
-%{_mingw32_configure} --enable-shared --enable-ltdl-install
+# %%mingw32_configure does not make that error :)
+%{mingw32_configure} --enable-shared --enable-ltdl-install
# build not smp safe:
make #%{?_smp_mflags}
@@ -109,7 +109,7 @@ make check VERBOSE=yes > make_check.log 2>&1 || (cat make_check.log && false)
rm -rf %{buildroot}
cd libltdl
make install DESTDIR=%{buildroot}
-rm -f %{buildroot}%{_mingw32_libdir}/libltdl.a
+rm -f %{buildroot}%{mingw32_libdir}/libltdl.a
%clean
@@ -120,19 +120,20 @@ rm -rf %{buildroot}
%defattr(-,root,root)
%doc AUTHORS NEWS THANKS TODO ChangeLog
%doc libltdl/COPYING.LIB libltdl/README
-%{_mingw32_bindir}/libltdl-%{libltdl_major}.dll
-%dir %{_mingw32_includedir}/libltdl
-%{_mingw32_includedir}/libltdl/lt_dlloader.h
-%{_mingw32_includedir}/libltdl/lt_error.h
-%{_mingw32_includedir}/libltdl/lt_system.h
-%{_mingw32_includedir}/ltdl.h
-%{_mingw32_libdir}/libltdl.dll.a
-%{_mingw32_libdir}/libltdl.la
+%{mingw32_bindir}/libltdl-%{libltdl_major}.dll
+%dir %{mingw32_includedir}/libltdl
+%{mingw32_includedir}/libltdl/lt_dlloader.h
+%{mingw32_includedir}/libltdl/lt_error.h
+%{mingw32_includedir}/libltdl/lt_system.h
+%{mingw32_includedir}/ltdl.h
+%{mingw32_libdir}/libltdl.dll.a
+%{mingw32_libdir}/libltdl.la
%changelog
* Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.4-6
- Renamed the source package to mingw-libltdl (RHBZ #800916)
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.4-5
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list