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
Fix build of DLLs.
[fedora-mingw.git]
/
binutils
/
mingw-binutils.spec
diff --git
a/binutils/mingw-binutils.spec
b/binutils/mingw-binutils.spec
index
639b606
..
27d58d2
100644
(file)
--- a/
binutils/mingw-binutils.spec
+++ b/
binutils/mingw-binutils.spec
@@
-4,7
+4,7
@@
Name: mingw-binutils
Version: %{binutils_version}_%{mingw_binutils_rpmvers}
Name: mingw-binutils
Version: %{binutils_version}_%{mingw_binutils_rpmvers}
-Release:
2
%{?dist}
+Release:
7
%{?dist}
Summary: MinGW Windows binutils
License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
Summary: MinGW Windows binutils
License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@
-16,6
+16,9
@@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex
BuildRequires: bison
BuildRequires: texinfo
BuildRequires: flex
BuildRequires: bison
BuildRequires: texinfo
+BuildRequires: mingw-filesystem >= 2
+
+Requires: mingw-filesystem >= 2
%description
%description
@@
-33,12
+36,12
@@
cd build
CFLAGS="$RPM_OPT_FLAGS" \
../configure \
--build=%_build --host=%_host \
CFLAGS="$RPM_OPT_FLAGS" \
../configure \
--build=%_build --host=%_host \
- --target=
i686-pc-mingw32
\
+ --target=
%{_mingw_target}
\
--verbose --disable-nls \
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
--verbose --disable-nls \
--without-included-gettext \
--disable-win32-registry \
--disable-werror \
- --with-sysroot=%{_
prefix}/i686-pc-mingw32/sys-root
\
+ --with-sysroot=%{_
mingw_sysroot}
\
--prefix=%{_prefix} --bindir=%{_bindir} \
--includedir=%{_includedir} --libdir=%{_libdir} \
--mandir=%{_mandir} --infodir=%{_infodir}
--prefix=%{_prefix} --bindir=%{_bindir} \
--includedir=%{_includedir} --libdir=%{_libdir} \
--mandir=%{_mandir} --infodir=%{_infodir}
@@
-56,11
+59,6
@@
make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_infodir}
rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
rm -rf $RPM_BUILD_ROOT%{_infodir}
rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
-# Install puts a second copy of all the executables under the MinGW
-# root (/usr/i686-pc-mingw/bin/*). I'm not sure why it does this,
-# but it doesn't seem to be necessary.
-rm -rf $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/bin
-
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-70,9
+68,13
@@
rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%{_mandir}/man1/*
%{_bindir}/i686-pc-mingw32-*
%defattr(-,root,root)
%{_mandir}/man1/*
%{_bindir}/i686-pc-mingw32-*
+%{_prefix}/i686-pc-mingw32/bin
%{_prefix}/i686-pc-mingw32/lib/ldscripts
%changelog
%{_prefix}/i686-pc-mingw32/lib/ldscripts
%changelog
-* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-2
+* Thu Sep 4 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-7
+- Use mingw-filesystem.
+
+* Mon Jul 7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-5
- Initial RPM release, largely based on earlier work from several sources.
- Initial RPM release, largely based on earlier work from several sources.