cygwin 1.7.20

2 files changed, 44 insertions, 43 deletions

diff --git a/cygwin.spec b/cygwin.spec
index d92954d..8017200 100644
--- a/cygwin.spec
+++ b/cygwin.spec
@@ -1,11 +1,7 @@
-%define __strip %{_cygwin_strip}
-%define __objdump %{_cygwin_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_cygwin_findrequires}
-%define __find_provides %{_cygwin_findprovides}
+%{?cygwin_package_header}
 
 Name:           cygwin
-Version:        1.7.17
+Version:        1.7.20
 Release:        1
 Summary:        Cygwin cross-compiler runtime
 
@@ -18,34 +14,41 @@ BuildArch:      noarch
 # downloaded and extracted by get-sources.sh
 Source0:        winsup-%{version}.tar.bz2
 
-BuildRequires:  cygwin-filesystem >= 2
-BuildRequires:  cygwin-binutils
-BuildRequires:  cygwin-gcc
-BuildRequires:  cygwin-gcc-c++
-BuildRequires:  cygwin-w32api-headers
-BuildRequires:  cygwin-w32api-libs
+BuildRequires:  cygwin32-filesystem >= 7
+BuildRequires:  cygwin32-binutils
+BuildRequires:  cygwin32-gcc
+BuildRequires:  cygwin32-gcc-c++
+BuildRequires:  cygwin32-w32api-headers
+BuildRequires:  cygwin32-w32api-runtime
 BuildRequires:  mingw32-crt
 BuildRequires:  mingw32-headers
-
-Requires:       cygwin-w32api-libs
-
+BuildRequires:  xmlto
 
 %description
 Cygwin cross-compiler runtime, base libraries.
 
+%package -n cygwin32
+Summary:    Cygwin32 cross-compiler runtime
+Requires:   cygwin32-w32api-runtime
+Provides:   cygwin = %{version}-%{release}
+Obsoletes:  cygwin < %{version}-%{release}
+
+%description -n cygwin32
+Cygwin 32-bit cross-compiler runtime, base libraries.
+
 
 %prep
 %setup -q -n src
 
 
 %build
-mkdir -p build
-pushd build
+mkdir -p build_cyg32
+pushd build_cyg32
 
-../configure \
-  --prefix=%{_cygwin_prefix} \
+`pwd`/../configure \
+  --prefix=%{cygwin32_prefix} \
   --build=%_build --host=%_host \
-  --target=%{_cygwin_target}
+  --target=%{cygwin32_target}
 
 make %{?_smp_mflags} all
 
@@ -55,38 +58,36 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd build
-make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{_cygwin_prefix}
+pushd build_cyg32
+make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{cygwin32_prefix}
 
 # remove files not needed for cross-compiling
-rm -fr $RPM_BUILD_ROOT%{_cygwin_prefix}/etc
-rm -fr $RPM_BUILD_ROOT%{_cygwin_bindir}/cygserver-config
-rm -fr $RPM_BUILD_ROOT%{_cygwin_sbindir}
-rm -fr $RPM_BUILD_ROOT%{_cygwin_docdir}
-rm -fr $RPM_BUILD_ROOT%{_cygwin_infodir}
-rm -fr $RPM_BUILD_ROOT%{_cygwin_mandir}
+rm -fr $RPM_BUILD_ROOT%{cygwin32_prefix}/etc
+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}
 
 # these are provided by other packages
-rm -fr $RPM_BUILD_ROOT%{_cygwin_includedir}/iconv.h
-rm -fr $RPM_BUILD_ROOT%{_cygwin_includedir}/unctrl.h
-rm -fr $RPM_BUILD_ROOT%{_cygwin_includedir}/mingw
-rm -fr $RPM_BUILD_ROOT%{_cygwin_includedir}/w32api
-rm -fr $RPM_BUILD_ROOT%{_cygwin_libdir}/mingw
-rm -fr $RPM_BUILD_ROOT%{_cygwin_libdir}/w32api
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/iconv.h
+rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/unctrl.h
 
 
-%files
-%defattr(-,root,root,-)
+%files -n cygwin32
 %doc winsup/COPYING winsup/CYGWIN_LICENSE
-%{_cygwin_bindir}/cygwin1.dll
-%{_cygwin_includedir}/*
-%{_cygwin_libdir}/*
+%{cygwin32_bindir}/cygwin1.dll
+%{cygwin32_includedir}/*
+%{cygwin32_libdir}/*
 
 
 %changelog
+* Wed Jun 26 2013 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.20-1
+- Version bump.
+- Updated for new Cygwin packaging scheme.
+
 * Sun Oct 21 2012 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.17-1
 - Version bump.
 - New API: memrchr.
diff --git a/sources b/sources
index 36bccdf..8869931 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f67925155ea10be1418d1c38cdb0a0e3  winsup-1.7.17.tar.bz2
+20281e989a88263dd2d78f8c71f8f1f1  winsup-1.7.20.tar.bz2