rpms/rpm/devel .cvsignore, 1.28, 1.29 rpm.spec, 1.298, 1.299 sources, 1.134, 1.135 rpm-4.5.90-ppc-isa.patch, 1.1, NONE

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14280

Modified Files:
	.cvsignore rpm.spec sources 
Removed Files:
	rpm-4.5.90-ppc-isa.patch 
Log Message:
- update to 4.6.0-rc1
- fixes #465586, #466597, #465409, #216221, #466503, #466009, #463447...
- avoid using %%configure macro for now, it has unwanted side-effects on rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	1 Oct 2008 08:43:03 -0000	1.28
+++ .cvsignore	16 Oct 2008 16:19:41 -0000	1.29
@@ -1 +1 @@
-rpm-4.5.90.git8514.tar.bz2
+rpm-4.6.0-rc1.tar.bz2


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- rpm.spec	1 Oct 2008 08:43:03 -0000	1.298
+++ rpm.spec	16 Oct 2008 16:19:41 -0000	1.299
@@ -9,9 +9,9 @@
 
 %define rpmhome /usr/lib/rpm
 
-%define rpmver 4.5.90
-%define snapver git8514
-%define srcver %{rpmver}.%{snapver}
+%define rpmver 4.6.0
+%define snapver rc1
+%define srcver %{rpmver}-%{snapver}
 
 %define bdbver 4.5.20
 
@@ -32,9 +32,6 @@
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
-# Already in upstream, remove on next snapshot update
-Patch200: rpm-4.5.90-ppc-isa.patch
-
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
 
@@ -165,8 +162,6 @@
 %patch2 -p1 -b .gstreamer-prov
 %patch100 -p1 -b .pkgconfig-deps
 
-%patch200 -p1 -b .ppc-isa
-
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
 
@@ -180,9 +175,17 @@
 LDFLAGS=-L%{_libdir}/db%{bdbver}
 %endif
 CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
-export CPPFLAGS LDFLAGS
+CFLAGS="$RPM_OPT_FLAGS"
+export CPPFLAGS CFLAGS LDFLAGS
 
-%configure \
+# Using configure macro has some unwanted side-effects on rpm platform
+# setup, use the old-fashioned way for now only defining minimal paths.
+./configure \
+    --prefix=%{_usr} \
+    --sysconfdir=%{_sysconfdir} \
+    --localstatedir=%{_var} \
+    --mandir=%{_mandir} \
+    --libdir=%{_libdir} \
     %{!?with_int_bdb: --with-external-db} \
     %{?with_sqlite: --enable-sqlite3} \
     --with-lua \
@@ -349,6 +352,11 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Oct 16 2008 Panu Matilainen <pmatilai at redhat.com>
+- update to 4.6.0-rc1 
+- fixes #465586, #466597, #465409, #216221, #466503, #466009, #463447...
+- avoid using %%configure macro for now, it has unwanted side-effects on rpm
+
 * Wed Oct 01 2008 Panu Matilainen <pmatilai at redhat.com>
 - update to official 4.5.90 alpha tarball 
 - a big pile of misc bugfixes + translation updates


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	1 Oct 2008 08:43:03 -0000	1.134
+++ sources	16 Oct 2008 16:19:41 -0000	1.135
@@ -1 +1 @@
-5bb759ffc690dfc9e1456391fa001447  rpm-4.5.90.git8514.tar.bz2
+083184a85aec253cb4c4662c46379925  rpm-4.6.0-rc1.tar.bz2


--- rpm-4.5.90-ppc-isa.patch DELETED ---