[rtems-crossrpms commit] Rework for centos5 compliance.
Ralf Corsepius
ralf at rtems.org
Thu Jan 30 18:03:15 UTC 2014
Module: rtems-crossrpms
Branch: master
Commit: 9991e3892090383c6e29e8d9646ff61714a220c7
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=9991e3892090383c6e29e8d9646ff61714a220c7
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Wed Jan 29 07:44:45 2014 +0100
Rework for centos5 compliance.
---
cygwin/i686/Makefile.am | 4 +-
cygwin/i686/Makefile.in | 4 +-
cygwin/i686/i686-pc-cygwin-gcc.spec | 6 -
cygwin/i686/i686-pc-cygwin-w32api-headers.spec | 10 +-
cygwin/i686/i686-pc-cygwin-w32api-runtime.spec | 10 +-
cygwin/i686/i686-pc-cygwin-w32api.spec | 154 --------------------
cygwin/i686/w32api-headers.add | 8 +-
cygwin/i686/w32api-runtime.add | 8 +-
cygwin/x86_64/Makefile.am | 4 +-
cygwin/x86_64/Makefile.in | 4 +-
cygwin/x86_64/w32api-headers.add | 8 +-
cygwin/x86_64/w32api-runtime.add | 8 +-
cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec | 10 +-
cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec | 10 +-
14 files changed, 44 insertions(+), 204 deletions(-)
diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index 1a2a926..4c19901 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -47,11 +47,11 @@ MPFR_RPMREL = 0.20131210.0%{?dist}
include ../mpfr.am
W32API_HEADERS_VERS = 3.1.0-1
-W32API_HEADERS_RPMREL = 0.20140129.0%{?dist}
+W32API_HEADERS_RPMREL = 0.20140129.1%{?dist}
include ../w32api-headers.am
W32API_RUNTIME_VERS = 3.1.0-1
-W32API_RUNTIME_RPMREL = 0.20140129.0%{?dist}
+W32API_RUNTIME_RPMREL = 0.20140129.1%{?dist}
include ../w32api-runtime.am
BINUTILS_VERS = 2.23.51-1
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index 75f3416..6ee3c24 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -317,13 +317,13 @@ MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/mpfr.add \
$(top_srcdir)/gcc/rpm-install.add \
$(top_srcdir)/common/clean.add $(srcdir)/target-mpfr.add
W32API_HEADERS_VERS = 3.1.0-1
-W32API_HEADERS_RPMREL = 0.20140129.0%{?dist}
+W32API_HEADERS_RPMREL = 0.20140129.1%{?dist}
W32API_HEADERS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(srcdir)/w32api-headers.add $(top_srcdir)/gcc/rpm-install.add \
$(top_srcdir)/common/clean.add \
$(srcdir)/target-w32api-headers.add
W32API_RUNTIME_VERS = 3.1.0-1
-W32API_RUNTIME_RPMREL = 0.20140129.0%{?dist}
+W32API_RUNTIME_RPMREL = 0.20140129.1%{?dist}
W32API_RUNTIME_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(srcdir)/w32api-runtime.add $(top_srcdir)/gcc/rpm-install.add \
$(top_srcdir)/common/clean.add \
diff --git a/cygwin/i686/i686-pc-cygwin-gcc.spec b/cygwin/i686/i686-pc-cygwin-gcc.spec
index ec19926..65725e2 100644
--- a/cygwin/i686/i686-pc-cygwin-gcc.spec
+++ b/cygwin/i686/i686-pc-cygwin-gcc.spec
@@ -131,12 +131,6 @@ BuildRequires: %{_host_rpmprefix}gcc-c++
%global gmp_provided 5.0.5
%endif
-%if 0%{?suse12_2}
-%global mpc_provided 0.8.2
-%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.5
-%endif
-
%if 0%{?cygwin}
%global mpc_provided 1.0.1
%global mpfr_provided 3.1.2
diff --git a/cygwin/i686/i686-pc-cygwin-w32api-headers.spec b/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
index 8b6dc0f..57e77c4 100644
--- a/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
+++ b/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
@@ -35,7 +35,7 @@
%define w32api_headers_rpmvers %{expand:%(echo 3.1.0-1 | tr - _)}
Name: i686-pc-cygwin-w32api-headers
-Release: 0.20140129.0%{?dist}
+Release: 0.20140129.1%{?dist}
License: GPL
Group: Development/Tools
@@ -45,23 +45,23 @@ BuildArch: noarch
Version: %w32api_headers_rpmvers
Summary: MinGW-w64 Windows API headers for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
%description
MinGW-w64 Windows API headers for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf i686-pc-cygwin
mkdir -p i686-pc-cygwin
- ( cd i686-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd i686-pc-cygwin ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p i686-pc-cygwin/sys-root
- ( cd i686-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd i686-pc-cygwin/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec b/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
index 1e613e3..ad0f097 100644
--- a/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
+++ b/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
@@ -35,7 +35,7 @@
%define w32api_runtime_rpmvers %{expand:%(echo 3.1.0-1 | tr - _)}
Name: i686-pc-cygwin-w32api-runtime
-Release: 0.20140129.0%{?dist}
+Release: 0.20140129.1%{?dist}
License: GPL
Group: Development/Tools
@@ -45,23 +45,23 @@ BuildArch: noarch
Version: %w32api_runtime_rpmvers
Summary: MinGW-w64 Windows API runtime for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
%description
MinGW-w64 Windows API runtime for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf i686-pc-cygwin
mkdir -p i686-pc-cygwin
- ( cd i686-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd i686-pc-cygwin ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p i686-pc-cygwin/sys-root
- ( cd i686-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd i686-pc-cygwin/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/i686-pc-cygwin-w32api.spec b/cygwin/i686/i686-pc-cygwin-w32api.spec
deleted file mode 100644
index 972ca45..0000000
--- a/cygwin/i686/i686-pc-cygwin-w32api.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# Please send bugfixes or comments to
-# http://www.rtems.org/bugzilla
-#
-
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package %{nil}
-%define _libdir %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-%{?!el5:%global _with_noarch_subpackages 1}
-%define w32api_version 3.17-2
-%define w32api_rpmvers %{expand:%(echo 3.17-2 | tr - _)}
-
-Name: i686-pc-cygwin-w32api
-Release: 0.20121216.0%{?dist}
-License: GPL
-Group: Development/Tools
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Version: %w32api_rpmvers
-Summary: Cygwin w32api Libraries
-
-Source0: ftp://sources.redhat.com/pub/cygwin/release/w32api/w32api-%{w32api_version}.tar.bz2
-
-%description
-Cygwin w32api libraries.
-
-%prep
-%setup -c -q
-
-%build
- rm -rf i686-pc-cygwin
-
- mkdir -p i686-pc-cygwin
- cp -a usr/lib usr/include i686-pc-cygwin
-
- # Setup sys-root (Usable for gcc >= 3.4)
- mkdir -p i686-pc-cygwin/sys-root
- %{__tar} cf - usr/lib usr/include | ( cd i686-pc-cygwin/sys-root ; %{__tar} xf -)
-
-%install
- rm -rf $RPM_BUILD_ROOT
- mkdir -p $RPM_BUILD_ROOT%{_prefix}
- cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
-
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
- b=$(basename $a)
- sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
- chmod a+x $b
- ;;
-esac
-done
-
-sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
- %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
- %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
-
-%ifnarch noarch
-# Extract %%__debug_install_post into debug_install_post~
-cat << \EOF > debug_install_post~
-%__debug_install_post
-EOF
-
-# Generate customized debug_install_post script
-cat debug_install_post~ | while read a x y; do
-case $a in
-# Prevent find-debuginfo.sh* from trying to handle foreign binaries
-*/find-debuginfo.sh)
- b=$(basename $a)
- sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
- chmod a+x $b
- ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
-< debug_install_post~ > debug_install_post
-%define __debug_install_post . ./debug_install_post
-
-%endif
-
-%clean
- rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/lib
-%{_prefix}/i686-pc-cygwin/include
-
-%package sys-root
-Group: Development/Tools
-Summary: i686-pc-cygwin target files for gcc >= 3.4
-
-%description sys-root
-i686-pc-cygwin target files for gcc >= 3.4
-
-%files sys-root
-%defattr(-,root,root,-)
-%dir %{_prefix}/i686-pc-cygwin
-%{_prefix}/i686-pc-cygwin/sys-root
-
-
diff --git a/cygwin/i686/w32api-headers.add b/cygwin/i686/w32api-headers.add
index f0d4f44..049d9c5 100644
--- a/cygwin/i686/w32api-headers.add
+++ b/cygwin/i686/w32api-headers.add
@@ -12,23 +12,23 @@ BuildArch: noarch
Version: %w32api_headers_rpmvers
Summary: MinGW-w64 Windows API headers for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
%description
MinGW-w64 Windows API headers for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf @tool_target@
mkdir -p @tool_target@
- ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@ ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p @tool_target@/sys-root
- ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/i686/w32api-runtime.add b/cygwin/i686/w32api-runtime.add
index 225ba2f..8061688 100644
--- a/cygwin/i686/w32api-runtime.add
+++ b/cygwin/i686/w32api-runtime.add
@@ -12,23 +12,23 @@ BuildArch: noarch
Version: %w32api_runtime_rpmvers
Summary: MinGW-w64 Windows API runtime for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
%description
MinGW-w64 Windows API runtime for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf @tool_target@
mkdir -p @tool_target@
- ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@ ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p @tool_target@/sys-root
- ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/x86_64/Makefile.am b/cygwin/x86_64/Makefile.am
index 62a5553..37159d8 100644
--- a/cygwin/x86_64/Makefile.am
+++ b/cygwin/x86_64/Makefile.am
@@ -43,11 +43,11 @@ MPFR_RPMREL = 0.20131210.0%{?dist}
include ../mpfr.am
W32API_HEADERS_VERS = 3.1.0-1
-W32API_HEADERS_RPMREL = 0.20140129.0%{?dist}
+W32API_HEADERS_RPMREL = 0.20140129.1%{?dist}
include ../w32api-headers.am
W32API_RUNTIME_VERS = 3.1.0-1
-W32API_RUNTIME_RPMREL = 0.20140129.0%{?dist}
+W32API_RUNTIME_RPMREL = 0.20140129.1%{?dist}
include ../w32api-runtime.am
BINUTILS_VERS = 2.23.52-5
diff --git a/cygwin/x86_64/Makefile.in b/cygwin/x86_64/Makefile.in
index ab9c181..496584d 100644
--- a/cygwin/x86_64/Makefile.in
+++ b/cygwin/x86_64/Makefile.in
@@ -304,13 +304,13 @@ MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/mpfr.add \
$(top_srcdir)/gcc/rpm-install.add \
$(top_srcdir)/common/clean.add $(srcdir)/target-mpfr.add
W32API_HEADERS_VERS = 3.1.0-1
-W32API_HEADERS_RPMREL = 0.20140129.0%{?dist}
+W32API_HEADERS_RPMREL = 0.20140129.1%{?dist}
W32API_HEADERS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(srcdir)/w32api-headers.add $(top_srcdir)/gcc/rpm-install.add \
$(top_srcdir)/common/clean.add \
$(srcdir)/target-w32api-headers.add
W32API_RUNTIME_VERS = 3.1.0-1
-W32API_RUNTIME_RPMREL = 0.20140129.0%{?dist}
+W32API_RUNTIME_RPMREL = 0.20140129.1%{?dist}
W32API_RUNTIME_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(srcdir)/w32api-runtime.add $(top_srcdir)/gcc/rpm-install.add \
$(top_srcdir)/common/clean.add \
diff --git a/cygwin/x86_64/w32api-headers.add b/cygwin/x86_64/w32api-headers.add
index 7555947..ec8bfe7 100644
--- a/cygwin/x86_64/w32api-headers.add
+++ b/cygwin/x86_64/w32api-headers.add
@@ -12,23 +12,23 @@ BuildArch: noarch
Version: %w32api_headers_rpmvers
Summary: MinGW-w64 Windows API headers for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86_64/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
%description
MinGW-w64 Windows API headers for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf @tool_target@
mkdir -p @tool_target@
- ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@ ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p @tool_target@/sys-root
- ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/x86_64/w32api-runtime.add b/cygwin/x86_64/w32api-runtime.add
index 41be90c..9efc8ca 100644
--- a/cygwin/x86_64/w32api-runtime.add
+++ b/cygwin/x86_64/w32api-runtime.add
@@ -12,23 +12,23 @@ BuildArch: noarch
Version: %w32api_runtime_rpmvers
Summary: MinGW-w64 Windows API runtime for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86_64/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
%description
MinGW-w64 Windows API runtime for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf @tool_target@
mkdir -p @tool_target@
- ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@ ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p @tool_target@/sys-root
- ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd @tool_target@/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec b/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
index eb17ad6..6069e09 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
@@ -35,7 +35,7 @@
%define w32api_headers_rpmvers %{expand:%(echo 3.1.0-1 | tr - _)}
Name: x86_64-pc-cygwin-w32api-headers
-Release: 0.20140129.0%{?dist}
+Release: 0.20140129.1%{?dist}
License: GPL
Group: Development/Tools
@@ -45,23 +45,23 @@ BuildArch: noarch
Version: %w32api_headers_rpmvers
Summary: MinGW-w64 Windows API headers for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86_64/release/w32api/w32api-headers-%{w32api_headers_version}.tar.xz
%description
MinGW-w64 Windows API headers for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf x86_64-pc-cygwin
mkdir -p x86_64-pc-cygwin
- ( cd x86_64-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd x86_64-pc-cygwin ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p x86_64-pc-cygwin/sys-root
- ( cd x86_64-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+ %{__tar} cf - usr/lib usr/include | ( cd x86_64-pc-cygwin/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec b/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
index 9bb517a..2149d04 100644
--- a/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
+++ b/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
@@ -35,7 +35,7 @@
%define w32api_runtime_rpmvers %{expand:%(echo 3.1.0-1 | tr - _)}
Name: x86_64-pc-cygwin-w32api-runtime
-Release: 0.20140129.0%{?dist}
+Release: 0.20140129.1%{?dist}
License: GPL
Group: Development/Tools
@@ -45,23 +45,23 @@ BuildArch: noarch
Version: %w32api_runtime_rpmvers
Summary: MinGW-w64 Windows API runtime for Cygwin
-Source0: ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
+Source0: ftp://cygwin.com/pub/cygwin/x86_64/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.xz
%description
MinGW-w64 Windows API runtime for Cygwin.
%prep
-%setup -c -q -T -n %{name}-%{version}
+%setup -c -q -n %{name}-%{version}
%build
rm -rf x86_64-pc-cygwin
mkdir -p x86_64-pc-cygwin
- ( cd x86_64-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd x86_64-pc-cygwin ; %{__tar} xf - --strip-components=1 )
# Setup sys-root (Usable for gcc >= 3.4)
mkdir -p x86_64-pc-cygwin/sys-root
- ( cd x86_64-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+ %{__tar} cf - usr/lib usr/include | ( cd x86_64-pc-cygwin/sys-root ; %{__tar} xf -)
%install
rm -rf $RPM_BUILD_ROOT
More information about the vc
mailing list