change log for rtems (2011-12-12)
rtems-vc at rtems.org
rtems-vc at rtems.org
Mon Dec 12 11:10:17 UTC 2011
*ralf*:
Fix perl module filtering.
M 1.17 contrib/crossrpms/autotools/autoconf.add
M 1.15 contrib/crossrpms/autotools/automake.add
diff -u rtems/contrib/crossrpms/autotools/autoconf.add:1.16 rtems/contrib/crossrpms/autotools/autoconf.add:1.17
--- rtems/contrib/crossrpms/autotools/autoconf.add:1.16 Thu Oct 14 10:11:48 2010
+++ rtems/contrib/crossrpms/autotools/autoconf.add Mon Dec 12 04:51:05 2011
@@ -30,6 +30,10 @@
@SOURCES@
+# remove bogus Autoconf perl dependencies and provides
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Autom4te::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Autom4te::
+
%description
GNU's Autoconf is a tool for configuring source code and Makefiles.
Using Autoconf, programmers can create portable and configurable
@@ -47,13 +51,14 @@
%setup -q -n autoconf-%{srcvers}
%{?PATCH0:%patch0 -p1}
+%if !%{defined fedora}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/^perl(Autom4te/d'
EOF
-%define __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
+%global __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
chmod +x %{__perl_provides}
cat << \EOF > %{name}-requ
@@ -61,8 +66,9 @@
%{__perl_requires} $* |\
sed -e '/^perl(Autom4te/d'
EOF
-%define __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
+%global __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
chmod +x %{__perl_requires}
+%endif
%build
./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
diff -u rtems/contrib/crossrpms/autotools/automake.add:1.14 rtems/contrib/crossrpms/autotools/automake.add:1.15
--- rtems/contrib/crossrpms/autotools/automake.add:1.14 Tue Sep 7 09:38:36 2010
+++ rtems/contrib/crossrpms/autotools/automake.add Mon Dec 12 04:51:05 2011
@@ -27,6 +27,10 @@
@SOURCES@
+# remove bogus Automake perl dependencies and provides
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake::
+
%description
Automake is a tool for automatically generating "Makefile.in"s from
files called "Makefile.am". "Makefile.am" is basically a series of
@@ -38,13 +42,14 @@
%setup -q -n automake-%{srcvers}
%{?PATCH0:%patch0 -p1}
+%if !%{defined fedora}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/^perl(Automake/d'
EOF
-%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
+%global __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
chmod +x %{__perl_provides}
cat << \EOF > %{name}-requ
@@ -52,9 +57,9 @@
%{__perl_requires} $* |\
sed -e '/^perl(Automake/d'
EOF
-%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
+%global __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
chmod +x %{__perl_requires}
-
+%endif
%build
PATH=%{_bindir}:$PATH
*ralf*:
Bump AUTOCONF_RPMREL.
Update to automake-1.11.1b.
M 1.30 contrib/crossrpms/autotools/Makefile.am
diff -u rtems/contrib/crossrpms/autotools/Makefile.am:1.29 rtems/contrib/crossrpms/autotools/Makefile.am:1.30
--- rtems/contrib/crossrpms/autotools/Makefile.am:1.29 Thu Oct 14 09:57:52 2010
+++ rtems/contrib/crossrpms/autotools/Makefile.am Mon Dec 12 04:51:43 2011
@@ -5,9 +5,9 @@
include $(top_srcdir)/mkspec.am
AUTOCONF_VERS = 2.68
-AUTOCONF_RPMREL = 3
+AUTOCONF_RPMREL = 4
include ./autoconf.am
-AUTOMAKE_VERS = 1.11.1
-AUTOMAKE_RPMREL = 2
+AUTOMAKE_VERS = 1.11.1b
+AUTOMAKE_RPMREL = 1
include ./automake.am
*ralf*:
Adjust Source0.
M 1.3 contrib/crossrpms/autotools/automake-sources.add
diff -u rtems/contrib/crossrpms/autotools/automake-sources.add:1.2 rtems/contrib/crossrpms/autotools/automake-sources.add:1.3
--- rtems/contrib/crossrpms/autotools/automake-sources.add:1.2 Mon May 18 02:55:51 2009
+++ rtems/contrib/crossrpms/autotools/automake-sources.add Mon Dec 12 04:56:20 2011
@@ -1,2 +1,3 @@
-Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
+# Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
+Source0: ftp://alpha.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
*ralf*:
Regenerate.
M 1.8 contrib/crossrpms/autotools/rtems-4.11-autoconf.spec
M 1.4 contrib/crossrpms/autotools/rtems-4.11-automake.spec
M 1.3 contrib/crossrpms/autotools/rtems-4.11-automake.spec
diff -u rtems/contrib/crossrpms/autotools/rtems-4.11-autoconf.spec:1.7 rtems/contrib/crossrpms/autotools/rtems-4.11-autoconf.spec:1.8
--- rtems/contrib/crossrpms/autotools/rtems-4.11-autoconf.spec:1.7 Thu Oct 14 10:12:12 2010
+++ rtems/contrib/crossrpms/autotools/rtems-4.11-autoconf.spec Mon Dec 12 04:52:29 2011
@@ -58,7 +58,7 @@
URL: http://www.gnu.org/software/autoconf
Group: Development/Tools
Version: %{rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,10 @@
+# remove bogus Autoconf perl dependencies and provides
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Autom4te::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Autom4te::
+
%description
GNU's Autoconf is a tool for configuring source code and Makefiles.
Using Autoconf, programmers can create portable and configurable
@@ -93,13 +97,14 @@
%setup -q -n autoconf-%{srcvers}
%{?PATCH0:%patch0 -p1}
+%if !%{defined fedora}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/^perl(Autom4te/d'
EOF
-%define __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
+%global __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
chmod +x %{__perl_provides}
cat << \EOF > %{name}-requ
@@ -107,8 +112,9 @@
%{__perl_requires} $* |\
sed -e '/^perl(Autom4te/d'
EOF
-%define __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
+%global __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
chmod +x %{__perl_requires}
+%endif
%build
./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
diff -u rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.3 rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.4
--- rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.3 Mon Dec 12 04:52:29 2011
+++ rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec Mon Dec 12 04:57:00 2011
@@ -67,7 +67,8 @@
Requires(post): /sbin/install-info
Requires(preun):/sbin/install-info
-Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
+# Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
+Source0: ftp://alpha.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
# remove bogus Automake perl dependencies and provides
diff -u rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.2 rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.3
--- rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.2 Tue Sep 7 09:39:18 2010
+++ rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec Mon Dec 12 04:52:29 2011
@@ -45,8 +45,8 @@
%define _host_rpmprefix %{nil}
%endif
-%define rpmvers 1.11.1
-%define srcvers 1.11.1
+%define rpmvers 1.11.1b
+%define srcvers 1.11.1b
%define amvers 1.11
%define name rtems-4.11-automake
@@ -57,7 +57,7 @@
License: GPL
Group: Development/Tools
Version: %{rpmvers}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,6 +70,10 @@
Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
+# remove bogus Automake perl dependencies and provides
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake::
+
%description
Automake is a tool for automatically generating "Makefile.in"s from
files called "Makefile.am". "Makefile.am" is basically a series of
@@ -81,13 +85,14 @@
%setup -q -n automake-%{srcvers}
%{?PATCH0:%patch0 -p1}
+%if !%{defined fedora}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov
#!/bin/sh
%{__perl_provides} $* |\
sed -e '/^perl(Automake/d'
EOF
-%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
+%global __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
chmod +x %{__perl_provides}
cat << \EOF > %{name}-requ
@@ -95,9 +100,9 @@
%{__perl_requires} $* |\
sed -e '/^perl(Automake/d'
EOF
-%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
+%global __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
chmod +x %{__perl_requires}
-
+%endif
%build
PATH=%{_bindir}:$PATH
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20111212/ccafeb09/attachment.html>
More information about the vc
mailing list