- updated to 0.1.12

- removed outdated gir-fix patch (introspection support has been dropped)

diff --git a/babl-gir-fix.patch b/babl-gir-fix.patch
deleted file mode 100644 (file)
index 76fba27..0000000
--- a/babl-gir-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 d9f1310c913301dcc22618b1339db7b2babc8fab..99c7421ae5f339cc152a5acccf7cc03678b262ec 100644 (file)
--- a/babl.spec
+++ b/babl.spec
@@ -1,28 +1,21 @@
 #
 # Conditional build:
-%bcond_with    introspection   # API introspection
-%bcond_with    vala            # Vala API
+%bcond_without static_libs     # static library
 #
-%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
-Version:       0.1.10
-Release:       2
+Version:       0.1.12
+Release:       1
 License:       LGPL v3+
 Group:         Libraries
 Source0:       http://ftp.gimp.org/pub/babl/0.1/%{name}-%{version}.tar.bz2
-# Source0-md5: 9e1542ab5c0b12ea3af076a9a2f02d79
+# Source0-md5: 50c8d12cdf5b3991590fa6cba16218a0
 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
-%{?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)
 
 %description
@@ -77,7 +70,6 @@ API języka Vala dla biblioteki babl.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -86,10 +78,8 @@ API języka Vala dla biblioteki babl.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{?with_introspection:--enable-introspection} \
        --disable-silent-rules \
-       --enable-static \
-       %{!?with_vala:--without-vala}
+       %{?with_static_libs:--enable-static}
 %{__make}
 
 %install
@@ -98,7 +88,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/babl-0.1/*.{la,a}
+# dlopened modules
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/babl-0.1/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/babl-0.1/*.a
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,7 +107,6 @@ 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
-%{?with_introspection:%{_libdir}/girepository-1.0/Babl-0.1.typelib}
 
 %files devel
 %defattr(644,root,root,755)
@@ -121,14 +114,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libbabl-0.1.so
 %{_libdir}/libbabl-0.1.la
 %{_includedir}/babl-0.1
-%{?with_introspection:%{_datadir}/gir-1.0/Babl-0.1.gir}
 %{_pkgconfigdir}/babl.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libbabl-0.1.a
+%endif
 
-%if %{with vala}
+%if 0
 %files -n vala-babl
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/babl-0.1.vapi