packages: squashfs/squashfs.spec - 4.1 snap (adds LZMA support)

arekm arekm at pld-linux.org
Sun Dec 13 21:20:09 CET 2009


Author: arekm                        Date: Sun Dec 13 20:20:09 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 4.1 snap (adds LZMA support)

---- Files affected:
packages/squashfs:
   squashfs.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/squashfs/squashfs.spec
diff -u packages/squashfs/squashfs.spec:1.36 packages/squashfs/squashfs.spec:1.37
--- packages/squashfs/squashfs.spec:1.36	Mon Apr  6 18:56:13 2009
+++ packages/squashfs/squashfs.spec	Sun Dec 13 21:20:04 2009
@@ -1,13 +1,17 @@
 # $Revision$, $Date$
+%define	snap	20091213
 Summary:	Set of tools which creates squashfs filesystem
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia systemu plików squashfs
 Name:		squashfs
-Version:	4.0
-Release:	1
+Version:	4.1
+Release:	0.%{snap}.1
 License:	GPL
 Group:		Base/Utilities
-Source0:	http://dl.sourceforge.net/squashfs/%{name}%{version}.tar.gz
-# Source0-md5:	a3c23391da4ebab0ac4a75021ddabf96
+# Source0:	http://dl.sourceforge.net/squashfs/%{name}%{version}.tar.gz
+Source0:	%{name}-%{snap}.tar.bz2
+# Source0-md5:	595391e4ae095e82214e7f96d53bc505
+Source1:	http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2
+# Source1-md5:	29d5ffd03a5a3e51aef6a74e9eafb759
 URL:		http://squashfs.sourceforge.net/
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,12 +47,14 @@
 pamięci i urządzeń blokowych (np. systemach wbudowanych).
 
 %prep
-%setup -q -n %{name}%{version}
+%setup -q -n %{name} -a1
+sed -i -e 's#^\#LZMA_SUPPORT.*=.*#LZMA_SUPPORT=1#g' squashfs-tools/Makefile
+sed -i -e "s#^LZMA_DIR.*=.*#LZMA_DIR = $(pwd)#g" squashfs-tools/Makefile
 
 %build
 %{__make} -C squashfs-tools \
 	CC="%{__cc}" \
-	CFLAGS="-I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE %{rpmcflags}"
+	CFLAGS="-I. -I$(pwd)/C -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DLZMA_SUPPORT=1 -DCOMP_DEFAULT=\\\"gzip\\\" %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,7 +67,6 @@
 
 %files
 %defattr(644,root,root,755)
-%doc *README* ACKNOWLEDGEMENTS CHANGES
 %attr(755,root,root) %{_sbindir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -70,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2009/12/13 20:20:04  arekm
+- 4.1 snap (adds LZMA support)
+
 Revision 1.36  2009/04/06 16:56:13  arekm
 - up to 4.0 (for kernels 2.6.29 and above)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/squashfs/squashfs.spec?r1=1.36&r2=1.37&f=u



More information about the pld-cvs-commit mailing list