cygwin 2.0.4

3 files changed, 10 insertions, 7 deletions

diff --git a/cygwin.spec b/cygwin.spec
index c7e3679..cbd0534 100644
--- a/cygwin.spec
+++ b/cygwin.spec
@@ -1,7 +1,7 @@
 %{?cygwin_package_header}
 
 Name:           cygwin
-Version:        1.7.34
+Version:        2.0.4
 Release:        1%{?dist}
 Summary:        Cygwin cross-compiler runtime
 
@@ -11,7 +11,7 @@ URL:            http://www.cygwin.com/
 BuildArch:      noarch
 
 # downloaded and extracted by get-sources.sh
-Source0:        winsup-%{version}.tar.bz2
+Source0:        newlib-cygwin-%{version}.tar.bz2
 
 BuildRequires:  cygwin32-filesystem >= 7
 BuildRequires:  cygwin32-binutils
@@ -69,7 +69,7 @@ Cygwin 64-bit cross-compiler runtime, base libraries.
 
 
 %prep
-%setup -q -n src
+%setup -q -n newlib-cygwin
 touch winsup/cygwin/tlsoffsets*.h
 touch winsup/cygwin/devices.cc
 
@@ -146,6 +146,9 @@ rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/rpc/
 
 
 %changelog
+* Fri Jun 19 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 2.0.4-1
+- new version
+
 * Tue Mar 3 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 1.7.34-1
 - Version bump.
 
diff --git a/get-sources.sh b/get-sources.sh
index 20d0a4c..9020da2 100755
--- a/get-sources.sh
+++ b/get-sources.sh
@@ -1,9 +1,9 @@
 v=$(grep '^Version:' cygwin.spec | sed -e 's/.* //')
-r=6
+r=1
 tarsrc=cygwin-$v-$r-src.tar.xz
 url=ftp://sourceware.org/pub/cygwin/x86/release/cygwin/${tarsrc}
 
 curl --fail --remote-time --location --output ${tarsrc} $url
-tar axf ${tarsrc} cygwin-$v-$r.src/winsup-$v.tar.bz2 \
-  && mv cygwin-$v-$r.src/winsup-$v.tar.bz2 . \
+tar axf ${tarsrc} cygwin-$v-$r.src/newlib-cygwin-$v.tar.bz2 \
+  && mv cygwin-$v-$r.src/newlib-cygwin-$v.tar.bz2 . \
   && rmdir cygwin-$v-$r.src && rm -f ${tarsrc}
diff --git a/sources b/sources
index b10452b..b78a945 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6580e8317896633b074d7bb28c2012d6  winsup-1.7.34.tar.bz2
+daa15f895cc6006bab8a029ba630c1f6  newlib-cygwin-2.0.4.tar.bz2