rpms/liboil/FC-3 liboil-0.3.3-gccoptfixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 liboil.spec, 1.1, 1.2 sources, 1.2, 1.3

Mon Nov 14 09:30:20 UTC 2005

Author: thias

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

Modified Files:
	.cvsignore liboil.spec sources 
Added Files:
	liboil-0.3.3-gccoptfixes.patch 
Log Message:
Sync FC-4 and devel branches, update FC-3 branch, and remove old patches.


liboil-0.3.3-gccoptfixes.patch:

--- NEW FILE liboil-0.3.3-gccoptfixes.patch ---
diff -Naupr liboil-0.3.3.orig/configure liboil-0.3.3/configure
--- liboil-0.3.3.orig/configure	2005-09-30 01:52:47.000000000 +0200
+++ liboil-0.3.3/configure	2005-10-04 13:50:39.000000000 +0200
@@ -2833,7 +2833,7 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
+#CFLAGS="-g"
 echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
@@ -21513,7 +21513,7 @@ fi
 
 
 
-LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir) -O2"
+LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir)"
 
 
 LIBOIL_LIBS="\$(top_builddir)/liboil/liboil-$LIBOIL_MAJORMINOR.la"
diff -Naupr liboil-0.3.3.orig/configure.ac liboil-0.3.3/configure.ac
--- liboil-0.3.3.orig/configure.ac	2005-09-30 01:51:05.000000000 +0200
+++ liboil-0.3.3/configure.ac	2005-10-04 13:51:17.000000000 +0200
@@ -158,7 +158,7 @@ AC_SUBST(SSE2_CFLAGS)
 AC_SUBST(SSE3_CFLAGS)
 AC_SUBST(_3DNOW_CFLAGS)
 
-LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir) -O2"
+LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir)"
 AC_SUBST(LIBOIL_CFLAGS)
 
 LIBOIL_LIBS="\$(top_builddir)/liboil/liboil-$LIBOIL_MAJORMINOR.la"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jan 2005 16:45:29 -0000	1.2
+++ .cvsignore	14 Nov 2005 09:30:18 -0000	1.3
@@ -1 +1 @@
-liboil-0.3.0.tar.gz
+liboil-0.3.5.tar.gz


Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-3/liboil.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liboil.spec	28 Jan 2005 16:45:29 -0000	1.1
+++ liboil.spec	14 Nov 2005 09:30:18 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
-Version: 0.3.0
-Release: 1
+Version: 0.3.5
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-URL: http://www.schleef.org/liboil/
-Source: http://www.schleef.org/liboil/download/liboil-%{version}.tar.gz
+URL: http://liboil.freedesktop.org/
+Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz
+Patch0: liboil-0.3.3-gccoptfixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel, gcc-c++
 
@@ -34,11 +35,16 @@
 
 %prep
 %setup
+%patch0 -p1 -b .gccoptfixes
 
 
 %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
@@ -50,11 +56,9 @@
 %{__rm} -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -69,9 +73,46 @@
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%doc %{_datadir}/gtk-doc/html/liboil/
 
 
 %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.
+
+* Sat Nov 12 2005 Thomas Vander Stichele <thomas at apestaart dot org> 0.3.5-1
+- Update to 0.3.5.
+
+* Wed Oct 12 2005 Matthias Saou <http://freshrpms.net/> 0.3.3-3
+- Add patch to disable unrecognized "-fasm-blocks" gcc option on PPC.
+
+* Tue Oct  4 2005 Matthias Saou <http://freshrpms.net/> 0.3.3-2
+- 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)
+- use buildtime exported CFLAGS instead of making up its own
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.3.0-3
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Fri Jan 28 2005 Matthias Saou <http://freshrpms.net/> 0.3.0-1
 - Update to 0.3.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liboil/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jan 2005 16:45:29 -0000	1.2
+++ sources	14 Nov 2005 09:30:18 -0000	1.3
@@ -1 +1 @@
-db1dc6b0dc1263a99075d5e34725636d  liboil-0.3.0.tar.gz
+f365f0a4cc31b2ff029e37deccb09ff6  liboil-0.3.5.tar.gz


