diff --git a/.cvsignore b/.cvsignore index d0b907c..c9400cb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rpm-4.6.0-rc4.tar.bz2 +rpm-4.6.0.tar.bz2 diff --git a/rpm-4.6.0-extra-provides.patch b/rpm-4.6.0-extra-provides.patch index 5ec72ce..9a2c3e5 100644 --- a/rpm-4.6.0-extra-provides.patch +++ b/rpm-4.6.0-extra-provides.patch @@ -64,7 +64,7 @@ diff -up rpm-4.6.0-rc4/build/rpmfc.c.extra-prov rpm-4.6.0-rc4/build/rpmfc.c 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) diff --git a/rpm.spec b/rpm.spec index 3447291..6ce4f28 100644 --- a/rpm.spec +++ b/rpm.spec @@ -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 @@ exit 0 %doc doc/librpm/html/* %changelog +* Fri Feb 06 2009 Panu Matilainen - 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 - 4.6.0-0.rc4.5 - enable fontconfig provides generation diff --git a/sources b/sources index ba4883e..064ead5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad3d374efb26e4d22ff1d27dc3d399ab rpm-4.6.0-rc4.tar.bz2 +77bf389f87f61ff53b068a9870aa91ca rpm-4.6.0.tar.bz2