Changeset 4668c7fe in rtems


Ignore:
Timestamp:
Aug 27, 2009, 6:33:11 AM (10 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, master
Children:
1ab6977
Parents:
1c360794
Message:

Regenerate.

Location:
contrib/crossrpms/cygwin/i686
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-binutils.spec

    r1c360794 r4668c7fe  
    3939Group:          Development/Tools
    4040Version:        %{binutils_rpmvers}
    41 Release:        0.20090506.1%{?dist}
     41Release:        0.20090827.0%{?dist}
    4242License:        GPL/LGPL
    4343URL:            http://sources.redhat.com/binutils
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-expat.spec

    r1c360794 r4668c7fe  
    3131%endif
    3232
    33 %define expat_version 1.95.8-2
    34 %define expat_rpmvers %{expand:%(echo 1.95.8-2 | tr - _)}
     33%define expat_version 2.0.1-1
     34%define expat_rpmvers %{expand:%(echo 2.0.1-1 | tr - _)}
    3535
    3636Name:         i686-pc-cygwin-expat
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    4646
    4747Source0:        ftp://cygwin.com/pub/cygwin/release/expat/expat-%{expat_version}.tar.bz2
    48 Source1:        ftp://cygwin.com/pub/cygwin/release/expat/libexpat0/libexpat0-%{expat_version}.tar.bz2
     48Source1:        ftp://cygwin.com/pub/cygwin/release/expat/libexpat1/libexpat1-%{expat_version}.tar.bz2
    4949
    5050Provides:       i686-pc-cygwin-expat-devel = %{version}-%{release}
     
    9494#!/bin/sh
    9595grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    96   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     96  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    9797EOF
    9898chmod +x %{_builddir}/%{name}-%{expat_rpmvers}/find-provides
     
    102102#!/bin/sh
    103103grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    104   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     104  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    105105EOF
    106106chmod +x %{_builddir}/%{name}-%{expat_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gcc.spec

    r1c360794 r4668c7fe  
    4242Group:          Development/Tools
    4343Version:        %{gcc_rpmvers}
    44 Release:        0.20090506.1%{?dist}
     44Release:        0.20090827.0%{?dist}
    4545License:        GPL
    4646URL:            http://gcc.gnu.org
     
    8181%if %{defined _mpfr_minvers}
    8282# FIXME: This is an ugly cludge
    83 %{?fc9:%global mpfr_provided 2.3.1}
    8483%{?fc10:%global mpfr_provided 2.3.2}
    8584%{?fc11:%global mpfr_provided 2.4.1}
    8685%{?suse10_3:%global mpfr_provided 2.2.1}
     86%{?suse11_0:%global mpfr_provided 2.3.1}
     87%{?suse11_1:%global mpfr_provided 2.3.2}
    8788%{?cygwin:%global mpfr_provided 2.4.1}
    8889%{?mingw32:%global mpfr_provided %{nil}}
     
    122123
    123124
    124 %if "%{gcc_version}" >= "3.4"
    125 %define gcclib %{_libdir}/gcc
    126 %define gccexec %{_libexecdir}/gcc
    127 %else
    128 %define gcclib %{_libdir}/gcc-lib
    129 %define gccexec %{_libdir}/gcc-lib
    130 %endif
     125%define _gcclibdir %{_prefix}/lib
    131126
    132127Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
     
    198193    --exec_prefix=%{_exec_prefix} \
    199194    --includedir=%{_includedir} \
    200     --libdir=%{_libdir} \
     195    --libdir=%{_gcclibdir} \
    201196    --libexecdir=%{_libexecdir} \
    202197    --mandir=%{_mandir} \
     
    239234  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    240235    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    241       $RPM_BUILD_ROOT%{gcclib}/i686-pc-cygwin/%{gcc_version}/include/
     236      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/
    242237  fi
    243238%endif
    244239
    245240  # host library
     241%if "%{gcc_version}" >= "4.2.0"
     242  # libiberty doesn't honor --libdir, but always installs to a
     243  # magically guessed _libdir
    246244  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     245%else
     246  # libiberty installs to --libdir=...
     247  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     248%endif
    247249
    248250  # We use the version from binutils
     
    256258  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
    257259
    258 
    259 %if "%{gcc_version}" >= "3.4"
    260260  # Bug in gcc-3.4.0pre
    261261  rm -f $RPM_BUILD_ROOT%{_bindir}/i686-pc-cygwin-i686-pc-cygwin-gcjh%{_exeext}
    262 %endif
    263 
    264 %if "%{gcc_version}" >= "3.3"
     262
    265263  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    266264  # the fixinclude-install-tools
    267   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/%{gcc_version}/install-tools
    268   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i686-pc-cygwin/%{gcc_version}/install-tools
    269 %endif
     265  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/install-tools
     266  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/install-tools
    270267
    271268  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    280277  rm -f dirs ;
    281278  echo "%defattr(-,root,root,-)" >> dirs
    282   echo "%dir %{gcclib}" >> dirs
    283   echo "%dir %{gcclib}/i686-pc-cygwin" >> dirs
    284 
    285   TGTDIR="%{gcclib}/i686-pc-cygwin/%{gcc_version}"
     279  echo "%dir %{_gcclibdir}/gcc" >> dirs
     280  echo "%dir %{_gcclibdir}/gcc/i686-pc-cygwin" >> dirs
     281
     282  TGTDIR="%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}"
    286283  for i in $f; do
    287284    case $i in
     
    295292  # Collect files to go into different packages
    296293  cp dirs build/files.gcc
    297   cp dirs build/files.g77
    298294  cp dirs build/files.gfortran
    299295  cp dirs build/files.objc
     
    301297  cp dirs build/files.g++
    302298
    303   TGTDIR="%{gcclib}/i686-pc-cygwin/%{gcc_version}"
     299  TGTDIR="%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}"
    304300  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    305301  for i in $f; do
     
    316312    *include/g++*);;
    317313    *include/c++*);;
     314    *finclude/*);;
    318315    *adainclude*);;
    319316    *adalib*);;
     
    363360#!/bin/sh
    364361grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    365   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     362  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    366363EOF
    367364chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    371368#!/bin/sh
    372369grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    373   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     370  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    374371EOF
    375372chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    424421%defattr(-,root,root)
    425422%{_mandir}/man1/i686-pc-cygwin-gcc.1*
    426 %if "%{gcc_version}" >= "3.4"
    427423%{_mandir}/man1/i686-pc-cygwin-cpp.1*
    428424%{_mandir}/man1/i686-pc-cygwin-gcov.1*
    429 %endif
    430425
    431426%{_bindir}/i686-pc-cygwin-cpp%{_exeext}
    432427%{_bindir}/i686-pc-cygwin-gcc%{_exeext}
    433 %if "%{gcc_version}" >= "3.3"
    434428%{_bindir}/i686-pc-cygwin-gcc-%{gcc_version}%{_exeext}
    435 %endif
    436429%{_bindir}/i686-pc-cygwin-gcov%{_exeext}
    437430%{_bindir}/i686-pc-cygwin-gccbug
    438431
    439 %dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include
     432%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include
    440433%if "%{gcc_version}" > "4.0.3"
    441434%if "i686-pc-cygwin" != "bfin-rtems4.10"
    442435%if "i686-pc-cygwin" != "avr-rtems4.10"
    443 %dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include/ssp
     436%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/ssp
    444437%endif
    445438%endif
     
    447440
    448441%if "%{gcc_version}" >= "4.3.0"
    449 %dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include-fixed
    450 %endif
    451 
    452 %dir %{gccexec}
    453 %dir %{gccexec}/i686-pc-cygwin
    454 %dir %{gccexec}/i686-pc-cygwin/%{gcc_version}
    455 %{gccexec}/i686-pc-cygwin/%{gcc_version}/cc1%{_exeext}
    456 %{gccexec}/i686-pc-cygwin/%{gcc_version}/collect2%{_exeext}
     442%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include-fixed
     443%endif
     444
     445%dir %{_libexecdir}/gcc
     446%dir %{_libexecdir}/gcc/i686-pc-cygwin
     447%dir %{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}
     448%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/cc1%{_exeext}
     449%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/collect2%{_exeext}
    457450
    458451# ==============================================================
     
    483476%{_bindir}/i686-pc-cygwin-g++%{_exeext}
    484477
    485 %dir %{gccexec}
    486 %dir %{gccexec}/i686-pc-cygwin
    487 %dir %{gccexec}/i686-pc-cygwin/%{gcc_version}
    488 %{gccexec}/i686-pc-cygwin/%{gcc_version}/cc1plus%{_exeext}
    489 
    490 %dir %{gcclib}/i686-pc-cygwin/%{gcc_version}/include
    491 %{gcclib}/i686-pc-cygwin/%{gcc_version}/include/c++
    492 
    493 
    494 
     478%dir %{_libexecdir}/gcc
     479%dir %{_libexecdir}/gcc/i686-pc-cygwin
     480%dir %{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}
     481%{_libexecdir}/gcc/i686-pc-cygwin/%{gcc_version}/cc1plus%{_exeext}
     482
     483%dir %{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include
     484%{_gcclibdir}/gcc/i686-pc-cygwin/%{gcc_version}/include/c++
     485
     486
     487
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-gmp.spec

    r1c360794 r4668c7fe  
    3131%endif
    3232
    33 %define gmp_version 4.2.1-1
    34 %define gmp_rpmvers %{expand:%(echo 4.2.1-1 | tr - _)}
     33%define gmp_version 4.2.4-1
     34%define gmp_rpmvers %{expand:%(echo 4.2.4-1 | tr - _)}
    3535
    3636Name:         i686-pc-cygwin-gmp
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    9797#!/bin/sh
    9898grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    99   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     99  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    100100EOF
    101101chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-provides
     
    105105#!/bin/sh
    106106grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    107   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     107  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    108108EOF
    109109chmod +x %{_builddir}/%{name}-%{gmp_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-libs.spec

    r1c360794 r4668c7fe  
    3535
    3636Name:         i686-pc-cygwin
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    9191#!/bin/sh
    9292grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    93   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     93  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    9494EOF
    9595chmod +x %{_builddir}/%{name}-%{cygwin_rpmvers}/find-provides
     
    9999#!/bin/sh
    100100grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    101   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     101  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    102102EOF
    103103chmod +x %{_builddir}/%{name}-%{cygwin_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-mpfr.spec

    r1c360794 r4668c7fe  
    3535
    3636Name:         i686-pc-cygwin-mpfr
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    9797#!/bin/sh
    9898grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    99   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     99  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    100100EOF
    101101chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-provides
     
    105105#!/bin/sh
    106106grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    107   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     107  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    108108EOF
    109109chmod +x %{_builddir}/%{name}-%{mpfr_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-ncurses.spec

    r1c360794 r4668c7fe  
    3131%endif
    3232
    33 %define ncurses_version 5.5-3
    34 %define ncurses_rpmvers %{expand:%(echo 5.5-3 | tr - _)}
     33%define ncurses_version 5.7-5
     34%define ncurses_rpmvers %{expand:%(echo 5.7-5 | tr - _)}
    3535
    3636Name:         i686-pc-cygwin-ncurses
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    4646
    4747Source0:        ftp://cygwin.com/pub/cygwin/release/ncurses/ncurses-%{ncurses_version}.tar.bz2
    48 Source1:        ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses8/libncurses8-%{ncurses_version}.tar.bz2
     48Source1:        ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses9/libncurses9-%{ncurses_version}.tar.bz2
    4949Source2:        ftp://cygwin.com/pub/cygwin/release/ncurses/libncurses-devel/libncurses-devel-%{ncurses_version}.tar.bz2
    5050
     
    106106#!/bin/sh
    107107grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    108   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     108  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    109109EOF
    110110chmod +x %{_builddir}/%{name}-%{ncurses_rpmvers}/find-provides
     
    114114#!/bin/sh
    115115grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    116   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     116  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    117117EOF
    118118chmod +x %{_builddir}/%{name}-%{ncurses_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-readline.spec

    r1c360794 r4668c7fe  
    3535
    3636Name:         i686-pc-cygwin-readline
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    9595#!/bin/sh
    9696grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    97   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     97  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    9898EOF
    9999chmod +x %{_builddir}/%{name}-%{readline_rpmvers}/find-provides
     
    103103#!/bin/sh
    104104grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    105   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     105  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    106106EOF
    107107chmod +x %{_builddir}/%{name}-%{readline_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-termcap.spec

    r1c360794 r4668c7fe  
    3535
    3636Name:         i686-pc-cygwin-termcap
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    9292#!/bin/sh
    9393grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    94   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     94  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    9595EOF
    9696chmod +x %{_builddir}/%{name}-%{termcap_rpmvers}/find-provides
     
    100100#!/bin/sh
    101101grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    102   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     102  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    103103EOF
    104104chmod +x %{_builddir}/%{name}-%{termcap_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-terminfo.spec

    r1c360794 r4668c7fe  
    3535
    3636Name:         i686-pc-cygwin-terminfo
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    9898#!/bin/sh
    9999grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    100   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     100  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    101101EOF
    102102chmod +x %{_builddir}/%{name}-%{terminfo_rpmvers}/find-provides
     
    106106#!/bin/sh
    107107grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    108   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     108  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    109109EOF
    110110chmod +x %{_builddir}/%{name}-%{terminfo_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-w32api.spec

    r1c360794 r4668c7fe  
    3131%endif
    3232
    33 %define w32api_version 3.12-1
    34 %define w32api_rpmvers %{expand:%(echo 3.12-1 | tr - _)}
     33%define w32api_version 3.13-1
     34%define w32api_rpmvers %{expand:%(echo 3.13-1 | tr - _)}
    3535
    3636Name:         i686-pc-cygwin-w32api
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    9494#!/bin/sh
    9595grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    96   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     96  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    9797EOF
    9898chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-provides
     
    102102#!/bin/sh
    103103grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    104   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     104  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    105105EOF
    106106chmod +x %{_builddir}/%{name}-%{w32api_rpmvers}/find-requires
  • contrib/crossrpms/cygwin/i686/i686-pc-cygwin-zlib.spec

    r1c360794 r4668c7fe  
    3131%endif
    3232
    33 %define zlib_version 1.2.3-2
    34 %define zlib_rpmvers %{expand:%(echo 1.2.3-2 | tr - _)}
     33%define zlib_version 1.2.3-3
     34%define zlib_rpmvers %{expand:%(echo 1.2.3-3 | tr - _)}
    3535
    3636Name:         i686-pc-cygwin-zlib
    37 Release:      0.20090506.1%{?dist}
     37Release:      0.20090827.0%{?dist}
    3838License:      GPL
    3939Group:        Development/Tools
     
    4646
    4747Source0:        ftp://cygwin.com/pub/cygwin/release/zlib/zlib-%{zlib_version}.tar.bz2
     48Source1:        ftp://cygwin.com/pub/cygwin/release/zlib/zlib-devel/zlib-devel-%{zlib_version}.tar.bz2
     49Source2:        ftp://cygwin.com/pub/cygwin/release/zlib/zlib0/zlib0-%{zlib_version}.tar.bz2
    4850%{?_without_sources:NoSource:   0}
     51%{?_without_sources:NoSource:   1}
     52%{?_without_sources:NoSource:   2}
    4953
    5054%description
     
    6064  mkdir -p i686-pc-cygwin/sys-root
    6165  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE0})
     66  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE1})
     67  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvjf %{SOURCE2})
    6268
    6369%install
     
    9298#!/bin/sh
    9399grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    94   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_provides
     100  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
    95101EOF
    96102chmod +x %{_builddir}/%{name}-%{zlib_rpmvers}/find-provides
     
    100106#!/bin/sh
    101107grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
    102   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i686-pc-cygwin/' | %__find_requires
     108  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
    103109EOF
    104110chmod +x %{_builddir}/%{name}-%{zlib_rpmvers}/find-requires
Note: See TracChangeset for help on using the changeset viewer.