[mingw-libssh2: 14/14] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 19:40:22 UTC 2012


commit ca44b86c589b620f0c9a3a91afb5b3cbaf9f83a3
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 21:37:30 2012 +0200

    Use mingw macros without leading underscore

 mingw-libssh2.spec |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/mingw-libssh2.spec b/mingw-libssh2.spec
index 346e686..5acdb53 100644
--- a/mingw-libssh2.spec
+++ b/mingw-libssh2.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-libssh2
 Version:        1.1
@@ -47,7 +47,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows SSH2 library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -55,7 +55,7 @@ Static version of the MinGW Windows SSH2 library.
 
 
 %build
-%{_mingw32_configure} --enable-static --enable-shared
+%{mingw32_configure} --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
@@ -63,27 +63,28 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove man pages which duplicate native Fedora.
-rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man3
+rm -r $RPM_BUILD_ROOT%{mingw32_mandir}/man3
 
 
 %files -n mingw32-libssh2
 %doc COPYING
-%{_mingw32_bindir}/libssh2-1.dll
-%{_mingw32_libdir}/libssh2.dll.a
-%{_mingw32_libdir}/libssh2.la
-%{_mingw32_includedir}/libssh2.h
-%{_mingw32_includedir}/libssh2_publickey.h
-%{_mingw32_includedir}/libssh2_sftp.h
+%{mingw32_bindir}/libssh2-1.dll
+%{mingw32_libdir}/libssh2.dll.a
+%{mingw32_libdir}/libssh2.la
+%{mingw32_includedir}/libssh2.h
+%{mingw32_includedir}/libssh2_publickey.h
+%{mingw32_includedir}/libssh2_sftp.h
 
 
 %files -n mingw32-libssh2-static
-%{_mingw32_libdir}/libssh2.a
+%{mingw32_libdir}/libssh2.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.1-9
 - Renamed the source package to mingw-libssh2 (#800434)
 - Spec clean up
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1-8
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list