rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

enable XZ support.

Browse Source 
Switch the %%defines around so they reflect the new default.
This commit is contained in:
Bill Nottingham 2009-07-20 14:06:20 +00:00
parent b6a0b1184e
commit 20e9972fc7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpm.spec
View File

@ -1,5 +1,5 @@
# rawhide doesn't have new enough lzma yet # build against xz?
%bcond_with lzma %bcond_without xz
# sqlite backend is pretty useless # sqlite backend is pretty useless
%bcond_with sqlite %bcond_with sqlite
# just for giggles, option to build with internal Berkeley DB # just for giggles, option to build with internal Berkeley DB
@ -21,7 +21,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: 8%{?dist} Release: 9%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@ -91,8 +91,8 @@ BuildRequires: python-devel >= 2.2
BuildRequires: lua-devel >= 5.1 BuildRequires: lua-devel >= 5.1
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
%if %{with lzma} %if ! %{without xz}
BuildRequires: lzma-devel >= 4.42 BuildRequires: xz-devel >= 4.999.8
%endif %endif
%if %{with sqlite} %if %{with sqlite}
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
@ -129,8 +129,8 @@ Requires: nss-devel
Requires: libselinux-devel Requires: libselinux-devel
Requires: elfutils-libelf-devel Requires: elfutils-libelf-devel
Requires: popt-devel Requires: popt-devel
%if %{with lzma} %if ! %{without xz}
Requires: lzma-devel >= 4.42 Requires: xz-devel >= 4.999.8
%endif %endif
%if %{with sqlite} %if %{with sqlite}
Requires: sqlite-devel Requires: sqlite-devel
@ -153,7 +153,7 @@ Group: Development/Tools
Requires: rpm = %{version}-%{release} Requires: rpm = %{version}-%{release}
Requires: elfutils >= 0.128 binutils Requires: elfutils >= 0.128 binutils
Requires: findutils sed grep gawk diffutils file patch >= 2.5 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 Requires: pkgconfig
%description build %description build
@ -421,6 +421,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Mon Jul 20 2009 Bill Nottingham <notting@redhat.com> - 4.7.0-9
- enable XZ support
* Thu Jun 18 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-8 * Thu Jun 18 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-8
- updated OSGi dependency extractor (#506471) - updated OSGi dependency extractor (#506471)
- fix segfault in symlink fingerprinting (#505777) - fix segfault in symlink fingerprinting (#505777)