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
Replace %include of defs with explicit macros to avoid chicken+egg problem in mock...
[fedora-mingw.git]
/
w32api
/
mingw-w32api.spec
diff --git
a/w32api/mingw-w32api.spec
b/w32api/mingw-w32api.spec
index
49db041
..
3cadcf6
100644
(file)
--- a/
w32api/mingw-w32api.spec
+++ b/
w32api/mingw-w32api.spec
@@
-1,8
+1,13
@@
-%include /usr/lib/rpm/mingw-defs
+
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
Name: mingw-w32api
Version: 3.11
Name: mingw-w32api
Version: 3.11
-Release:
3
%{?dist}
+Release:
6
%{?dist}
Summary: MinGW Windows cross-compiler Win32 header files
License: Public Domain
Summary: MinGW Windows cross-compiler Win32 header files
License: Public Domain
@@
-13,19
+18,19
@@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildArch: noarch
-BuildRequires: mingw-filesystem >= 3
+BuildRequires: mingw-filesystem >=
2
3
BuildRequires: mingw-binutils
BuildRequires: mingw-gcc
BuildRequires: mingw-runtime
BuildRequires: mingw-binutils
BuildRequires: mingw-gcc
BuildRequires: mingw-runtime
-Requires: mingw-filesystem >= 3
+Requires: mingw-filesystem >=
2
3
Requires: mingw-binutils
Requires: mingw-gcc
Requires: mingw-runtime
# Once this is installed, mingw-bootstrap (binary bootstrapper) is no
# longer needed.
Requires: mingw-binutils
Requires: mingw-gcc
Requires: mingw-runtime
# Once this is installed, mingw-bootstrap (binary bootstrapper) is no
# longer needed.
-Obsoletes: mingw-bootstrap
+Obsoletes: mingw-
w32api-
bootstrap
#%define _use_internal_dependency_generator 0
#%define __debug_install_post %{nil}
#%define _use_internal_dependency_generator 0
#%define __debug_install_post %{nil}
@@
-59,9
+64,13
@@
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_mingw_includedir}/*
%files
%defattr(-,root,root)
%{_mingw_includedir}/*
-%{_mingw_libdir}/*
+%{_mingw_libdir}/*.a
+
%changelog
%changelog
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-6
+- Moved ole provides to mingw-filesystem package.
+
* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-3
- Use the RPM macros from mingw-filesystem.
* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11-3
- Use the RPM macros from mingw-filesystem.