Use mingw macros without leading underscore

This commit is contained in:
Erik van Pienbroek 2012-03-07 16:45:33 +01:00
parent 3a73df988f
commit 0dda8c92f7

View File

@ -1,8 +1,8 @@
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define __strip %{mingw32_strip}
%define __objdump %{mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}
%define __find_requires %{mingw32_findrequires}
%define __find_provides %{mingw32_findprovides}
%define library_version 1.0.4
@ -80,17 +80,17 @@ cross-compiling Windows software in Fedora.
%build
make -f Makefile-libbz2_so \
CC="%{_mingw32_cc}" \
AR="%{_mingw32_ar}" \
RANLIB="%{_mingw32_ranlib}" \
CFLAGS="%{_mingw32_cflags} -D_FILE_OFFSET_BITS=64" \
CC="%{mingw32_cc}" \
AR="%{mingw32_ar}" \
RANLIB="%{mingw32_ranlib}" \
CFLAGS="%{mingw32_cflags} -D_FILE_OFFSET_BITS=64" \
%{?_smp_mflags} all
rm -f *.o
make CC="%{_mingw32_cc}" \
AR="%{_mingw32_ar}" \
RANLIB="%{_mingw32_ranlib}" \
CFLAGS="%{_mingw32_cflags} -D_FILE_OFFSET_BITS=64" \
make CC="%{mingw32_cc}" \
AR="%{mingw32_ar}" \
RANLIB="%{mingw32_ranlib}" \
CFLAGS="%{mingw32_cflags} -D_FILE_OFFSET_BITS=64" \
%{?_smp_mflags} \
%if %{run_tests}
all
@ -101,11 +101,11 @@ make CC="%{_mingw32_cc}" \
%install
rm -rf $RPM_BUILD_ROOT
make PREFIX=$RPM_BUILD_ROOT%{_mingw32_prefix} install
make PREFIX=$RPM_BUILD_ROOT%{mingw32_prefix} install
# The binaries which are symlinks contain the full buildroot
# name in the symlink, so replace those.
pushd $RPM_BUILD_ROOT%{_mingw32_bindir}
pushd $RPM_BUILD_ROOT%{mingw32_bindir}
rm bzcmp bzegrep bzfgrep bzless
ln -s bzdiff bzcmp
ln -s bzgrep bzegrep
@ -115,15 +115,15 @@ popd
# Remove the manpages, they're duplicates of the native package,
# and located in the wrong place anyway.
rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/man
rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/man
# The Makefile doesn't install the DLL.
# Rename the library so that libtool can find it.
install bz2.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libbz2.dll.a
install bz2-1.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/
install bz2.dll.a $RPM_BUILD_ROOT%{mingw32_libdir}/libbz2.dll.a
install bz2-1.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
# Remove the static library.
rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libbz2.a
rm $RPM_BUILD_ROOT%{mingw32_libdir}/libbz2.a
%clean
@ -134,27 +134,28 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%doc LICENSE
%{_mingw32_bindir}/bz2-1.dll
%{_mingw32_libdir}/libbz2.dll.a
%{mingw32_bindir}/bz2-1.dll
%{mingw32_libdir}/libbz2.dll.a
%{_mingw32_bindir}/bunzip2
%{_mingw32_bindir}/bzcat
%{_mingw32_bindir}/bzcmp
%{_mingw32_bindir}/bzdiff
%{_mingw32_bindir}/bzegrep
%{_mingw32_bindir}/bzfgrep
%{_mingw32_bindir}/bzgrep
%{_mingw32_bindir}/bzip2
%{_mingw32_bindir}/bzip2recover
%{_mingw32_bindir}/bzless
%{_mingw32_bindir}/bzmore
%{mingw32_bindir}/bunzip2
%{mingw32_bindir}/bzcat
%{mingw32_bindir}/bzcmp
%{mingw32_bindir}/bzdiff
%{mingw32_bindir}/bzegrep
%{mingw32_bindir}/bzfgrep
%{mingw32_bindir}/bzgrep
%{mingw32_bindir}/bzip2
%{mingw32_bindir}/bzip2recover
%{mingw32_bindir}/bzless
%{mingw32_bindir}/bzmore
%{_mingw32_includedir}/bzlib.h
%{mingw32_includedir}/bzlib.h
%changelog
* Wed Mar 07 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.0.5-12
- Renamed the source package to mingw-bzip2 (RHBZ #800847)
- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.0.5-11
- Rebuild against the mingw-w64 toolchain