diff --git a/mingw-jasper.spec b/mingw-jasper.spec index 62f2bc2..73da123 100644 --- a/mingw-jasper.spec +++ b/mingw-jasper.spec @@ -1,8 +1,5 @@ %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} Name: mingw-jasper @@ -29,7 +26,6 @@ Patch1000: jasper-1.900.1-mingw32.patch # This patch is a bit of a hack, but it's just there to fix a demo program: Patch1001: jasper-1.900.1-sleep.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: mingw32-filesystem >= 23 @@ -59,7 +55,7 @@ Group: Development/Libraries Static version of the MinGW Windows Jasper library. -%{_mingw32_debug_package} +%{?_mingw32_debug_package} %prep @@ -77,8 +73,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir} # Remove the manual pages - don't duplicate documentation which @@ -86,12 +80,7 @@ make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir} rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/* -%clean -rm -rf $RPM_BUILD_ROOT - - %files -n mingw32-jasper -%defattr(-,root,root,-) %doc COPYRIGHT LICENSE NEWS README %{_mingw32_bindir}/%{_mingw32_target}-imgcmp.exe %{_mingw32_bindir}/%{_mingw32_target}-imginfo.exe @@ -103,13 +92,13 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/jasper/ %files -n mingw32-jasper-static -%defattr(-,root,root,-) %{_mingw32_libdir}/libjasper.a %changelog * Tue Mar 06 2012 Kalev Lember - 1.900.1-16 - Renamed the source package to mingw-jasper (#800426) +- Spec clean up * Mon Feb 27 2012 Erik van Pienbroek - 1.900.1-15 - Rebuild against the mingw-w64 toolchain