SPECS: lzma.spec - use lzma from p7zip sources, which uses multith...

wolf wolf at pld-linux.org
Sat Sep 8 16:25:22 CEST 2007


Author: wolf                         Date: Sat Sep  8 14:25:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use lzma from p7zip sources, which uses multithreading

---- Files affected:
SPECS:
   lzma.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/lzma.spec
diff -u SPECS/lzma.spec:1.28 SPECS/lzma.spec:1.29
--- SPECS/lzma.spec:1.28	Sun Sep  2 00:28:06 2007
+++ SPECS/lzma.spec	Sat Sep  8 16:25:17 2007
@@ -3,15 +3,16 @@
 Summary(pl.UTF-8):	Koder/Dekoder LZMA
 Name:		lzma
 Version:	4.49
-Release:	0.9
+Release:	1
 License:	CPL/LGPL
 Group:		Applications/Archiving
-Source0:	http://dl.sourceforge.net/sevenzip/%{name}449.tar.bz2
-# Source0-md5:	410487fe9717ce5a37e3c810cee74092
+Source0:	http://dl.sourceforge.net/p7zip/p7zip_4.53_src_all.tar.bz2
+# Source0-md5:	331450463d5737bba96cbea2115abe8b
 Patch0:		%{name}-quiet.patch
 Patch1:		%{name}427_zlib.patch
 Patch2:		%{name}-shared.patch
 Patch3:		%{name}-lzmalib.patch
+Patch4:		%{name}-makefile.patch
 URL:		http://www.7-zip.org/sdk.html
 BuildRequires:	gcc >= 5:3.4.0
 BuildRequires:	libstdc++-devel
@@ -90,40 +91,40 @@
 Biblioteka statyczna LZMA.
 
 %prep
-%setup -q -c
+%setup -q -n p7zip_4.53
 %patch0 -p1
 #%patch1 -p1
 #%patch2 -p1
 #%patch3 -p1
+%patch4 -p1
 
 %build
 cd CPP/7zip/Compress/LZMA_Alone
-%{__make} -f makefile.gcc \
+%{__make} -f makefile \
 	CXX="%{__cxx}" \
 	CXX_C="%{__cc}" \
-	CFLAGS="%{rpmcflags} -fprofile-generate -c -I ../../.." \
-	LDFLAGS="%{rpmcflags} %{rpmldflags} -fprofile-generate" \
-	LIB="-lm -lgcov"
+	OPTFLAGS="%{rpmcflags} -fprofile-generate" \
+	LDFLAGS="%{rpmcflags} %{rpmldflags} -fprofile-generate"
 
 cat ../LZMA/* > test1
 cat lzma *.o > test2
 tar cf test3 ../../../../*
-./lzma e test1 test4
-./lzma e test2 test5
-./lzma e test3 test6
-./lzma d test4 test7
-./lzma d test5 test8
-./lzma d test6 test9
+./lzma e test1 test4 -mt4
+./lzma e test2 test5 -mt4
+./lzma e test3 test6 -mt4
+./lzma d test4 test7 -mt4
+./lzma d test5 test8 -mt4
+./lzma d test6 test9 -mt4
 cmp test1 test7
 cmp test2 test8
 cmp test3 test9
 
-%{__make} -f makefile.gcc clean
+%{__make} -f makefile clean
 
-%{__make} -f makefile.gcc \
+%{__make} -f makefile \
 	CXX="%{__cxx}" \
-	CXX_C="%{__cc}" \
-	CFLAGS="%{rpmcflags} -fprofile-use -c -I ../../.." \
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags} -fprofile-use" \
 	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 #cd ../LZMA_Lib
@@ -151,7 +152,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc history.txt lzma.txt
+#%doc history.txt lzma.txt
 %attr(755,root,root) %{_bindir}/*
 
 #%files libs
@@ -173,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2007/09/08 14:25:17  wolf
+- use lzma from p7zip sources, which uses multithreading
+
 Revision 1.28  2007/09/01 22:28:06  wolf
 - 4.49
 - libs broken
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lzma.spec?r1=1.28&r2=1.29&f=u



More information about the pld-cvs-commit mailing list