git.annexia.org
/
fedora-mingw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added test programs.
[fedora-mingw.git]
/
bzip2
/
mingw32-bzip2.spec
diff --git
a/bzip2/mingw32-bzip2.spec
b/bzip2/mingw32-bzip2.spec
index
19a7e4a
..
2ced21f
100644
(file)
--- a/
bzip2/mingw32-bzip2.spec
+++ b/
bzip2/mingw32-bzip2.spec
@@
-6,9
+6,12
@@
%define library_version 1.0.4
%define library_version 1.0.4
+# Running the tests requires Wine.
+%define run_tests 0
+
Name: mingw32-bzip2
Version: 1.0.5
Name: mingw32-bzip2
Version: 1.0.5
-Release:
1
%{?dist}
+Release:
3
%{?dist}
Summary: MinGW port of bzip2 file compression utility
License: BSD
Summary: MinGW port of bzip2 file compression utility
License: BSD
@@
-30,8
+33,9
@@
BuildRequires: mingw32-filesystem >= 26
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
-# This is needed to run the tests.
+%if %{run_tests}
BuildRequires: wine
BuildRequires: wine
+%endif
%description
%description
@@
-60,18
+64,23
@@
cross-compiling Windows software in Fedora.
%build
make -f Makefile-libbz2_so \
%build
make -f Makefile-libbz2_so \
-
CC="%{_mingw32_cc}" \
-
AR="%{_mingw32_ar}" \
-
RANLIB="%{_mingw32_ranlib}" \
-
CFLAGS="%{_mingw32_cflags} -D_FILE_OFFSET_BITS=64" \
-
%{?_smp_mflags} all
+ 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}" \
rm -f *.o
make CC="%{_mingw32_cc}" \
- AR="%{_mingw32_ar}" \
- RANLIB="%{_mingw32_ranlib}" \
- CFLAGS="%{_mingw32_cflags} -D_FILE_OFFSET_BITS=64" \
- %{?_smp_mflags} all
+ AR="%{_mingw32_ar}" \
+ RANLIB="%{_mingw32_ranlib}" \
+ CFLAGS="%{_mingw32_cflags} -D_FILE_OFFSET_BITS=64" \
+ %{?_smp_mflags} \
+%if %{run_tests}
+ all
+%else
+ libbz2.a bzip2 bzip2recover
+%endif
%install
%install
@@
-126,5
+135,11
@@
rm -rf $RPM_BUILD_ROOT
%changelog
%changelog
+* Wed Oct 29 2008 Richard Jones <rjones@redhat.com> - 1.0.5-3
+- Fix mixed spaces/tabs in specfile.
+
+* Fri Oct 10 2008 Richard Jones <rjones@redhat.com> - 1.0.5-2
+- Allow the tests to be disabled selectively.
+
* Thu Sep 25 2008 Richard Jones <rjones@redhat.com> - 1.0.5-1
- Initial RPM release.
* Thu Sep 25 2008 Richard Jones <rjones@redhat.com> - 1.0.5-1
- Initial RPM release.