rpms/rpm/devel .cvsignore, 1.32, 1.33 rpm-4.6.0-extra-provides.patch, 1.2, 1.3 rpm.spec, 1.323, 1.324 sources, 1.138, 1.139

[Panu Matilainen]

Author: pmatilai

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

Modified Files:
	.cvsignore rpm-4.6.0-extra-provides.patch rpm.spec sources 
Log Message:
- update to 4.6.0 final
- revert libmagic looking into compressed files for now, breaks ooffice build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Jan 2009 11:28:35 -0000	1.32
+++ .cvsignore	6 Feb 2009 13:55:13 -0000	1.33
@@ -1 +1 @@
-rpm-4.6.0-rc4.tar.bz2
+rpm-4.6.0.tar.bz2

rpm-4.6.0-extra-provides.patch:

Index: rpm-4.6.0-extra-provides.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.6.0-extra-provides.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpm-4.6.0-extra-provides.patch	6 Feb 2009 06:54:05 -0000	1.2
+++ rpm-4.6.0-extra-provides.patch	6 Feb 2009 13:55:13 -0000	1.3
@@ -64,7 +64,7 @@
      int fcolor;
      int xx;
 -    int msflags = MAGIC_CHECK;	/* XXX MAGIC_COMPRESS flag? */
-+    int msflags = MAGIC_CHECK | MAGIC_COMPRESS;
++    int msflags = MAGIC_CHECK; /* add MAGIC_COMPRESS eventually */
      magic_t ms = NULL;
  
      if (fc == NULL || argv == NULL)


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- rpm.spec	6 Feb 2009 06:54:05 -0000	1.323
+++ rpm.spec	6 Feb 2009 13:55:13 -0000	1.324
@@ -10,15 +10,14 @@
 %define rpmhome /usr/lib/rpm
 
 %define rpmver 4.6.0
-%define snapver rc4
-%define srcver %{rpmver}-%{snapver}
+%define srcver %{rpmver}
 
 %define bdbver 4.5.20
 
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.5%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -376,6 +375,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Feb 06 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-1
+- update to 4.6.0 final
+- revert libmagic looking into compressed files for now, breaks ooffice build
+
 * Fri Feb 06 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-0.rc4.5
 - enable fontconfig provides generation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	30 Jan 2009 11:28:35 -0000	1.138
+++ sources	6 Feb 2009 13:55:13 -0000	1.139
@@ -1 +1 @@
-ad3d374efb26e4d22ff1d27dc3d399ab  rpm-4.6.0-rc4.tar.bz2
+77bf389f87f61ff53b068a9870aa91ca  rpm-4.6.0.tar.bz2