[mingw-jasper: 16/16] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 18:57:20 UTC 2012


commit 1adb2c38db0a4f0f6ee542fea986ac542c7542ff
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 20:51:01 2012 +0200

    Use mingw macros without leading underscore

 mingw-jasper.spec |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/mingw-jasper.spec b/mingw-jasper.spec
index 73da123..d5c91a7 100644
--- a/mingw-jasper.spec
+++ b/mingw-jasper.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-jasper
 Version:        1.900.1
@@ -55,7 +55,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Jasper library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -67,38 +67,39 @@ Static version of the MinGW Windows Jasper library.
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --disable-opengl --enable-libjpeg --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir}
+make DESTDIR=$RPM_BUILD_ROOT install mandir=%{mingw32_mandir}
 
 # Remove the manual pages - don't duplicate documentation which
 # is in the native Fedora package.
-rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/*
+rm $RPM_BUILD_ROOT%{mingw32_mandir}/man1/*
 
 
 %files -n mingw32-jasper
 %doc COPYRIGHT LICENSE NEWS README
-%{_mingw32_bindir}/%{_mingw32_target}-imgcmp.exe
-%{_mingw32_bindir}/%{_mingw32_target}-imginfo.exe
-%{_mingw32_bindir}/%{_mingw32_target}-jasper.exe
-%{_mingw32_bindir}/%{_mingw32_target}-tmrdemo.exe
-%{_mingw32_bindir}/libjasper-1.dll
-%{_mingw32_libdir}/libjasper.dll.a
-%{_mingw32_libdir}/libjasper.la
-%{_mingw32_includedir}/jasper/
+%{mingw32_bindir}/%{mingw32_target}-imgcmp.exe
+%{mingw32_bindir}/%{mingw32_target}-imginfo.exe
+%{mingw32_bindir}/%{mingw32_target}-jasper.exe
+%{mingw32_bindir}/%{mingw32_target}-tmrdemo.exe
+%{mingw32_bindir}/libjasper-1.dll
+%{mingw32_libdir}/libjasper.dll.a
+%{mingw32_libdir}/libjasper.la
+%{mingw32_includedir}/jasper/
 
 %files -n mingw32-jasper-static
-%{_mingw32_libdir}/libjasper.a
+%{mingw32_libdir}/libjasper.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.900.1-16
 - Renamed the source package to mingw-jasper (#800426)
 - Spec clean up
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.900.1-15
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list