[mingw-freeglut: 10/11] Use mingw macros without leading underscore
epienbro
epienbro at fedoraproject.org
Wed Mar 7 17:02:27 UTC 2012
commit b4ad8827075edfc00059bb035a67f3662f9baf71
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Mar 7 18:00:41 2012 +0100
Use mingw macros without leading underscore
mingw-freeglut.spec | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mingw-freeglut.spec b/mingw-freeglut.spec
index ddb30ac..1fdc668 100644
--- a/mingw-freeglut.spec
+++ b/mingw-freeglut.spec
@@ -1,8 +1,8 @@
-%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}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
Name: mingw-freeglut
Version: 2.6.0
@@ -49,7 +49,7 @@ freeglut allows the user to create and manage windows containing
OpenGL contexts on a wide range of platforms and also read the mouse,
keyboard and joystick functions.
-%{_mingw32_description}
+%{mingw32_description}
%package -n mingw32-freeglut
@@ -67,7 +67,7 @@ freeglut allows the user to create and manage windows containing
OpenGL contexts on a wide range of platforms and also read the mouse,
keyboard and joystick functions.
-%{_mingw32_description}
+%{mingw32_description}
%prep
@@ -83,7 +83,7 @@ dos2unix -k FrequentlyAskedQuestions
%build
-%{_mingw32_configure} --disable-static --enable-shared
+%{mingw32_configure} --disable-static --enable-shared
make %{?_smp_mflags}
@@ -91,7 +91,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libglut.la
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libglut.la
%clean
@@ -101,17 +101,18 @@ rm -rf $RPM_BUILD_ROOT
%files -n mingw32-freeglut
%defattr(-,root,root,-)
%doc AUTHORS COPYING FrequentlyAskedQuestions NEWS README README.win32 TODO
-%{_mingw32_bindir}/libglut-0.dll
-%{_mingw32_libdir}/libglut.dll.a
-%{_mingw32_includedir}/GL/freeglut.h
-%{_mingw32_includedir}/GL/freeglut_ext.h
-%{_mingw32_includedir}/GL/freeglut_std.h
-%{_mingw32_includedir}/GL/glut.h
+%{mingw32_bindir}/libglut-0.dll
+%{mingw32_libdir}/libglut.dll.a
+%{mingw32_includedir}/GL/freeglut.h
+%{mingw32_includedir}/GL/freeglut_ext.h
+%{mingw32_includedir}/GL/freeglut_std.h
+%{mingw32_includedir}/GL/glut.h
%changelog
* Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.0-0.5.rc1
- Renamed the source package to mingw-freeglut (RHBZ #800866)
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.0-0.4.rc1
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list