rpms/gegl/F-10 gegl.spec,1.10,1.11

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gegl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2644

Modified Files:
	gegl.spec 
Log Message:
use the same timestamps for certain documentation files on all architectures to avoid multi-lib conflicts (#481404)
consolidate spec files between OS releases
reenable building documentation on ppc64
explicitly list more build requirements and/or versions to catch eventual problems during future builds



Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/F-10/gegl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gegl.spec	16 Jan 2009 05:28:54 -0000	1.10
+++ gegl.spec	30 Jan 2009 09:34:42 -0000	1.11
@@ -1,17 +1,34 @@
 Summary:	A graph based image processing framework
 Name:		gegl
 Version:	0.0.22
-Release:	1%{?dist}
+Release:	2%{?dist}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gegl.org/
 Source0:	ftp://ftp.gtk.org/pub/gegl/0.0/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	babl-devel gtk2-devel ruby
-BuildRequires:	libpng-devel libjpeg-devel librsvg2-devel libopenraw-devel
-BuildRequires:	perl-devel SDL-devel OpenEXR-devel lua-devel
-BuildRequires:	asciidoc enscript w3m graphviz pkgconfig
+BuildRequires:	asciidoc
+BuildRequires:	babl-devel >= 0.0.22
+BuildRequires:  cairo-devel
+BuildRequires:  enscript
+BuildRequires:  glib2-devel >= 2.16.1
+BuildRequires:  graphviz
+BuildRequires:  gtk2-devel >= 2.8.6
+BuildRequires:  libjpeg-devel
+BuildRequires:  libopenraw-devel >= 0.0.5
+BuildRequires:	libpng-devel
+BuildRequires:  librsvg2-devel >= 2.14.0
+BuildRequires:	libspiro-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  lua-devel >= 5.1.0
+BuildRequires:  OpenEXR-devel
+BuildRequires:  pango-devel
+BuildRequires:	perl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  ruby
+BuildRequires:  SDL-devel
+BuildRequires:  w3m
 
 %description
 GEGL (Generic Graphics Library) is a graph based image processing framework. 
@@ -34,11 +51,21 @@
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
 
 %build
-%ifnarch ppc64
-%configure --disable-static --enable-workshop
-%else
-%configure --disable-static --enable-workshop --disable-docs
-%endif
+%configure \
+    --with-cairo \
+    --with-graphviz \
+    --with-gtk --with-gdk-pixbuf \
+    --with-libjpeg \
+    --with-libopenraw \
+    --with-libpng \
+    --with-librsvg \
+    --with-libspiro \
+    --with-libv4l \
+    --with-lua \
+    --with-openexr \
+    --with-pango --with-pangocairo \
+    --with-sdl \
+    --disable-static --enable-workshop
 make %{?_smp_mflags}
 										
 %install
@@ -47,6 +74,11 @@
 
 rm -f %{buildroot}%{_libdir}/*.la
 
+# fix timestamps of generated files
+for f in %{_datadir}/gtk-doc/html/gegl/operations.html; do
+    touch -m -r ChangeLog "%{buildroot}/$f"
+done
+
 %check
 make check
 
@@ -66,15 +98,21 @@
 
 %files devel
 %defattr(-, root, root, -)
+%doc %{_datadir}/gtk-doc/html/gegl/
 %{_includedir}/gegl-0.0/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
-%ifnarch ppc64
-%doc %{_datadir}/gtk-doc/html/gegl/
-%endif
 
 %changelog
-* Fri Jan 16 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
+* Thu Jan 29 2009 Nils Philippsen - 0.0.22-2
+- use the same timestamps for certain documentation files on all architectures
+  to avoid multi-lib conflicts (#481404)
+- consolidate spec files between OS releases
+- reenable building documentation on ppc64
+- explicitly list more build requirements and/or versions to catch eventual
+  problems during future builds
+
+* Tue Jan 13 2009 Deji Akingunola <dakingun at gmail.com> - 0.0.22-1
 - Update to version 0.0.22
 
 * Tue Oct 07 2008 Deji Akingunola <dakingun at gmail.com> - 0.0.20-1