rpms/rpm/devel rpm-4.4.2.1-gnueabi.patch, NONE, 1.1 rpm.spec, 1.240, 1.241
Panu Matilainen (pmatilai)
fedora-extras-commits at redhat.com
Mon Jul 23 11:13:31 UTC 2007
- Previous message: rpms/sonata/devel .cvsignore, 1.5, 1.6 sonata.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message: rpms/sonata/F-7 .cvsignore, 1.5, 1.6 sonata.spec, 1.5, 1.6 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12711
Modified Files:
rpm.spec
Added Files:
rpm-4.4.2.1-gnueabi.patch
Log Message:
- 4.4.2.1 final
- reintroduce disttag
- include full ChangeLog as doc
- use up-to-date config.guess for ARM support (#246803)
- ARM EANBI gnu/gnuenabi fix from Lennert Buytenhek (#246803)
rpm-4.4.2.1-gnueabi.patch:
--- NEW FILE rpm-4.4.2.1-gnueabi.patch ---
diff -up rpm-4.4.2.1-rc3/configure.ac.orig rpm-4.4.2.1-rc3/configure.ac
--- rpm-4.4.2.1-rc3/configure.ac.orig 2007-07-21 15:11:25.000000000 -0400
+++ rpm-4.4.2.1-rc3/configure.ac 2007-07-21 15:12:04.000000000 -0400
@@ -1132,11 +1132,13 @@ fi
#
# get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
#
+build_os_gnu=-gnu
if echo "$build_os" | grep '.*-gnulibc1' > /dev/null ; then
build_os=`echo "${build_os}" | sed 's/-gnulibc1$//'`
fi
if echo "$build_os" | grep '.*-gnueabi' > /dev/null ; then
build_os=`echo "${build_os}" | sed 's/-gnueabi$//'`
+ build_os_gnu=-gnueabi
fi
if echo "$build_os" | grep '.*-gnu' > /dev/null ; then
build_os=`echo "${build_os}" | sed 's/-gnu$//'`
@@ -1231,12 +1233,14 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
;;
esac
RPMCANONOS="$build_os_noversion"
+RPMCANONGNU="$build_os_gnu"
AC_SUBST(RPMCANONCOLOR)
AC_SUBST(autorelocate_path)
AC_SUBST(autorelocate_dcolor)
AC_SUBST(RPMCANONARCH)
AC_SUBST(RPMCANONVENDOR)
AC_SUBST(RPMCANONOS)
+AC_SUBST(RPMCANONGNU)
if test X"$prefix" = XNONE ; then
usrprefix="$ac_default_prefix"
diff -up rpm-4.4.2.1-rc3/macros.in.orig rpm-4.4.2.1-rc3/macros.in
--- rpm-4.4.2.1-rc3/macros.in.orig 2007-07-21 15:12:13.000000000 -0400
+++ rpm-4.4.2.1-rc3/macros.in 2007-07-21 15:12:32.000000000 -0400
@@ -819,7 +819,7 @@ print (t)\
%_build_arch @RPMCANONARCH@
%_vendor @RPMCANONVENDOR@
%_os @RPMCANONOS@
-%_gnu -gnu
+%_gnu @RPMCANONGNU@
%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
#
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- rpm.spec 21 Jul 2007 12:28:06 -0000 1.240
+++ rpm.spec 23 Jul 2007 11:12:59 -0000 1.241
@@ -13,8 +13,8 @@
Summary: The RPM package management system
Name: rpm
Version: 4.4.2.1
-%{expand: %%define rpm_version %{version}-rc3}
-Release: 0.6.rc3
+%{expand: %%define rpm_version %{version}}
+Release: 1%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source: rpm-%{rpm_version}.tar.gz
@@ -28,6 +28,7 @@
Patch8: rpm-4.4.2.1-checkterminate.patch
Patch9: rpm-4.4.2.1-python-exithook.patch
Patch10: rpm-4.4.2.1-checkterminate-noexit.patch
+Patch11: rpm-4.4.2.1-gnueabi.patch
License: GPL
Requires(pre): shadow-utils
Requires(postun): shadow-utils
@@ -142,6 +143,7 @@
%patch8 -p1 -b .checkterminate
%patch9 -p1 -b .py-exithook
%patch10 -p1 -b .checkterminate-noexit
+%patch11 -p1 -b .gnueabi
%build
@@ -150,6 +152,12 @@
WITH_PYTHON="--with-python=%{with_python_version}"
+# XXX pull in updated config.guess and config.sub as done by %configure
+# which cannot be used to build rpm itself due to makefile brokenness
+for i in $(find . -name config.guess -o -name config.sub) ; do
+ [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i
+done
+
CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
./configure --prefix=%{__prefix} --sysconfdir=/etc \
--localstatedir=/var --infodir='${prefix}%{__share}/info' \
@@ -267,7 +275,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc CHANGES GROUPS COPYING LICENSE-bdb LEGAL.NOTICE-file CREDITS
+%doc CHANGES GROUPS COPYING LICENSE-bdb LEGAL.NOTICE-file CREDITS ChangeLog
%doc doc/manual/[a-z]*
%attr(0755, rpm, rpm) /bin/rpm
@@ -438,6 +446,13 @@
%{__includedir}/popt.h
%changelog
+* Mon Jul 23 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.1-1
+- 4.4.2.1 final
+- reintroduce disttag
+- include full ChangeLog as doc
+- use up-to-date config.guess for ARM support (#246803)
+- ARM EANBI gnu/gnuenabi fix from Lennert Buytenhek (#246803)
+
* Sat Jul 21 2007 Panu Matilainen <pmatilai at redhat.com> 4.4.2.1-0.6.rc3
- dont mess up python exit codes
- Previous message: rpms/sonata/devel .cvsignore, 1.5, 1.6 sonata.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message: rpms/sonata/F-7 .cvsignore, 1.5, 1.6 sonata.spec, 1.5, 1.6 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list