cygwin 1.7.34

4 files changed, 8 insertions, 37 deletions

diff --git a/cygwin.spec b/cygwin.spec
index 98313c1..c7e3679 100644
--- a/cygwin.spec
+++ b/cygwin.spec
@@ -1,7 +1,7 @@
 %{?cygwin_package_header}
 
 Name:           cygwin
-Version:        1.7.33
+Version:        1.7.34
 Release:        1%{?dist}
 Summary:        Cygwin cross-compiler runtime
 
@@ -12,7 +12,6 @@ BuildArch:      noarch
 
 # downloaded and extracted by get-sources.sh
 Source0:        winsup-%{version}.tar.bz2
-Patch0:         winsup-doc-dblatex.patch
 
 BuildRequires:  cygwin32-filesystem >= 7
 BuildRequires:  cygwin32-binutils
@@ -71,7 +70,6 @@ Cygwin 64-bit cross-compiler runtime, base libraries.
 
 %prep
 %setup -q -n src
-%patch0 -p0
 touch winsup/cygwin/tlsoffsets*.h
 touch winsup/cygwin/devices.cc
 
@@ -115,18 +113,14 @@ rm -f  $RPM_BUILD_ROOT%{cygwin32_bindir}/cyglsa*
 rm -f  $RPM_BUILD_ROOT%{cygwin32_bindir}/cygserver-config
 rm -f  $RPM_BUILD_ROOT%{cygwin32_bindir}/*.exe
 rm -fr $RPM_BUILD_ROOT%{cygwin32_sbindir}
-rm -fr $RPM_BUILD_ROOT%{cygwin32_docdir}
-rm -fr $RPM_BUILD_ROOT%{cygwin32_infodir}
-rm -fr $RPM_BUILD_ROOT%{cygwin32_mandir}
+rm -fr $RPM_BUILD_ROOT%{cygwin32_datadir}
 
 rm -fr $RPM_BUILD_ROOT%{cygwin64_prefix}/etc
 rm -f  $RPM_BUILD_ROOT%{cygwin64_bindir}/cyglsa*
 rm -f  $RPM_BUILD_ROOT%{cygwin64_bindir}/cygserver-config
 rm -f  $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
 rm -fr $RPM_BUILD_ROOT%{cygwin64_sbindir}
-rm -fr $RPM_BUILD_ROOT%{cygwin64_docdir}
-rm -fr $RPM_BUILD_ROOT%{cygwin64_infodir}
-rm -fr $RPM_BUILD_ROOT%{cygwin64_mandir}
+rm -fr $RPM_BUILD_ROOT%{cygwin64_datadir}
 
 # these are provided by other packages
 rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/iconv.h
@@ -152,6 +146,9 @@ rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/rpc/
 
 
 %changelog
+* Tue Mar 3 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 1.7.34-1
+- Version bump.
+
 * Fri Nov 28 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.7.33-1
 - Version bump.
 
diff --git a/get-sources.sh b/get-sources.sh
index 3b9c069..20d0a4c 100755
--- a/get-sources.sh
+++ b/get-sources.sh
@@ -1,5 +1,5 @@
 v=$(grep '^Version:' cygwin.spec | sed -e 's/.* //')
-r=1
+r=6
 tarsrc=cygwin-$v-$r-src.tar.xz
 url=ftp://sourceware.org/pub/cygwin/x86/release/cygwin/${tarsrc}
 
diff --git a/sources b/sources
index 320f014..b10452b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-040708af28effc80527873e6a6eda318  winsup-1.7.32.tar.bz2
+6580e8317896633b074d7bb28c2012d6  winsup-1.7.34.tar.bz2
diff --git a/winsup-doc-dblatex.patch b/winsup-doc-dblatex.patch
deleted file mode 100644
index 15c52fa..0000000
--- a/winsup-doc-dblatex.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- winsup/doc/Makefile.in	07 Nov 2013 00:19:51 -0000
-+++ winsup/doc/Makefile.in	28 Nov 2014 06:04:53 -0000
-@@ -58,20 +58,20 @@ cygwin-ug-net/cygwin-ug-net.html : cygwi
- 	-${XMLTO} html -o cygwin-ug-net/ -m $(srcdir)/cygwin.xsl $<
- 
- cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.xml fo.xsl
--	-xsltproc --xinclude $(srcdir)/fo.xsl $< | fop -q -fo - $@
-+	-${XMLTO} pdf -o cygwin-ug-net/ -m $(srcdir)/cygwin.xsl $<
- 
- cygwin-api/cygwin-api.html : cygwin-api.xml cygwin.xsl
- 	-${XMLTO} html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $<
- 
- cygwin-api/cygwin-api.pdf : cygwin-api.xml fo.xsl
--	-xsltproc --xinclude $(srcdir)/fo.xsl $< | fop -q -fo - $@
-+	-${XMLTO} pdf -o cygwin-api/ -m $(srcdir)/cygwin.xsl $<
-
- cygwin-api.xml : cygwin-api.in.xml doctool Makefile.in
- 	-./doctool -m $(DBXDIRS) -s $(srcdir) -o $@ $<
- 
- faq/faq.html : $(FAQ_SOURCES)
- 	-${XMLTO} html -o faq -m $(srcdir)/cygwin.xsl $(srcdir)/faq.xml
--	-sed -i 's;</a><a name="id[0-9]*"></a>;</a>;g' faq/faq.html
-+	-sed -i 's;</a><a name="id[mp][0-9]*"></a>;</a>;g' faq/faq.html
- 
- doctool : doctool.c
- 	gcc -g $< -o $@