RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 15-Mar-2016 20:39:53
Branch: rpm-5_4 Handle: 2016031519395200
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac rpm.spec.in
Log:
- snapshot: rpm-5.4.16-0.20160315.src.rpm.
- rpm.spec: rpmbuild can rebuild itself (+/- --with-versioned-paths).
- rpmdb: fix: disable DB_MULTIVERSION if non-root.
- distcheck: fix: clean up *.so after lua "make check".
Summary:
Revision Changes Path
1.3501.2.471+3 -0 rpm/CHANGES
2.472.2.134 +1 -1 rpm/configure.ac
2.458.2.7 +20 -6 rpm/rpm.spec.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.470 -r1.3501.2.471 CHANGES
--- rpm/CHANGES 14 Mar 2016 06:28:16 -0000 1.3501.2.470
+++ rpm/CHANGES 15 Mar 2016 19:39:52 -0000 1.3501.2.471
@@ -1,4 +1,7 @@
5.4.15 -> 5.4.16:
+ - jbj: rpm.spec: rpmbuild can rebuild itself (+/-
--with-versioned-paths).
+ - jbj: rpmdb: fix: disable DB_MULTIVERSION if non-root.
+ - jbj: distcheck: fix: clean up *.so after lua "make check".
- jbj: distcheck: throw lua-5.3.2 onto the "make check" pyre.
- jbj: lua: update to lua-5.3.2.
- jbj: autofu: make distcheck w/o cruft.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.133 -r2.472.2.134 configure.ac
--- rpm/configure.ac 12 Mar 2016 19:52:54 -0000 2.472.2.133
+++ rpm/configure.ac 15 Mar 2016 19:39:52 -0000 2.472.2.134
@@ -9,7 +9,7 @@
AC_PREREQ([2.63])
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
AC_INIT([rpm],[5.4.16],[PACKAGE_BUGREPORT_DEFAULT])
-PACKAGE_TIMESTAMP="2014-08-18" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
+PACKAGE_TIMESTAMP="2016-03-15" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
AC_MSG_HEADER([INITIALIZATION])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
============================================================================
$ cvs diff -u -r2.458.2.6 -r2.458.2.7 rpm.spec.in
--- rpm/rpm.spec.in 17 Aug 2014 20:15:58 -0000 2.458.2.6
+++ rpm/rpm.spec.in 15 Mar 2016 19:39:52 -0000 2.458.2.7
@@ -6,13 +6,20 @@
%define with_xz @WITH_XZ@%{nil}
%define with_apidocs @WITH_APIDOCS@%{nil}
-%{!?_usrlibrpm:%global _usrlibrpm @USRLIBRPM@}
-%{!?_rpmhome:%global _rpmhome @USRLIBRPM@}
-
%define __prefix %{?_prefix}%{!?_prefix:/usr}
+
+# XXX override existing rpmbuild configuration
+#%%{!?_usrlibrpm:%global _usrlibrpm @USRLIBRPM@}
+#%%{!?_rpmhome:%global _rpmhome @USRLIBRPM@}
+%global _usrlibrpm %{__prefix}/lib/rpm*
+%global _rpmhome %{__prefix}/lib/rpm*
+
%{?!_lib: %define _lib lib}
%{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo
/share ; else echo %%{nil} ; fi)}
+# XXX use helpers from just installed build root.
+%define find_lang %(echo %{buildroot}%{_rpmhome})/find-lang.sh
%{buildroot}
+%define __check_files %(echo %{buildroot}%{_rpmhome})/check-files
%{buildroot}
Summary: The RPM package management system.
Name: rpm
@@ -255,6 +262,8 @@
WITH_NEON="--with-neon --without-libproxy --with-expat"
%endif
+CFLAGS="${CFLAGS:- -O2}"; export CFLAGS
+
%ifarch x86_64
CFLAGS="$CFLAGS -DHAVE_VA_COPY -DVA_COPY=va_copy"; export CFLAGS
%endif
@@ -313,7 +322,7 @@
--with-build-extlibdep \
--with-build-maxextlibdep \
--without-valgrind \
- --disable-openmp \
+ --enable-openmp \
--enable-build-pic \
--enable-build-versionscript \
--enable-build-warnings \
@@ -351,12 +360,12 @@
Basenames Conflictname Dirnames Group Installtid Name Packages \
Providename Provideversion Requirename Requireversion Triggername \
Filemd5s Pubkeys Sha1header Sigmd5 \
- __db.001 __db.002 __db.003 __db.004 __db.005
+ __db.001 __db.002 __db.003 __db.004 __db.005 __db.006
do
touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi
done
-( cd $RPM_BUILD_ROOT/%{_rpmhome}
+( cd ${RPM_BUILD_ROOT}/usr/lib/rpm*
tar xzf %{SOURCE1}
# XXX assume ix86 platforms for the moment
rm -rf ./alpha-linux
@@ -738,8 +747,13 @@
###%{_rpmhome}/lib/librpmjsm.a
###%{_rpmhome}/lib/librpmjsm.la
###%{_rpmhome}/lib/librpmjsm.so
+%{_rpmhome}/include/*.h
+%{_rpmhome}/include/lua*.hpp
%changelog
+* Tue Mar 15 2016 Jeff Johnson <j...@rpm5.org> -5.4.16
+- improve uncoupling from rpmbuild configuration.
+
* Thu Jun 02 2011 mdawkins <matty...@gmail.com> 5.4.2-0.20110602
- new snapshot date 20110602 for release 5.4.2
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
