packages: cromfs/cromfs.spec, cromfs/cromfs-c32.patch (NEW), cromfs/cromfs-...

[qboosh]

Author: qboosh                       Date: Sat Nov 13 10:02:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.5.9
- removed obsolete noomp patch, added c32,libc patches
- builds with openmp support if using gcc 4.2+ (BR: libgomp-devel)

---- Files affected:
packages/cromfs:
   cromfs.spec (1.13 -> 1.14) , cromfs-c32.patch (NONE -> 1.1)  (NEW), cromfs-libc.patch (NONE -> 1.1)  (NEW), cromfs-noomp.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cromfs/cromfs.spec
diff -u packages/cromfs/cromfs.spec:1.13 packages/cromfs/cromfs.spec:1.14
--- packages/cromfs/cromfs.spec:1.13	Thu Jan 15 21:58:23 2009
+++ packages/cromfs/cromfs.spec	Sat Nov 13 11:02:16 2010
@@ -2,16 +2,21 @@
 Summary:	Compressed ROM filesystem for Linux in user-space
 Summary(pl.UTF-8):	System plików Compressed ROM dla Linuksa działający w przestrzeni użytkownika
 Name:		cromfs
-Version:	1.5.6.2
+Version:	1.5.9
 Release:	0.1
 License:	GPL v3
 Group:		Applications/System
 Source0:	http://bisqwit.iki.fi/src/arch/%{name}-%{version}.tar.bz2
-# Source0-md5:	11b76b8ace6cffaff6e58edceea17d9f
-Patch0:		%{name}-noomp.patch
+# Source0-md5:	9e2067c72a9edf80b232c624f0a7432e
+Patch0:		%{name}-c32.patch
+Patch1:		%{name}-libc.patch
 URL:		http://bisqwit.iki.fi/source/cromfs.html
 BuildRequires:	libfuse-devel >= 0:2.5.2
+%if "%{cc_version}" >= "4.2"
+BuildRequires:	libgomp-devel
+%endif
 BuildRequires:	libstdc++-devel
+BuildRequires:	lzo-devel >= 2
 BuildRequires:	rpmbuild(macros) >= 1.167
 Requires:	libfuse >= 0:2.5.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,6 +53,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 ./configure
@@ -78,7 +84,10 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/ChangeLog doc/FORMAT README.html
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/cromfs-driver
+%attr(755,root,root) %{_bindir}/cvcromfs
+%attr(755,root,root) %{_bindir}/mkcromfs
+%attr(755,root,root) %{_bindir}/unmkcromfs
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -86,6 +95,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/11/13 10:02:16  qboosh
+- updated to 1.5.9
+- removed obsolete noomp patch, added c32,libc patches
+- builds with openmp support if using gcc 4.2+ (BR: libgomp-devel)
+
 Revision 1.13  2009/01/15 20:58:23  qboosh
 - added noomp patch (fixes build without omp)
 - pass CC

================================================================
Index: packages/cromfs/cromfs-c32.patch
diff -u /dev/null packages/cromfs/cromfs-c32.patch:1.1
--- /dev/null	Sat Nov 13 11:02:24 2010
+++ packages/cromfs/cromfs-c32.patch	Sat Nov 13 11:02:16 2010
@@ -0,0 +1,10 @@
+--- cromfs-1.5.9/lib/newhash.cc.orig	2009-12-17 09:44:32.000000000 +0100
++++ cromfs-1.5.9/lib/newhash.cc	2010-11-13 10:12:45.163105804 +0100
+@@ -296,6 +296,7 @@
+    }
+ #else
+     uint_least32_t a,b;
++    typedef uint_least32_t c32;
+     unsigned long len = size;
+     c += size + UINT32_C(0x9e3779b9); // 2^32 / ((1+sqrt(5))/2
+     a = b = c;

================================================================
Index: packages/cromfs/cromfs-libc.patch
diff -u /dev/null packages/cromfs/cromfs-libc.patch:1.1
--- /dev/null	Sat Nov 13 11:02:24 2010
+++ packages/cromfs/cromfs-libc.patch	Sat Nov 13 11:02:16 2010
@@ -0,0 +1,10 @@
+--- cromfs-1.5.9/util/unmkcromfs.cc.orig	2009-12-17 09:44:32.000000000 +0100
++++ cromfs-1.5.9/util/unmkcromfs.cc	2010-11-13 10:26:48.243099937 +0100
+@@ -22,6 +22,7 @@
+ #ifdef HAS_LUTIMES
+  #include <sys/time.h>
+ #endif
++#include <sys/stat.h>
+ 
+ #include <getopt.h>
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cromfs/cromfs.spec?r1=1.13&r2=1.14&f=u