diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-12-04 22:44:33 -0600 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-12-04 22:44:33 -0600 |
| commit | 6ae22c67a9efa03669249712f4c48941f9fc3f4f (patch) | |
| tree | 041e0588b68bbc8be402bc0554d4b0f64f5d96d6 | |
| parent | 837ec7ef971d3b33160958c6831f7567e84c9aeb (diff) | |
| download | cygwin-6ae22c67a9efa03669249712f4c48941f9fc3f4f.tar.gz cygwin-6ae22c67a9efa03669249712f4c48941f9fc3f4f.tar.xz cygwin-6ae22c67a9efa03669249712f4c48941f9fc3f4f.zip | |
cygwin 2.9.0
| -rw-r--r-- | cygwin.spec | 34 | ||||
| -rw-r--r-- | sources | 2 |
2 files changed, 15 insertions, 21 deletions
diff --git a/cygwin.spec b/cygwin.spec index 85119be..3f06561 100644 --- a/cygwin.spec +++ b/cygwin.spec @@ -1,7 +1,7 @@ %{?cygwin_package_header} Name: cygwin -Version: 2.5.2 +Version: 2.9.0 Release: 1%{?dist} Summary: Cygwin cross-compiler runtime @@ -42,6 +42,7 @@ BuildRequires: mingw64-zlib-static BuildRequires: texinfo BuildRequires: xmlto-tex BuildRequires: dblatex +BuildRequires: docbook2X %description Cygwin cross-compiler runtime, base libraries. @@ -49,8 +50,6 @@ 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. @@ -70,37 +69,29 @@ touch winsup/cygwin/devices.cc %build -mkdir -p build_cyg32 -pushd build_cyg32 - +mkdir -p build_32bit +pushd build_32bit `pwd`/../configure \ --prefix=%{cygwin32_prefix} \ --build=%_build --host=%_host \ --target=%{cygwin32_target} - -make %{?_smp_mflags} all popd -mkdir -p build_cyg64 -pushd build_cyg64 - +mkdir -p build_64bit +pushd build_64bit `pwd`/../configure \ --prefix=%{cygwin64_prefix} \ --build=%_build --host=%_host \ --target=%{cygwin64_target} - -make %{?_smp_mflags} all popd +%cygwin_make %{?_smp_mflags} -%install -pushd build_cyg32 -make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{cygwin32_prefix} -popd -pushd build_cyg64 -make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{cygwin64_prefix} -popd +%install +CYGWIN32_MAKE_ARGS="tooldir=%{cygwin32_prefix}" \ +CYGWIN64_MAKE_ARGS="tooldir=%{cygwin64_prefix}" \ +%cygwin_make install DESTDIR=$RPM_BUILD_ROOT # remove files not needed for cross-compiling rm -fr $RPM_BUILD_ROOT%{cygwin32_prefix}/etc @@ -141,6 +132,9 @@ rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/rpc/ %changelog +* Sun Dec 03 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 2.9.0-1 +- new version + * Fri Jun 24 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 2.5.2-1 - new version @@ -1 +1 @@ -44ad55b635c8e8c136e99c5819537821 newlib-cygwin-2.5.2.tar.bz2 +ee7164a4cbaca3bb92299a77baa89ff1 newlib-cygwin-2.9.0.tar.bz2 |