Fix rsrc section alignment

1 files changed, 15 insertions, 7 deletions

diff --git a/cygwin-binutils.spec b/cygwin-binutils.spec
index 4eb52b8..1a83615 100644
--- a/cygwin-binutils.spec
+++ b/cygwin-binutils.spec
@@ -1,18 +1,22 @@
+#%%global cygrev 3
 %global run_testsuite 0
 
 Name:           cygwin-binutils
 Version:        2.24.51
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-compiled version of binutils for Cygwin environments
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
 Group:          Development/Libraries
 
 URL:            http://www.gnu.org/software/binutils/
-Source0:        ftp://ftp.cygwin.com/pub/cygwin/x86_64/release/binutils/binutils-%{version}-2-src.tar.xz
+%if 0%{?cygrev}
+Source0:        ftp://ftp.cygwin.com/pub/cygwin/x86_64/release/binutils/binutils-%{version}-%{cygrev}-src.tar.xz
+%else
+Source0:        binutils-gdb-%{version}.tar.bz2
+%endif
 Patch0:         w32api-sysroot.patch
 Patch1:         binutils-textdomain.patch
-Patch2:         ld-parallel-make.patch
 
 
 BuildRequires:  flex
@@ -60,10 +64,13 @@ understand Cygwin executables and DLLs.
 
 
 %prep
-%setup -q -n binutils-%{version}-2
+%if 0%{?cygrev}
+%setup -q -n binutils-%{version}-%{cygrev}
+%else
+%setup -q -n binutils-gdb
+%endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 
 %build
@@ -234,7 +241,6 @@ cat cygwin-opcodes.lang >> cygwin-binutils.lang
 %{_prefix}/%{cygwin32_target}/bin/objdump
 %{_prefix}/%{cygwin32_target}/bin/ranlib
 %{_prefix}/%{cygwin32_target}/bin/strip
-%{_prefix}/%{cygwin32_target}/lib/default-manifest.o
 %{_prefix}/%{cygwin32_target}/lib/ldscripts
 
 %files -n cygwin64-binutils
@@ -268,11 +274,13 @@ cat cygwin-opcodes.lang >> cygwin-binutils.lang
 %{_prefix}/%{cygwin64_target}/bin/objdump
 %{_prefix}/%{cygwin64_target}/bin/ranlib
 %{_prefix}/%{cygwin64_target}/bin/strip
-%{_prefix}/%{cygwin64_target}/lib/default-manifest.o
 %{_prefix}/%{cygwin64_target}/lib/ldscripts
 
 
 %changelog
+* Tue Jun 10 2014 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.24.51-2
+- Updated snapshot to fix resource section alignment.
+
 * Wed Mar 26 2014 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.24.51-1
 - Updated snapshot with default manifest support.
 - Enable NLS.