diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2014-11-28 10:51:09 -0600 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2014-11-28 10:51:09 -0600 |
| commit | b2c261939b898667421fad96a8d937a40bfeed41 (patch) | |
| tree | b7e761ccf36ac3e7fdc3ed009352e3daedf8a8e7 /cygwin.spec | |
| parent | 58a51e855878f7f5afc76a1f231e515fd3840f31 (diff) | |
| download | cygwin-b2c261939b898667421fad96a8d937a40bfeed41.tar.gz cygwin-b2c261939b898667421fad96a8d937a40bfeed41.tar.xz cygwin-b2c261939b898667421fad96a8d937a40bfeed41.zip | |
cygwin 1.7.33
Diffstat (limited to 'cygwin.spec')
| -rw-r--r-- | cygwin.spec | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/cygwin.spec b/cygwin.spec index 576264a..98313c1 100644 --- a/cygwin.spec +++ b/cygwin.spec @@ -1,7 +1,7 @@ %{?cygwin_package_header} Name: cygwin -Version: 1.7.32 +Version: 1.7.33 Release: 1%{?dist} Summary: Cygwin cross-compiler runtime @@ -12,6 +12,7 @@ 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 @@ -37,8 +38,16 @@ BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-headers BuildRequires: mingw64-zlib-static +%if 0%{?fedora} >= 21 || 0%{?rhel} == 7 +# mingw-gcc-4.9.1-2 (in F21 and EPEL7) switched to --enable-threads=posix, +# but does not have these Requires for linking with -static +BuildRequires: mingw32-winpthreads-static +BuildRequires: mingw64-winpthreads-static +%endif + BuildRequires: texinfo -BuildRequires: xmlto +BuildRequires: xmlto-tex +BuildRequires: dblatex %description Cygwin cross-compiler runtime, base libraries. @@ -62,6 +71,7 @@ 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 @@ -91,8 +101,6 @@ popd %install -rm -rf $RPM_BUILD_ROOT - pushd build_cyg32 make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{cygwin32_prefix} popd @@ -144,6 +152,12 @@ rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/rpc/ %changelog +* Fri Nov 28 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.7.33-1 +- Version bump. + +* Fri Aug 22 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.7.32-2 +- BR: mingw*-winpthreads-static to fix FTBFS on F21/EPEL7 + * Fri Aug 15 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.7.32-1 - Version bump. |