rpms/rpm/F-11 rpm.spec, 1.352, 1.353 sources, 1.142, 1.143 rpm-4.7.0-findlang-kde3.patch, 1.1, NONE rpm-4.7.0-fp-findbyfile.patch, 1.1, NONE rpm-4.7.0-fp-symlink.patch, 1.1, NONE rpm-4.7.0-hardlink-sizes.patch, 1.1, NONE rpm-4.7.0-prtsig.patch, 1.1, NONE rpm-4.7.0-python-altnevr.patch, 1.1, NONE
Panu Matilainen
pmatilai at fedoraproject.org
Thu Jul 23 06:54:38 UTC 2009
- Previous message (by thread): rpms/dovecot/F-11 .cvsignore, 1.61, 1.62 dovecot.spec, 1.135, 1.136 sources, 1.64, 1.65
- Next message (by thread): rpms/cld/devel cld.spec,1.5,1.6 sources,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26297
Modified Files:
rpm.spec sources
Removed Files:
rpm-4.7.0-findlang-kde3.patch rpm-4.7.0-fp-findbyfile.patch
rpm-4.7.0-fp-symlink.patch rpm-4.7.0-hardlink-sizes.patch
rpm-4.7.0-prtsig.patch rpm-4.7.0-python-altnevr.patch
Log Message:
- update to 4.7.1 (http://rpm.org/wiki/Releases/4.7.1)
- fixes #461353, #475359, #502269, #508021, #509637, #511101
- enable XZ support
- fix source url
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -p -r1.352 -r1.353
--- rpm.spec 18 Jun 2009 16:05:04 -0000 1.352
+++ rpm.spec 23 Jul 2009 06:54:08 -0000 1.353
@@ -1,5 +1,5 @@
-# rawhide doesn't have new enough lzma yet
-%bcond_with lzma
+# build against xz?
+%bcond_without xz
# sqlite backend is broken atm, disabled for now
%bcond_with sqlite
# just for giggles, option to build with internal Berkeley DB
@@ -15,7 +15,7 @@
%define rpmhome /usr/lib/rpm
-%define rpmver 4.7.0
+%define rpmver 4.7.1
%define snapver {nil}
%define srcver %{rpmver}
@@ -25,10 +25,10 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: 2%{?dist}
+Release: 1%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
-Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
+Source0: http://rpm.org/releases/rpm-4.7.x/%{name}-%{srcver}.tar.bz2
%if %{with int_bdb}
Source1: db-%{bdbver}.tar.gz
%endif
@@ -43,12 +43,6 @@ Patch2: rpm-4.5.90-gstreamer-provides.pa
Patch3: rpm-4.6.0-fedora-specspo.patch
# Patches already in upstream
-Patch200: rpm-4.7.0-findlang-kde3.patch
-Patch201: rpm-4.7.0-prtsig.patch
-Patch202: rpm-4.7.0-python-altnevr.patch
-Patch203: rpm-4.7.0-hardlink-sizes.patch
-Patch204: rpm-4.7.0-fp-symlink.patch
-Patch205: rpm-4.7.0-fp-findbyfile.patch
# These are not yet upstream
Patch300: rpm-4.7.0-extra-provides.patch
@@ -93,8 +87,8 @@ BuildRequires: ncurses-devel
BuildRequires: bzip2-devel >= 0.9.0c-2
BuildRequires: python-devel >= 2.2
BuildRequires: lua-devel >= 5.1
-%if %{with lzma}
-BuildRequires: lzma-devel >= 4.42
+%if %{with xz}
+BuildRequires: xz-devel >= 4.999.8
%endif
%if %{with sqlite}
BuildRequires: sqlite-devel
@@ -130,8 +124,8 @@ Requires: nss-devel
Requires: libselinux-devel
Requires: elfutils-libelf-devel
Requires: popt-devel
-%if %{with lzma}
-Requires: lzma-devel >= 4.42
+%if %{with xz}
+Requires: xz-devel >= 4.999.8
%endif
%if %{with sqlite}
Requires: sqlite-devel
@@ -154,7 +148,7 @@ Group: Development/Tools
Requires: rpm = %{version}-%{release}
Requires: elfutils >= 0.128 binutils
Requires: findutils sed grep gawk diffutils file patch >= 2.5
-Requires: unzip gzip bzip2 cpio lzma
+Requires: unzip gzip bzip2 cpio lzma xz
Requires: pkgconfig
%description build
@@ -190,13 +184,6 @@ that will manipulate RPM packages and da
%patch2 -p1 -b .gstreamer-prov
%patch3 -p1 -b .fedora-specspo
-%patch200 -p1 -b .findlang-kde3
-%patch201 -p1 -b .prtsig
-%patch202 -p1 -b .py-altnevr
-%patch203 -p1 -b .hardlink-sizes
-%patch204 -p1 -b .fp-symlink
-%patch205 -p1 -b .fp-findbyfile
-
%patch300 -p1 -b .extra-prov
%patch301 -p1 -b .niagara
@@ -406,6 +393,12 @@ exit 0
%doc doc/librpm/html/*
%changelog
+* Thu Jul 23 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.1-1
+- update to 4.7.1 (http://rpm.org/wiki/Releases/4.7.1)
+- fixes #461353, #475359, #502269, #508021, #509637, #511101
+- enable XZ support
+- fix source url
+
* Thu Jun 18 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-2
- file classification tweaks for text files (#494817)
- disable libmagic text token checks, it's way too error-prone
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/sources,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- sources 16 Apr 2009 09:24:08 -0000 1.142
+++ sources 23 Jul 2009 06:54:08 -0000 1.143
@@ -1 +1 @@
-74791d638c571ec79f06227d453a6a03 rpm-4.7.0.tar.bz2
+e1abe3bcf6514a319a3803d2cf3bf83b rpm-4.7.1.tar.bz2
--- rpm-4.7.0-findlang-kde3.patch DELETED ---
--- rpm-4.7.0-fp-findbyfile.patch DELETED ---
--- rpm-4.7.0-fp-symlink.patch DELETED ---
--- rpm-4.7.0-hardlink-sizes.patch DELETED ---
--- rpm-4.7.0-prtsig.patch DELETED ---
--- rpm-4.7.0-python-altnevr.patch DELETED ---
- Previous message (by thread): rpms/dovecot/F-11 .cvsignore, 1.61, 1.62 dovecot.spec, 1.135, 1.136 sources, 1.64, 1.65
- Next message (by thread): rpms/cld/devel cld.spec,1.5,1.6 sources,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list