This commit was manufactured by cvs2git to create tag 'auto-ac-liboil-

0_3_8-2'.

Sprout from master 2005-03-25 10:47:40 UTC havner <havner@pld-linux.org> '- next, hopully last part'
Cherrypick from unlabeled-1.1.2 2006-05-15 21:14:21 UTC Jan Rękorajski <baggins@pld-linux.org> '- merged from HEAD':
    liboil-opt.patch -> 1.1.2.1
Cherrypick from unlabeled-1.11.2 2006-05-16 14:52:05 UTC Jan Rękorajski <baggins@pld-linux.org> '- release 2':
    liboil.spec -> 1.11.2.2

diff --git a/liboil-opt.patch b/liboil-opt.patch
index 2bf077a91eb7bc391eea7d97656db0c7938dd4a4..9c5f4cc064cfb4a0e4a030d68241f2de49527f41 100644 (file)
--- a/liboil-opt.patch
+++ b/liboil-opt.patch
@@ -1,29 +1,19 @@
---- liboil-0.3.1/configure.ac.orig     2005-03-17 19:44:51.000000000 +0100
-+++ liboil-0.3.1/configure.ac  2005-03-21 20:53:43.000000000 +0100
-@@ -147,6 +147,7 @@
- AC_CHECK_HEADER(ieee754.h,
-   AC_DEFINE(HAVE_IEEE754_H, 1, [Define if ieee754.h exists]))
+--- liboil-0.3.3/configure.ac.orig     2005-09-30 01:51:05.000000000 +0200
++++ liboil-0.3.3/configure.ac  2005-10-06 07:25:22.884978056 +0200
+@@ -128,6 +128,7 @@
+ LIBM="-lm"
+ AC_SUBST(LIBM)
  
 +LIBOIL_CFLAGS="$CFLAGS"
  AS_COMPILER_FLAG(-Wall, LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wall")
  if test "x$LIBOIL_CVS" = "xyes"
  then
-@@ -163,7 +164,7 @@
-     true)
- fi
+@@ -158,7 +159,7 @@
+ AC_SUBST(SSE3_CFLAGS)
+ AC_SUBST(_3DNOW_CFLAGS)
  
--LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir) -O2"
-+LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir)"
+-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"
-@@ -172,9 +173,6 @@
- pkgconfigdir="\$(libdir)/pkgconfig"
- AC_SUBST(pkgconfigdir)
- 
--#CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9*]//g'`
--CFLAGS="-g"
--
- AC_CONFIG_FILES([
- Makefile 
- doc/Makefile

diff --git a/liboil.spec b/liboil.spec
index e742eda7258aa5b289594010ef3439fe7f22012f..a3714c7bd46aefa6c223d31ebdfbd8670e8599ba 100644 (file)
--- a/liboil.spec
+++ b/liboil.spec
@@ -1,28 +1,36 @@
 #
 # Conditional build:
+%bcond_without altivec # without Altivec support (on ppc)
 %bcond_without tests   # don't perform "make check"
 #
+%ifarch sparc
+%undefine      with_tests
+%endif
+#
 Summary:       Library of Optimized Inner Loops
 Summary(pl):   Biblioteka zoptymalizowanych wewnêtrznych pêtli
 Name:          liboil
-Version:       0.3.1
-Release:       3
+Version:       0.3.8
+Release:       2
 License:       BSD
 Group:         Libraries
-Source0:       http://www.schleef.org/liboil/download/%{name}-%{version}.tar.gz
-# Source0-md5: de49ae5fb8b793ed5cd72d38dc6779ae
+Source0:       http://liboil.freedesktop.org/download/%{name}-%{version}.tar.gz
+# Source0-md5: a402c4af2603c8fb69b365af0b8ec775
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-no_altivec.patch
-URL:           http://www.schleef.org/liboil/
+URL:           http://liboil.freedesktop.org/wiki/
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake >= 1.6
 BuildRequires: glib2-devel >= 2.0
-BuildRequires: gtk-doc >= 1.0
+BuildRequires: gtk-doc-automake
 BuildRequires: libtool
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.98
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags       -fomit-frame-pointer
+# CFLAGS_ALTIVEC are set, but not used
+%define                specflags_ppc   -maltivec
 
 %description
 Liboil is a library of simple functions that are optimized for various
@@ -79,7 +87,7 @@ Statyczna biblioteka liboil.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%{!?with_altivec:%patch1 -p1}
 
 %build
 %{__libtoolize}
@@ -87,8 +95,10 @@ Statyczna biblioteka liboil.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
 %configure \
        --with-html-dir=%{_gtkdocdir}
+
 %{__make}
 
 %{?with_tests:%{__make} check}