rpms/liboil/devel liboil.spec, 1.10, 1.11 liboil-0.3.3-ppc-no-fasm-blocks.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/liboil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19543/devel

Modified Files:
	liboil.spec 
Removed Files:
	liboil-0.3.3-ppc-no-fasm-blocks.patch 
Log Message:
Sync FC-4 and devel branches, update FC-3 branch, and remove old patches.



Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- liboil.spec	12 Nov 2005 15:31:18 -0000	1.10
+++ liboil.spec	14 Nov 2005 09:30:29 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://liboil.freedesktop.org/
@@ -40,7 +40,11 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+# multi-jobbed make makes the build fail:
+# ./build_prototypes_doc >liboilfuncs-doc.h
+# /bin/sh: ./build_prototypes_doc: No such file or directory
+# %{__make} %{?_smp_mflags}
+%{__make}
 
 
 %install
@@ -73,8 +77,12 @@
 
 
 %changelog
+* Mon Nov 14 2005 Matthias Saou <http://freshrpms.net/> 0.3.5-3
+- Sync spec files across branches.
+- Parallel make seems to have worked for 0.3.5 on devel, but just in case...
+
 * Sat Nov 12 2005 Thomas Vander Stichele <thomas at apestaart dot org> 0.3.5-2
-- Trigger rebuild
+- Trigger rebuild.
 
 * Sat Nov 12 2005 Thomas Vander Stichele <thomas at apestaart dot org> 0.3.5-1
 - Update to 0.3.5.
@@ -86,10 +94,14 @@
 - Update to 0.3.3.
 - Update liboil-0.3.3-gccoptfixes.patch.
 
+* Thu Jun 16 2005 Thomas Vander Stichele <thomas at apestaart dot org> 0.3.2-2
+- Disable parallel make
+
 * Wed May 25 2005 Matthias Saou <http://freshrpms.net/> 0.3.2-1
 - Update to 0.3.2.
 - Change ldconfig calls to be the program.
 - Include new gtk-doc files in the devel package.
+- add dist macro.
 
 * Tue May 24 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-4
 - fix compilation error in FC-4 (bz #158641)


--- liboil-0.3.3-ppc-no-fasm-blocks.patch DELETED ---