From 541645b42908cfca27c45a5d921c02a0efcaf0b3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 21 Jan 2013 20:59:37 -0600 Subject: cygwin-w32api-runtime 20121215 --- cygwin-w32api-libs.spec | 78 ------------------------------------------- cygwin-w32api-runtime.spec | 83 ++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 3 files changed, 84 insertions(+), 79 deletions(-) delete mode 100644 cygwin-w32api-libs.spec create mode 100644 cygwin-w32api-runtime.spec diff --git a/cygwin-w32api-libs.spec b/cygwin-w32api-libs.spec deleted file mode 100644 index 181e76d..0000000 --- a/cygwin-w32api-libs.spec +++ /dev/null @@ -1,78 +0,0 @@ -%define __strip %{_cygwin_strip} -%define __objdump %{_cygwin_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_cygwin_findrequires} -%define __find_provides %{_cygwin_findprovides} - -%global snapshot_date 20121016 -%global branch trunk - -Name: cygwin-w32api-libs -Version: 2.0.999 -Release: 0.13.%{branch}.%{snapshot_date} -Summary: Windows API libraries for Cygwin toolchain - -License: Public Domain and ZPLv2.1 -Group: Development/Libraries -URL: http://mingw-w64.sourceforge.net/ -BuildArch: noarch - -%if 0%{?snapshot_date} -# To regerenate a snapshot: -# wget http://mingw-w64.svn.sourceforge.net/viewvc/mingw-w64/%{branch}/?view=tar -O mingw-w64-%{branch}-snapshot-$(date '+%Y%m%d').tar.gz -Source0: mingw-w64-%{branch}-snapshot-%{snapshot_date}.tar.gz -%else -Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz -%endif - -BuildRequires: cygwin-filesystem -BuildRequires: cygwin-binutils -BuildRequires: cygwin-w32api-headers -BuildRequires: cygwin-gcc - -Requires: cygwin-filesystem -Requires: cygwin-w32api-headers - -Obsoletes: cygwin-w32api < 3.17-4 -Provides: cygwin-w32api = 3.17-4 - -%description -MinGW Windows cross-compiler runtime, base libraries. - - -%prep -%if 0%{?snapshot_date} -rm -rf mingw-w64-v%{version} -mkdir mingw-w64-v%{version} -cd mingw-w64-v%{version} -tar -xf %{S:0} -%setup -q -D -T -n mingw-w64-v%{version}/%{branch} -%else -%setup -q -n mingw-w64-v%{version} -%endif - - -%build -pushd mingw-w64-crt - %_cygwin_configure --enable-w32api --disable-lib64 - make %{?_smp_mflags} -popd - - -%install -pushd mingw-w64-crt - make install DESTDIR=$RPM_BUILD_ROOT -popd - -# Dunno what to do with these files -rm -rf $RPM_BUILD_ROOT%{_cygwin_includedir}/w32api/*.c - - -%files -%doc COPYING DISCLAIMER DISCLAIMER.PD -%{_cygwin_libdir}/w32api/* - - -%changelog -* Tue Oct 16 2012 Yaakov Selkowitz - 2.0.999-1.trunk.20121016 -- Replace mingw.org w32api with mingw-w64 to match Cygwin distribution. diff --git a/cygwin-w32api-runtime.spec b/cygwin-w32api-runtime.spec new file mode 100644 index 0000000..0cc0a37 --- /dev/null +++ b/cygwin-w32api-runtime.spec @@ -0,0 +1,83 @@ +%define __strip %{_cygwin_strip} +%define __objdump %{_cygwin_objdump} +%define _use_internal_dependency_generator 0 +%define __find_requires %{_cygwin_findrequires} +%define __find_provides %{_cygwin_findprovides} + +%global snapshot_date 20121215 +%global branch trunk + +Name: cygwin-w32api-runtime +Version: 2.0.999 +Release: 0.13.%{branch}.%{snapshot_date} +Summary: Windows API libraries for Cygwin toolchain + +License: Public Domain and ZPLv2.1 +Group: Development/Libraries +URL: http://mingw-w64.sourceforge.net/ +BuildArch: noarch + +%if 0%{?snapshot_date} +# To regerenate a snapshot: +# wget http://mingw-w64.svn.sourceforge.net/viewvc/mingw-w64/%{branch}/?view=tar -O mingw-w64-%{branch}-snapshot-$(date '+%Y%m%d').tar.gz +Source0: mingw-w64-%{branch}-snapshot-%{snapshot_date}.tar.gz +%else +Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz +%endif + +BuildRequires: cygwin-filesystem +BuildRequires: cygwin-binutils +BuildRequires: cygwin-w32api-headers >= %{version}-%{release} +BuildRequires: cygwin-gcc + +Requires: cygwin-filesystem +Requires: cygwin-w32api-headers >= %{version}-%{release} + +Obsoletes: cygwin-w32api < 3.17-4 +Obsoletes: cygwin-w32api-libs +Provides: cygwin-w32api = 3.17-4 +Provides: cygwin-w32api-libs = %{version}-%{release} + +%description +MinGW Windows cross-compiler runtime, base libraries. + + +%prep +%if 0%{?snapshot_date} +rm -rf mingw-w64-v%{version} +mkdir mingw-w64-v%{version} +cd mingw-w64-v%{version} +tar -xf %{S:0} +%setup -q -D -T -n mingw-w64-v%{version}/%{branch} +%else +%setup -q -n mingw-w64-v%{version} +%endif + + +%build +pushd mingw-w64-crt + %_cygwin_configure --enable-w32api --disable-lib64 + make %{?_smp_mflags} +popd + + +%install +pushd mingw-w64-crt + make install DESTDIR=$RPM_BUILD_ROOT +popd + +# Dunno what to do with these files +rm -rf $RPM_BUILD_ROOT%{_cygwin_includedir}/w32api/*.c + + +%files +%doc COPYING DISCLAIMER DISCLAIMER.PD +%{_cygwin_libdir}/w32api/ + + +%changelog +* Tue Oct 16 2012 Yaakov Selkowitz - 2.0.999-1.trunk.20121215 +- Change name and update to match current Cygwin package. + +* Tue Oct 16 2012 Yaakov Selkowitz - 2.0.999-1.trunk.20121016 +- Replace mingw.org w32api with mingw-w64 to match Cygwin distribution. diff --git a/sources b/sources index 9ea5464..f886732 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1ddb6f55704380a406a887fc42ec757 mingw-w64-trunk-snapshot-20121016.tar.gz +2363c17abb6a627ba8bb08b38cf76075 mingw-w64-trunk-snapshot-20121215.tar.gz -- cgit