packages: squashfs/squashfs.spec - final 4.1 with lzo and lzma support (xz-...

[areq]

Author: areq                         Date: Sun Jan 16 16:09:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- final 4.1 with lzo and lzma support (xz-devel)

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

---- Diffs:

================================================================
Index: packages/squashfs/squashfs.spec
diff -u packages/squashfs/squashfs.spec:1.37 packages/squashfs/squashfs.spec:1.38
--- packages/squashfs/squashfs.spec:1.37	Sun Dec 13 21:20:04 2009
+++ packages/squashfs/squashfs.spec	Sun Jan 16 17:09:51 2011
@@ -1,18 +1,16 @@
 # $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.1
-Release:	0.%{snap}.1
+Release:	1
 License:	GPL
 Group:		Base/Utilities
-# 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
+Source0:	http://dl.sourceforge.net/squashfs/%{name}%{version}.tar.gz
+# Source0-md5:	8e1b2b96f5d5f3fe48fef226ae8cd341
 URL:		http://squashfs.sourceforge.net/
+BuildRequires:	lzo-devel >= 2.04
+BuildRequires:	xz-devel >= 5.0.0
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,14 +45,14 @@
 pamięci i urządzeń blokowych (np. systemach wbudowanych).
 
 %prep
-%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
+%setup -q -n %{name}%{version}
+sed -i -e 's/^#XZ_SUPPORT.*=.*/XZ_SUPPORT = 1/'  squashfs-tools/Makefile
+sed -i -e 's/^#LZO_SUPPORT.*=.*/LZO_SUPPORT = 1/' squashfs-tools/Makefile
+sed -i -e "s/-O2 -Wall/%{rpmcflags}/" squashfs-tools/Makefile
 
 %build
 %{__make} -C squashfs-tools \
-	CC="%{__cc}" \
-	CFLAGS="-I. -I$(pwd)/C -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DLZMA_SUPPORT=1 -DCOMP_DEFAULT=\\\"gzip\\\" %{rpmcflags}"
+	CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2011/01/16 16:09:51  areq
+- final 4.1 with lzo and lzma support (xz-devel)
+
 Revision 1.37  2009/12/13 20:20:04  arekm
 - 4.1 snap (adds LZMA support)
 
================================================================

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