Author: qboosh Date: Wed Apr 18 18:49:27 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- added introspection bcond (requires babl built with introspection first)
- added introspection patch to fix Gegl API version in automake suite
- package locales
---- Files affected:
packages/gegl:
gegl.spec (1.34 -> 1.35) , gegl-introspection.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gegl/gegl.spec
diff -u packages/gegl/gegl.spec:1.34 packages/gegl/gegl.spec:1.35
--- packages/gegl/gegl.spec:1.34 Wed Apr 18 20:07:09 2012
+++ packages/gegl/gegl.spec Wed Apr 18 20:49:22 2012
@@ -1,11 +1,12 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_with mmx # use MMX instructions
-%bcond_with sse # use SSE instructions
-%bcond_without doc # apidocs
+%bcond_with mmx # use MMX instructions
+%bcond_with sse # use SSE instructions
+%bcond_without doc # apidocs
+%bcond_without introspection # API introspection
# reenable when new babl will arrive that actually is able to build
-%bcond_with vala # Vala API
+%bcond_with vala # Vala API
#
%ifarch %{x8664} athlon pentium3 pentium4
%define with_mmx 1
@@ -13,6 +14,9 @@
%ifarch %{x8664} pentium3 pentium4
%define with_sse 1
%endif
+%if %{without introspection}
+%undefine with_vala
+%endif
Summary: Generic image processing library
Summary(pl.UTF-8): Ogólna biblioteka przetwarzania obrazu
Name: gegl
@@ -26,6 +30,7 @@
Patch1: %{name}-ffmpeg.patch
Patch2: %{name}-ruby1.9.patch
Patch3: %{name}-build.patch
+Patch4: %{name}-introspection.patch
URL: http://www.gegl.org/
BuildRequires: OpenEXR-devel
BuildRequires: SDL-devel
@@ -34,15 +39,17 @@
BuildRequires: autoconf >= 2.54
BuildRequires: automake >= 1:1.11
BuildRequires: babl-devel >= 0.1.10
+%{?with_introspection:BuildRequires: /usr/share/gir-1.0/Babl-0.1.gir}
BuildRequires: cairo-devel
BuildRequires: enscript
BuildRequires: exiv2-devel
BuildRequires: ffmpeg-devel >= 0.8
BuildRequires: gdk-pixbuf2-devel >= 2.18.0
BuildRequires: glib2-devel >= 1:2.28.0
-BuildRequires: gobject-introspection-devel >= 0.10.0
+%{?with_introspection:BuildRequires: gobject-introspection-devel >= 0.10.0}
BuildRequires: graphviz
BuildRequires: gtk-doc >= 1.0
+BuildRequires: intltool >= 0.40.1
BuildRequires: jasper-devel >= 1.900.1
BuildRequires: lensfun-devel >= 0.2.5
BuildRequires: libjpeg-devel
@@ -140,6 +147,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
@@ -150,11 +158,12 @@
%configure \
CPPFLAGS="%{rpmcppflags} -I/usr/include/umfpack" \
--enable-docs%{!?with_doc:=no} \
+ %{?with_introspection:--enable-introspection} \
%{!?with_mmx:--disable-mmx} \
%{!?with_sse:--disable-sse} \
- --with%{!?with_vala:out}-vala \
--disable-silent-rules \
- --enable-static
+ --enable-static \
+ --with%{!?with_vala:out}-vala
%{__make}
%install
@@ -166,19 +175,21 @@
%{__rm} $RPM_BUILD_ROOT%{_libdir}/gegl-0.2/*.{a,la}
+%find_lang %{name}-0.2
+
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
+%files -f %{name}-0.2.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/gegl
%attr(755,root,root) %{_libdir}/libgegl-0.2.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgegl-0.2.so.0
-#%{_libdir}/girepository-1.0/Gegl-0.2.typelib
+%{?with_introspection:%{_libdir}/girepository-1.0/Gegl-0.2.typelib}
%dir %{_libdir}/gegl-0.2
%attr(755,root,root) %{_libdir}/gegl-0.2/*.so
@@ -187,7 +198,7 @@
%attr(755,root,root) %{_libdir}/libgegl-0.2.so
%{_libdir}/libgegl-0.2.la
%{_includedir}/gegl-0.2
-#%{_datadir}/gir-1.0/Gegl-0.2.gir
+%{?with_introspection:%{_datadir}/gir-1.0/Gegl-0.2.gir}
%{_pkgconfigdir}/gegl-0.2.pc
%files static
@@ -212,6 +223,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.35 2012/04/18 18:49:22 qboosh
+- added introspection bcond (requires babl built with introspection first)
+- added introspection patch to fix Gegl API version in automake suite
+- package locales
+
Revision 1.34 2012/04/18 18:07:09 wrobell
- updated file list
================================================================
Index: packages/gegl/gegl-introspection.patch
diff -u /dev/null packages/gegl/gegl-introspection.patch:1.1
--- /dev/null Wed Apr 18 20:49:27 2012
+++ packages/gegl/gegl-introspection.patch Wed Apr 18 20:49:22 2012
@@ -0,0 +1,17 @@
+--- gegl-0.2.0/gegl/Makefile.am.orig 2012-03-25 23:30:17.000000000 +0200
++++ gegl-0.2.0/gegl/Makefile.am 2012-04-18 20:03:57.989734708 +0200
+@@ -118,10 +118,10 @@
+ INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
+
+ Gegl-@[email protected]: libgegl-@[email protected] Makefile
+-Gegl_0_1_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
+-Gegl_0_1_gir_CFLAGS = $(INCLUDES)
+-Gegl_0_1_gir_LIBS = libgegl-@[email protected]
+-Gegl_0_1_gir_FILES = $(introspection_sources)
++Gegl_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
++Gegl_0_2_gir_CFLAGS = $(INCLUDES)
++Gegl_0_2_gir_LIBS = libgegl-@[email protected]
++Gegl_0_2_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += Gegl-@[email protected]
+
+ girdir = $(datadir)/gir-1.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/gegl/gegl.spec?r1=1.34&r2=1.35
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
