- up to 0.7.3

- fix gir build problem
- move python and js loaders to subpackages (to lower main package dependency)

Changed files:
    gir.patch -> 1.1
    libpeas.spec -> 1.4

diff --git a/gir.patch b/gir.patch
new file mode 100644 (file)
index 0000000..0e3b7ff
--- /dev/null
+++ b/gir.patch
@@ -0,0 +1,11 @@
+--- libpeas-0.7.3/libpeas-gtk/Makefile.am.wiget        2011-03-03 21:00:59.937203008 +0100
++++ libpeas-0.7.3/libpeas-gtk/Makefile.am      2011-02-20 19:22:23.000000000 +0100
+@@ -58,7 +58,7 @@ if HAVE_INTROSPECTION
+   PeasGtk-1.0.gir: libpeas-gtk-1.0.la
+   PeasGtk_1_0_gir_INCLUDES = GObject-2.0 $(GTK_TYPELIB)
+   PeasGtk_1_0_gir_CFLAGS = $(PEAS_CFLAGS) $(PEAS_GTK_CFLAGS) -I$(top_srcdir)
+-  PeasGtk_1_0_gir_LIBS = libpeas-gtk-1.0.la
++  PeasGtk_1_0_gir_LIBS = libpeas-gtk-1.0.la $(top_builddir)/libpeas/libpeas-1.0.la
+   PeasGtk_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+   PeasGtk_1_0_gir_EXPORT_PACKAGES = libpeas-gtk-1.0
+   PeasGtk_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libpeas/Peas-1.0.gir

diff --git a/libpeas.spec b/libpeas.spec
index e758d476d4e278c2f4d307f1365e3f9913d1697a..90eb86fc9b18ba60b3d414f42c9fea526d08a073 100644 (file)
--- a/libpeas.spec
+++ b/libpeas.spec
@@ -1,7 +1,3 @@
-#
-# TODO:
-#  - subpackages for python and seed loaders
-#
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
 %bcond_without static_libs     # don't build static libraries
@@ -9,12 +5,13 @@
 Summary:       GObject Plugin System
 Summary(pl.UTF-8):     System wtyczek GObject
 Name:          libpeas
-Version:       0.7.1
-Release:       0.1
+Version:       0.7.3
+Release:       1
 License:       LGPL v2
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libpeas/0.7/%{name}-%{version}.tar.gz
-# Source0-md5: 3038e8f8876d87b85dc5e35844935231
+# Source0-md5: 58456ddf05c3dc5b8a8dc68a68f88356
+Patch0:                gir.patch
 URL:           http://live.gnome.org/Libpeas
 BuildRequires: autoconf >= 2.63.2
 BuildRequires: automake >= 1.11
@@ -40,6 +37,22 @@ has a set of features including, but not limited to:
  - on demand (lazy) programming language support for C, Python and JS
  - simplicity of the API 
 
+%package loader-python
+Summary:       Python loader for libpeas library
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+Python loader for libpeas library.
+
+%package loader-seed
+Summary:       JavaScript loader for libpeas library
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+JavaScript loader for libpeas library.
+
 %package devel
 Summary:       Header files for libpeas library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libpeas
@@ -120,6 +133,10 @@ Dokumentacja API biblioteki libpeas.
 Summary:       Demo application for libpeas
 Summary(pl.UTF-8): Aplikacja demonstracyjna libpeas
 Group:         Application
+Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-gtk = %{version}-%{release}
+Requires:      %{name}-loader-python = %{version}-%{release}
+Requires:      %{name}-loader-seed = %{version}-%{release}
 
 %description demo
 Demo application for libpeas.
@@ -129,10 +146,17 @@ Aplikacja demonstracyjna libpeas.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        %{__enable_disable static_libs static} \
+       %{__enable_disable apidocs gtk-doc} \
        --disable-silent-rules
 %{__make}
 
@@ -168,7 +192,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libpeas-1.0.so.0
 %{_libdir}/girepository-1.0/Peas-1.0.typelib
 %{_libdir}/libpeas-1.0/loaders/libcloader.so
+
+%files loader-python
+%defattr(644,root,root,755)
 %{_libdir}/libpeas-1.0/loaders/libpythonloader.so
+
+%files loader-seed
+%defattr(644,root,root,755)
 %{_libdir}/libpeas-1.0/loaders/libseedloader.so
 
 %files devel
@@ -218,7 +248,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/peas-demo/plugins/seedhello/seedhello.js
 %{_libdir}/peas-demo/plugins/seedhello/seedhello.plugin
 
-
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)