[mingw-binutils: 26/26] Use mingw macros without leading underscore
by Erik van Pienbroek
commit 258f92f109484fe2b07bbb0f3712728147a6a883
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Tue Mar 6 17:00:33 2012 +0100
Use mingw macros without leading underscore
mingw-binutils.spec | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/mingw-binutils.spec b/mingw-binutils.spec
index 690c327..890a410 100644
--- a/mingw-binutils.spec
+++ b/mingw-binutils.spec
@@ -40,9 +40,9 @@ cd build
CFLAGS="$RPM_OPT_FLAGS" \
../configure \
--build=%_build --host=%_host \
- --target=%{_mingw32_target} \
+ --target=%{mingw32_target} \
--disable-nls \
- --with-sysroot=%{_mingw32_sysroot} \
+ --with-sysroot=%{mingw32_sysroot} \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--includedir=%{_includedir} \
@@ -63,9 +63,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
# Temporary provide mingw-strip, mingw-objdump and mingw-objcopy
# in preparation for win32+win64 support
-ln -s %{_mingw32_strip} $RPM_BUILD_ROOT%{_bindir}/%{mingw_strip}
-ln -s %{_mingw32_objdump} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objdump}
-ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
+ln -s %{mingw32_strip} $RPM_BUILD_ROOT%{_bindir}/%{mingw_strip}
+ln -s %{mingw32_objdump} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objdump}
+ln -s %{mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
%files -n mingw32-binutils
@@ -73,14 +73,15 @@ ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
%{_bindir}/%{mingw_strip}
%{_bindir}/%{mingw_objdump}
%{_bindir}/%{mingw_objcopy}
-%{_bindir}/%{_mingw32_target}-*
-%{_prefix}/%{_mingw32_target}/bin/*
-%{_prefix}/%{_mingw32_target}/lib/ldscripts
+%{_bindir}/%{mingw32_target}-*
+%{_prefix}/%{mingw32_target}/bin/*
+%{_prefix}/%{mingw32_target}/lib/ldscripts
%changelog
* Tue Mar 6 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.22.52-2
- Renamed the source package to mingw-binutils (RHBZ #673786)
+- Use mingw macros without leading underscore
* Sat Feb 25 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.22.52-1
- Update to 2.22.52 20120225 snapshot
12 years, 2 months
[mingw-binutils: 25/26] Renamed the source package to mingw-binutils
by Erik van Pienbroek
commit 6914a787bceabe1cb539114d6dc236c1258026b9
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Tue Mar 6 16:58:48 2012 +0100
Renamed the source package to mingw-binutils
mingw32-binutils.spec => mingw-binutils.spec | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-binutils.spec b/mingw-binutils.spec
similarity index 91%
rename from mingw32-binutils.spec
rename to mingw-binutils.spec
index 8c39404..690c327 100644
--- a/mingw32-binutils.spec
+++ b/mingw-binutils.spec
@@ -1,6 +1,6 @@
-Name: mingw32-binutils
+Name: mingw-binutils
Version: 2.22.52
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows binutils
License: GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -22,6 +22,14 @@ MinGW Windows binutils (utilities like 'strip', 'as', 'ld') which
understand Windows executables and DLLs.
+%package -n mingw32-binutils
+Summary: MinGW Windows binutils
+
+%description -n mingw32-binutils
+MinGW Windows binutils (utilities like 'strip', 'as', 'ld') which
+understand Windows executables and DLLs.
+
+
%prep
%setup -q -n binutils-%{version}
@@ -60,7 +68,7 @@ ln -s %{_mingw32_objdump} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objdump}
ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
-%files
+%files -n mingw32-binutils
%{_mandir}/man1/*
%{_bindir}/%{mingw_strip}
%{_bindir}/%{mingw_objdump}
@@ -71,6 +79,9 @@ ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
%changelog
+* Tue Mar 6 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.22.52-2
+- Renamed the source package to mingw-binutils (RHBZ #673786)
+
* Sat Feb 25 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.22.52-1
- Update to 2.22.52 20120225 snapshot
- Bump the BR/R: mingw32-filesystem to >= 95
12 years, 2 months
[mingw-binutils: 23/26] Rebuild using the i686-w64-mingw32 triplet
by Erik van Pienbroek
commit e1cce8f6145045b2801441e428a09ec518547b07
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Mon Feb 27 17:09:24 2012 +0100
Rebuild using the i686-w64-mingw32 triplet
- Bump the BR/R: mingw32-filesystem to >= 95
- Rebuild using the i686-w64-mingw32 triplet
- Temporary provide mingw-strip, mingw-objdump and mingw-objcopy
in preparation for win32+win64 support
mingw32-binutils.spec | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/mingw32-binutils.spec b/mingw32-binutils.spec
index edf6497..8c39404 100644
--- a/mingw32-binutils.spec
+++ b/mingw32-binutils.spec
@@ -11,10 +11,10 @@ Source0: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
BuildRequires: flex
BuildRequires: bison
BuildRequires: texinfo
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 95
# NB: This must be left in.
-Requires: mingw32-filesystem >= 65
+Requires: mingw32-filesystem >= 95
%description
@@ -53,18 +53,31 @@ make DESTDIR=$RPM_BUILD_ROOT install
rm -rf $RPM_BUILD_ROOT%{_infodir}
rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
+# Temporary provide mingw-strip, mingw-objdump and mingw-objcopy
+# in preparation for win32+win64 support
+ln -s %{_mingw32_strip} $RPM_BUILD_ROOT%{_bindir}/%{mingw_strip}
+ln -s %{_mingw32_objdump} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objdump}
+ln -s %{_mingw32_objcopy} $RPM_BUILD_ROOT%{_bindir}/%{mingw_objcopy}
+
%files
%{_mandir}/man1/*
-%{_bindir}/i686-pc-mingw32-*
-%{_prefix}/i686-pc-mingw32/bin/*
-%{_prefix}/i686-pc-mingw32/lib/ldscripts
+%{_bindir}/%{mingw_strip}
+%{_bindir}/%{mingw_objdump}
+%{_bindir}/%{mingw_objcopy}
+%{_bindir}/%{_mingw32_target}-*
+%{_prefix}/%{_mingw32_target}/bin/*
+%{_prefix}/%{_mingw32_target}/lib/ldscripts
%changelog
* Sat Feb 25 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.22.52-1
- Update to 2.22.52 20120225 snapshot
+- Bump the BR/R: mingw32-filesystem to >= 95
+- Rebuild using the i686-w64-mingw32 triplet
- Dropped some obsolete configure arguments
+- Temporary provide mingw-strip, mingw-objdump and mingw-objcopy
+ in preparation for win32+win64 support
* Tue Jan 10 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.22-1
- Update to 2.22
12 years, 2 months
