Changeset 65db3bf in rtems


Ignore:
Timestamp:
Jul 26, 2009, 5:11:31 AM (10 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.9
Children:
2dcd85d
Parents:
a42ad63
Message:

Sync with rtems-4.10.

Location:
contrib/crossrpms/autotools
Files:
4 edited

Legend:

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

    ra42ad63 r65db3bf  
    3232Requires(preun):        /sbin/install-info
    3333
    34 Source0:        ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
     34@SOURCES@
    3535
    3636%description
     
    4949%prep
    5050%setup -q -n autoconf-%{srcvers}
     51%{?PATCH0:%patch0 -p1}
    5152
    5253# Work around rpm inserting bogus perl-module deps
  • contrib/crossrpms/autotools/autoconf.am

    ra42ad63 r65db3bf  
    55AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add
    66
    7 autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in
     7autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in $(srcdir)/autoconf-sources.add
    88        cat $(AUTOCONF_SUBPACKAGES) | sed \
     9          -e "/[@]SOURCES[@]/r $(srcdir)/autoconf-sources.add" \
     10          -e "/[@]SOURCES[@]/d" \
    911          -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
    10           -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
     12          -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)%{?dist}/" > $@
    1113CLEANFILES += autoconf.spec.in
    1214
  • contrib/crossrpms/autotools/automake.add

    ra42ad63 r65db3bf  
    11%define rpmvers @AUTOMAKE_VERS@
    22%define srcvers @AUTOMAKE_VERS@
    3 %define amvers  1.10
     3%define amvers  1.11
    44
    55%if "%{_prefix}" != "/usr"
     
    2626BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2727BuildArch:      noarch
    28 BuildRequires:  %{requirements} perl help2man
     28BuildRequires:  %{requirements} perl
     29%if "%{version}" < "1.11"
     30# automake >= 1.11 ships man-pages
     31BuildRequires:  help2man
     32%endif
    2933Requires:       %{requirements}
    3034Requires(post): /sbin/install-info
    3135Requires(preun):/sbin/install-info
    3236
    33 Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
     37@SOURCES@
    3438
    3539%description
     
    4246%prep
    4347%setup -q -n automake-%{srcvers}
     48%{?PATCH0:%patch0 -p1}
    4449
    4550# Work around rpm inserting bogus perl-module deps
     
    7479make DESTDIR=${RPM_BUILD_ROOT} install
    7580
     81%if "%{version}" < "1.11"
     82# automake >= 1.11 ships man-pages
    7683install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
    7784for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
     
    8289  install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
    8390done
     91%endif
    8492
    8593%if "%{_prefix}" != "/usr"
  • contrib/crossrpms/autotools/automake.am

    ra42ad63 r65db3bf  
    55AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add
    66
    7 automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in
     7automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.am $(srcdir)/automake-sources.add
    88        cat $(AUTOMAKE_SUBPACKAGES) | sed \
    9           -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \
    10           -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@
     9          -e "/[@]SOURCES[@]/r $(srcdir)/automake-sources.add" \
     10          -e "/[@]SOURCES[@]/d" \
     11          -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/g" \
     12          -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)%{?dist}/g" > $@
    1113CLEANFILES += automake.spec.in
    1214
Note: See TracChangeset for help on using the changeset viewer.