[squashfs-tools/f15/master] Update to 4.2 release.
Bruno Wolff III
bruno at fedoraproject.org
Wed Mar 2 04:52:40 UTC 2011
commit e59d8926b68b3d2c8b1341de8845e2d40bb0e75f
Author: Bruno Wolff III <bruno at wolff.to>
Date: Tue Mar 1 22:25:52 2011 -0600
Update to 4.2 release.
.gitignore | 1 +
sources | 2 +-
squashfs-bigendian.patch | 12 ------------
squashfs-cflags.patch | 13 -------------
squashfs-tools.spec | 36 ++++++++++++++++++------------------
5 files changed, 20 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2affc6d..5270323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ squashfs-4.1.tar.bz2
/squashfs-4.2-2010-12-23.bz2
/squashfs-4.2-20101223.bz2
/squashfs-4.2-20101231.bz2
+/squashfs4.2.tar.gz
diff --git a/sources b/sources
index 999a8ae..df751a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f5e167796a3b2dbf1a4457d27c72e3c squashfs-4.2-20101231.bz2
+1b7a781fb4cf8938842279bd3e8ee852 squashfs4.2.tar.gz
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 2b81f4d..8f3dceb 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,18 +1,12 @@
Summary: Utility for the creation of squashfs filesystems
Name: squashfs-tools
Version: 4.2
-%global cvsdate 20101231
-Release: 0.4.%{cvsdate}%{?dist}
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
-URL: http://squashfs.sf.net
-# cvs -z3 -d:pserver:anonymous at squashfs.cvs.sourceforge.net:/cvsroot/squashfs export -D "%{cvsdate} 2359 UTC" -d squashfs-%{version}-%{cvsdate} squashfs
-# tar cfj squashfs-%{version}-%{cvsdate}.bz2 squashfs-%{version}-%{cvsdate}
-Source0: squashfs-%{version}-%{cvsdate}.bz2
-Patch0: squashfs-cflags.patch
+URL: http://squashfs.sourceforge.net/
+Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz
Patch1: squashfs-compressors.patch
-# https://sourceforge.net/tracker/?func=detail&aid=3155564&group_id=63835&atid=505343
-Patch2: squashfs-bigendian.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel
BuildRequires: xz-devel
@@ -24,32 +18,38 @@ Squashfs is a highly compressed read-only filesystem for Linux. This package
contains the utilities for manipulating squashfs filesystems.
%prep
-%setup -q -n squashfs-%{version}-%{cvsdate}
+%setup -q
%patch0 -p0
%patch1 -p0
-%patch2 -p0
%build
pushd squashfs-tools
-make RPM_OPT_FLAGS="%{optflags}"
+make CFLAGS="%{optflags}"
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/sbin $RPM_BUILD_ROOT/usr/sbin
-install -m 755 squashfs-tools/mksquashfs $RPM_BUILD_ROOT/sbin/mksquashfs
-install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}/unsquashfs
+mkdir -p %{buildroot}/sbin %{buildroot}/usr/sbin
+install -m 755 squashfs-tools/mksquashfs %{buildroot}/sbin/mksquashfs
+install -m 755 squashfs-tools/unsquashfs %{buildroot}%{_sbindir}/unsquashfs
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc README
+%doc README ACKNOWLEDGEMENTS DONATIONS PERFORMANCE.README README-4.2 CHANGES pseudo-file.example COPYING
/sbin/mksquashfs
%{_sbindir}/unsquashfs
%changelog
+* Tue Mar 01 2011 Bruno Wolff III <bruno at wolff.to> - 4.2-1
+- 4.2 is released.
+- Bugfix for bad data causing crash.
+- Include doc files added for release.
+- Big endian patch is now upstream.
+- Buildroot tag isn't needed any more.
+- We can now specify CFLAGS on 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