- fixed auto* regeneration

- added introspection bcond; now builds without it, it seems that g-ir-scanner or annotations are broken

Changed files:
    babl-gir-fix.patch -> 1.1
    babl.spec -> 1.18

diff --git a/babl-gir-fix.patch b/babl-gir-fix.patch
new file mode 100644 (file)
index 0000000..76fba27
--- /dev/null
+++ b/babl-gir-fix.patch
@@ -0,0 +1,25 @@
+From c024c89f95de4a8fa95ba96790dac61768d11a17 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Tue, 10 Jan 2012 16:32:50 +0000
+Subject: gobject-introspection: fix build of the .gir and .typelib files.
+
+---
+diff --git a/babl/Makefile.am b/babl/Makefile.am
+index cefab57..03115a3 100644
+--- a/babl/Makefile.am
++++ b/babl/Makefile.am
+@@ -93,10 +93,10 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+ 
+ if HAVE_INTROSPECTION
+-Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am
++Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am libbabl-@BABL_API_VERSION@.la
+       $(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=$(BABL_API_VERSION) \
+             --add-include-path=$(srcdir) --add-include-path=. \
+-            --library=babl-$(BABL_API_VERSION) \
++            --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \
+             --libtool="$(LIBTOOL)" \
+             --output $@ \
+             -DBABL_IS_BEING_COMPILED \
+--
+cgit v0.9.0.2

diff --git a/babl.spec b/babl.spec
index 5012cdb0d39d88c0079e19013e8c9d188ca15a8e..7fdffbfdd8dc97b1420d60599ab7650f949c28c4 100644 (file)
--- a/babl.spec
+++ b/babl.spec
@@ -1,7 +1,11 @@
 #
 # Conditional build:
-%bcond_without vala    # Vala API
+%bcond_without introspection   # API introspection
+%bcond_without vala            # Vala API
 #
+%if %{without introspection}
+%undefine      with_vala
+%endif
 Summary:       Library for pixel-format agnosticism
 Summary(pl.UTF-8):     Biblioteka niezależności od formatu piksela
 Name:          babl
@@ -12,11 +16,12 @@ Group:              Libraries
 Source0:       ftp://ftp.gimp.org/pub/babl/0.1/%{name}-%{version}.tar.bz2
 # Source0-md5: 9e1542ab5c0b12ea3af076a9a2f02d79
 Patch0:                %{name}-as-needed.patch
+Patch1:                %{name}-gir-fix.patch
 URL:           http://www.gegl.org/babl/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1:1.11
 BuildRequires: elfutils-devel
-BuildRequires: gobject-introspection-devel >= 0.10
+%{?with_introspection:BuildRequires:   gobject-introspection-devel >= 0.10}
 BuildRequires: libtool >= 2:2.2
 %{?with_vala:BuildRequires:    vala}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,14 +78,16 @@ API języka Vala dla biblioteki babl.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+       %{?with_introspection:--enable-introspection} \
        --disable-silent-rules \
        --enable-static \
        %{!?with_vala:--without-vala}
@@ -107,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libbabl-0.1.so.0
 %dir %{_libdir}/babl-0.1
 %attr(755,root,root) %{_libdir}/babl-0.1/*.so
-#%{_libdir}/girepository-1.0/Babl-0.1.typelib
+%{?with_introspection:%{_libdir}/girepository-1.0/Babl-0.1.typelib}
 
 %files devel
 %defattr(644,root,root,755)
@@ -115,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libbabl-0.1.so
 %{_libdir}/libbabl-0.1.la
 %{_includedir}/babl-0.1
-#%{_datadir}/gir-1.0/Babl-0.1.gir
+%{?with_introspection:%{_datadir}/gir-1.0/Babl-0.1.gir}
 %{_pkgconfigdir}/babl.pc
 
 %files static