From 95b58d4b9bc334d09e849ddfc406eb7f59ecea17 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Fri, 25 Jul 2014 11:01:13 -0500
Subject: cygwin 1.7.31

---
 cygwin.spec    | 9 +++++++--
 get-sources.sh | 9 ++++++---
 sources        | 2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cygwin.spec b/cygwin.spec
index c44d5bf..c246472 100644
--- a/cygwin.spec
+++ b/cygwin.spec
@@ -1,14 +1,13 @@
 %{?cygwin_package_header}
 
 Name:           cygwin
-Version:        1.7.29
+Version:        1.7.31
 Release:        1
 Summary:        Cygwin cross-compiler runtime
 
 License:        GPLv2 with exceptions
 Group:          Development/Libraries
 URL:            http://www.cygwin.com/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 # downloaded and extracted by get-sources.sh
@@ -38,6 +37,7 @@ BuildRequires:  mingw64-gcc-c++
 BuildRequires:  mingw64-headers
 BuildRequires:  mingw64-zlib-static
 
+BuildRequires:  texinfo
 BuildRequires:  xmlto
 
 %description
@@ -123,9 +123,11 @@ rm -fr $RPM_BUILD_ROOT%{cygwin64_mandir}
 # these are provided by other packages
 rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/iconv.h
 rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/unctrl.h
+rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/rpc/
 
 rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/iconv.h
 rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/unctrl.h
+rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/rpc/
 
 
 %files -n cygwin32
@@ -142,6 +144,9 @@ rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/unctrl.h
 
 
 %changelog
+* Fri Jul 25 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.7.31-1
+- Version bump.
+
 * Thu May 22 2014 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.29-1
 - Version bump.
 
diff --git a/get-sources.sh b/get-sources.sh
index 561b6e3..0349bf0 100755
--- a/get-sources.sh
+++ b/get-sources.sh
@@ -1,6 +1,9 @@
-pv=$(grep '^Version:' cygwin.spec | sed -e 's/.* //')
-tarsrc=cygwin-$pv-2-src.tar.xz
+v=$(grep '^Version:' cygwin.spec | sed -e 's/.* //')
+r=3
+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} winsup-$pv.tar.bz2 && rm ${tarsrc}
+tar axf ${tarsrc} cygwin-$v-$r.src/winsup-$v.tar.bz2 \
+  && mv cygwin-$v-$r.src/winsup-$v.tar.bz2 . \
+  && rmdir cygwin-$v-$r.src && rm -f ${tarsrc}
diff --git a/sources b/sources
index ab04a54..233c3c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5094c5b45b42b55d6332885f638aeda2  winsup-1.7.29.tar.bz2
+10c14d1071318722da4dbc23dd0017d8  winsup-1.7.31.tar.bz2
-- 
cgit