Changeset 0b1ceac8 in rtems


Ignore:
Timestamp:
Nov 12, 2008, 3:40:26 PM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.8
Children:
e2684d4
Parents:
6f536795
Message:

Merger from CVS-HEAD.

Location:
contrib/crossrpms
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/autotools/autoconf.add

    r6f536795 r0b1ceac8  
    1 %define rpmvers 2.61
    2 %define srcvers 2.61
     1%define srcvers @AUTOCONF_VERS@
     2%define rpmvers %{expand:%(echo "@AUTOCONF_VERS@" | tr - _ )}
    33
    44%if "%{_prefix}" != "/usr"
     
    1414Group:          Development/Tools
    1515Version:        %{rpmvers}
    16 Release:        @AUTOCONF_RPMREL@%{?dist}
     16Release:        @AUTOCONF_RPMREL@
    1717Summary:        Tool for automatically generating GNU style Makefile.in's
    1818
     
    2525BuildArch:      noarch
    2626BuildRequires:  perl m4 gawk emacs
     27%if "%{version}" >= "2.62"
     28BuildRequires:  m4 >= 1.4.5
     29%endif
    2730Requires:       m4 gawk
    2831Requires(post):         /sbin/install-info
  • contrib/crossrpms/autotools/autoconf.am

    r6f536795 r0b1ceac8  
    77autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in
    88        cat $(AUTOCONF_SUBPACKAGES) | sed \
     9          -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
    910          -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
    1011CLEANFILES += autoconf.spec.in
  • contrib/crossrpms/autotools/automake.add

    r6f536795 r0b1ceac8  
    1 %define rpmvers 1.10
    2 %define srcvers 1.10
     1%define rpmvers @AUTOMAKE_VERS@
     2%define srcvers @AUTOMAKE_VERS@
    33%define amvers  1.10
    44
     
    1616Group:          Development/Tools
    1717Version:        %{rpmvers}
    18 Release:        @AUTOMAKE_RPMREL@%{?dist}
     18Release:        @AUTOMAKE_RPMREL@
    1919Summary:        Tool for automatically generating GNU style Makefile.in's
    2020
  • contrib/crossrpms/autotools/automake.am

    r6f536795 r0b1ceac8  
    77automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in
    88        cat $(AUTOMAKE_SUBPACKAGES) | sed \
     9          -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \
    910          -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@
    1011CLEANFILES += automake.spec.in
  • contrib/crossrpms/binutils/base-binutils.add

    r6f536795 r0b1ceac8  
    3939%files -n @rpmprefix@binutils-common
    4040%defattr(-,root,root)
     41%sysdir %{_prefix}
    4142%sysdir %{_infodir}
    4243%ghost %{_infodir}/dir
  • contrib/crossrpms/binutils/install.add

    r6f536795 r0b1ceac8  
    4646    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windres*
    4747  fi
     48  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-windmc%{_exeext}; then
     49    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windmc*
     50  fi
    4851
    4952  cd ..
  • contrib/crossrpms/binutils/target-binutils.add

    r6f536795 r0b1ceac8  
    1414%files -n @rpmprefix@@tool_target@-binutils
    1515%defattr(-,root,root)
     16%sysdir %{_prefix}
    1617%sysdir %{_mandir}
    1718%sysdir %{_mandir}/man1
  • contrib/crossrpms/gcc/rpm-install.add

    r6f536795 r0b1ceac8  
    4848%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
    4949
    50 
     50%ifnarch noarch
    5151# Extract %%__debug_install_post into debug_install_post~
    5252cat << \EOF > debug_install_post~
     
    7070%define __debug_install_post . ./debug_install_post
    7171
     72%endif
    7273
Note: See TracChangeset for help on using the changeset viewer.