[squashfs-tools/f15/master] Pass the compressor options through the make call instead of a patch.
Bruno Wolff III
bruno at fedoraproject.org
Wed Mar 2 05:01:14 UTC 2011
commit b4793228eb569bc4add0f67fd94ca8cd7355afde
Author: Bruno Wolff III <bruno at wolff.to>
Date: Tue Mar 1 22:56:47 2011 -0600
Pass the compressor options through the make call instead of a patch.
squashfs-compressors.patch | 29 -----------------------------
squashfs-tools.spec | 5 ++---
2 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 9946490..abf12b1 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -6,7 +6,6 @@ License: GPLv2+
Group: System Environment/Base
URL: http://squashfs.sourceforge.net/
Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz
-Patch1: squashfs-compressors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel
BuildRequires: xz-devel
@@ -19,11 +18,10 @@ contains the utilities for manipulating squashfs filesystems.
%prep
%setup -q -n squashfs4.2
-%patch1 -p0
%build
pushd squashfs-tools
-CFLAGS="%{optflags}" make %{?_smp_mflags}
+CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 make %{?_smp_mflags}
%install
mkdir -p %{buildroot}/sbin %{buildroot}/usr/sbin
@@ -48,6 +46,7 @@ rm -rf %{buildroot}
- Big endian patch is now upstream.
- Buildroot tag isn't needed any more.
- We can now specify CFLAGS on the make call.
+- Compressor options are now passed with the make call.
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2-0.4.20101231
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list