diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2014-01-16 02:18:43 -0600 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2014-01-16 02:18:43 -0600 |
| commit | 7fddd8e2319a95ecd862dd7989c90bb90395cdae (patch) | |
| tree | e47f36b4768b230033ccec6ccaa2a77d79326d99 | |
| parent | eee286041e68ed4abbafa5b4c31d7d07decfb467 (diff) | |
| download | cygwin-w32api-runtime-7fddd8e2319a95ecd862dd7989c90bb90395cdae.tar.gz cygwin-w32api-runtime-7fddd8e2319a95ecd862dd7989c90bb90395cdae.tar.xz cygwin-w32api-runtime-7fddd8e2319a95ecd862dd7989c90bb90395cdae.zip | |
cygwin-w32api-runtime 3.1.0
| -rw-r--r-- | cygwin-w32api-runtime.spec | 21 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | w32api-lib64dir.patch | 46 |
3 files changed, 16 insertions, 53 deletions
diff --git a/cygwin-w32api-runtime.spec b/cygwin-w32api-runtime.spec index 3cd75d4..da3e0a2 100644 --- a/cygwin-w32api-runtime.spec +++ b/cygwin-w32api-runtime.spec @@ -1,11 +1,11 @@ %{?cygwin_package_header} -%global snapshot_rev 5747 -%global branch trunk +#%%global snapshot_rev 5747 +#%%global branch trunk Name: cygwin-w32api-runtime -Version: 2.0.999 -Release: 0.15.%{branch}.svn%{snapshot_rev} +Version: 3.1.0 +Release: 1 Summary: Windows API libraries for Cygwin toolchain License: Public Domain and ZPLv2.1 @@ -13,10 +13,13 @@ Group: Development/Libraries URL: http://mingw-w64.sourceforge.net/ BuildArch: noarch +%if 0%{?snapshot_rev} # To regenerate a snapshot: # wget http://sourceforge.net/code-snapshots/svn/m/mi/mingw-w64/code/mingw-w64-code-%{snapshot_rev}-%{branch}.zip Source0: mingw-w64-code-%{snapshot_rev}-%{branch}.zip -Patch0: w32api-lib64dir.patch +%else +Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2 +%endif BuildRequires: cygwin32-filesystem BuildRequires: cygwin32-binutils @@ -55,8 +58,11 @@ Windows cross-compiler runtime base libraries for Cygwin64 toolchain. %prep +%if 0%{?snapshot_rev} %setup -q -n mingw-w64-code-%{snapshot_rev}-%{branch} -%patch0 -p1 +%else +%setup -q -n mingw-w64-v%{version} +%endif %build @@ -88,6 +94,9 @@ rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/w32api/*.c %changelog +* Thu Jan 16 2014 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 3.1.0-1 +- Update to latest stable release. + * Thu Jun 27 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-0.15.trunk.r5747 - Update to SVN trunk. - Update to new Cygwin packaging scheme. @@ -1 +1 @@ -348e0c6439141cc7d4ccbdb90982fb94 mingw-w64-code-5747-trunk.zip +df0e7657f46cbd59ed9cbe2a50c66e15 mingw-w64-v3.1.0.tar.bz2 diff --git a/w32api-lib64dir.patch b/w32api-lib64dir.patch deleted file mode 100644 index 52cc6b6..0000000 --- a/w32api-lib64dir.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/mingw-w64-crt/configure.ac (revision 5594) -+++ b/mingw-w64-crt/configure.ac (working copy) -@@ -118,10 +118,14 @@ - [AC_MSG_WARN([Building the runtime to use libce with lib32 or lib64 is unsupported.])])]) - - AS_CASE([$enable_w32api], -- [yes],[ -+ [yes],[AS_CASE([$host_cpu], -+ [x86_64],[ -+ AC_SUBST([LIB64SUFFIXDIR],[lib/w32api]) -+ AC_SUBST([LIB32SUFFIXDIR],[lib32/w32api])], -+ [i*86],[ - AC_SUBST([LIB64SUFFIXDIR],[lib64/w32api]) -- AC_SUBST([LIB32SUFFIXDIR],[lib/w32api]) -- ], -+ AC_SUBST([LIB32SUFFIXDIR],[lib/w32api])] -+ )], - [AS_CASE([$host_cpu], - [x86_64],[ - AC_SUBST([LIB64SUFFIXDIR],[lib]) ---- a/mingw-w64-crt/configure (revision 5594) -+++ b/mingw-w64-crt/configure (working copy) -@@ -5195,12 +5195,21 @@ fi - - case $enable_w32api in #( - yes) : -+ case $host_cpu in #( -+ x86_64) : -+ -+ LIB64SUFFIXDIR=lib/w32api -+ -+ LIB32SUFFIXDIR=lib32/w32api -+ ;; #( -+ i*86) : - - LIB64SUFFIXDIR=lib64/w32api - - LIB32SUFFIXDIR=lib/w32api -- -- ;; #( -+ ;; #( -+esac -+ ;; - *) : - case $host_cpu in #( - x86_64) : |