cygwin-w32api-headers r5747

1 files changed, 38 insertions, 23 deletions

diff --git a/cygwin-w32api-headers.spec b/cygwin-w32api-headers.spec
index 43b4e18..c2fcb71 100644
--- a/cygwin-w32api-headers.spec
+++ b/cygwin-w32api-headers.spec
@@ -1,9 +1,9 @@
-%global snapshot_date 20121215
+%global snapshot_rev 5747
 %global branch trunk
 
 Name:           cygwin-w32api-headers
 Version:        2.0.999
-Release:        1.%{branch}.%{snapshot_date}
+Release:        4.%{branch}.svn%{snapshot_rev}
 Summary:        Win32 header files for Cygwin toolchain
 
 License:        Public Domain and LGPLv2+ and ZPLv2.1
@@ -11,51 +11,66 @@ Group:          Development/Libraries
 URL:            http://mingw-w64.sourceforge.net/
 BuildArch:      noarch
 
-%if 0%{?snapshot_date}
 # To regenerate 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
+# First, in any browser (need not be on the same machine), go to:
+# http://sourceforge.net/p/mingw-w64/code/%{snapshot_rev}/tarball?path=/trunk
+# Once the download is ready, then run:
+# 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
 
+BuildRequires:  cygwin32-filesystem
+BuildRequires:  cygwin64-filesystem
 
 %description
 Cygwin cross-compiler Win32 header files.
 
+%package -n cygwin32-w32api-headers
+Summary:   Win32 header files for Cygwin32 toolchain
+Requires:  cygwin32-filesystem
+Provides:  %{name} = %{version}-%{release}
+Obsoletes: %{name} < %{version}-%{release}
+
+%description -n cygwin32-w32api-headers
+Cygwin i686 cross-compiler Win32 header files.
+
+%package -n cygwin64-w32api-headers
+Summary:   Win32 header files for Cygwin64 toolchain
+Requires:  cygwin64-filesystem
+
+%description -n cygwin64-w32api-headers
+Cygwin x86_64 cross-compiler Win32 header files.
+
 
 %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
+%setup -q -n mingw-w64-code-%{snapshot_rev}-%{branch}
 
 
 %build
 pushd mingw-w64-headers
-    %_cygwin_configure --enable-w32api
+    %cygwin_configure --enable-sdk=directx --enable-w32api --includedir=%{cygwin32_includedir}/w32api
 popd
 
 
 %install
 pushd mingw-w64-headers
-    make install DESTDIR=$RPM_BUILD_ROOT 
+    %cygwin_make_install DESTDIR=$RPM_BUILD_ROOT
 popd
 
 
-%files
+%files -n cygwin32-w32api-headers
 %doc COPYING DISCLAIMER DISCLAIMER.PD mingw-w64-headers/direct-x/COPYING.LIB
-%{_cygwin_includedir}/w32api/
+%{cygwin32_includedir}/w32api/
+
+%files -n cygwin64-w32api-headers
+%doc COPYING DISCLAIMER DISCLAIMER.PD mingw-w64-headers/direct-x/COPYING.LIB
+%{cygwin64_includedir}/w32api/
 
 
 %changelog
+* Thu Jan 27 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-4.trunk.svn5747
+- Update to match current Cygwin package.
+- Update to new Cygwin packaging scheme.
+
 * Mon Jan 21 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-1.trunk.20121215
 - Update to match current Cygwin package.