diff options
Diffstat (limited to 'cygwin.spec')
| -rw-r--r-- | cygwin.spec | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/cygwin.spec b/cygwin.spec index 7fb6a45..113936c 100644 --- a/cygwin.spec +++ b/cygwin.spec @@ -6,7 +6,7 @@ Name: cygwin Version: 1.7.9 -Release: 2%{?dist} +Release: 3 Summary: Cygwin cross-compiler runtime License: GPLv2 with exceptions @@ -18,6 +18,10 @@ BuildArch: noarch Source0: ftp://sourceware.org/pub/cygwin/release/cygwin/cygwin-%{version}-1-src.tar.bz2 Patch0: cygwin-1.7.9-fenv.h.patch Patch1: cygwin-1.7.9-sysmacros.h.patch +Patch2: cygwin-1.7.9-paths.h.patch +Patch3: cygwin-1.7.9-process.h.patch +Patch4: cygwin-1.7.9-strdupa.patch +Patch5: cygwin-1.7.9-unistd.h.patch BuildRequires: cygwin-filesystem >= 2 BuildRequires: cygwin-binutils @@ -37,6 +41,10 @@ Cygwin cross-compiler runtime, base libraries. %setup -q -n cygwin-%{version}-1 %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 # code still has some warnings with gcc4.5 (remove for 1.7.10) sed -i -e 's| -Werror | |' winsup/cygwin/Makefile.in @@ -47,7 +55,7 @@ mkdir -p build pushd build ../configure \ - --prefix=%{_prefix} \ + --prefix=%{_cygwin_prefix} \ --build=%_build --host=%_host \ --target=%{_cygwin_target} @@ -60,21 +68,15 @@ popd rm -rf $RPM_BUILD_ROOT pushd build -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{_cygwin_prefix} # remove files not needed for cross-compiling -rm -fr $RPM_BUILD_ROOT%{_prefix}/etc -rm -fr $RPM_BUILD_ROOT%{_bindir}/cygserver-config -rm -fr $RPM_BUILD_ROOT%{_sbindir} -rm -fr $RPM_BUILD_ROOT%{_infodir} -rm -fr $RPM_BUILD_ROOT%{_mandir} -rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/ -rm -fr $RPM_BUILD_ROOT%{_prefix}/%{_cygwin_target}/share/doc/ -# make install places these in nonstandard locations, so move them. -mkdir -p $RPM_BUILD_ROOT%{_cygwin_bindir} -mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_cygwin_bindir} -mv $RPM_BUILD_ROOT%{_prefix}/%{_cygwin_target}/include $RPM_BUILD_ROOT%{_cygwin_prefix}/ -mv $RPM_BUILD_ROOT%{_prefix}/%{_cygwin_target}/lib $RPM_BUILD_ROOT%{_cygwin_prefix}/ +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} # these are provided by other packages rm -fr $RPM_BUILD_ROOT%{_cygwin_includedir}/iconv.h @@ -96,6 +98,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 21 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.9-3 +- Added _PATH_MAILDIR and _PATH_SHELLS to <paths.h>. +- Added strdupa and strndupa to <string.h>. +- Header fixes for <process.h> and <unistd.h>. + * Thu Apr 28 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.9-2 - Header fixes for <fenv.h> and <sys/sysmacros.h>. |