- up to 0.3.91

- BR xz and tar with xz support
- fix Caribou-1.0.typelib (soname.patch)
- add gtk modules

Changed files:
    caribou.spec -> 1.4
    soname.patch -> 1.1

diff --git a/caribou.spec b/caribou.spec
index ee695f28d47ec44798575aa9578549fb7b983307..52cf96c7a2bc18c602c19e38929a5026de8b32fd 100644 (file)
--- a/caribou.spec
+++ b/caribou.spec
@@ -1,12 +1,13 @@
 Summary:       On-screen keyboard
 Summary(pl.UTF-8):     Klawiatura ekranowa
 Name:          caribou
-Version:       0.3.5
+Version:       0.3.91
 Release:       1
 License:       LGPL v2+
 Group:         X11/Applications/Accessibility
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/caribou/0.3/%{name}-%{version}.tar.xz
-# Source0-md5: 72069b6941d1af349ead77337f8d1fae
+# Source0-md5: c91c7b722cccf66745dd6befeeb8aace
+Patch0:                soname.patch
 URL:           http://live.gnome.org/Caribou
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1.11
@@ -22,18 +23,20 @@ BuildRequires:      libxklavier-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: python >= 1:2.4
-BuildRequires: python-pygobject-devel >= 2.28.0
+BuildRequires: python-pygobject3-devel >= 2.90.3
 BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: tar >= 1:1.22
 BuildRequires: vala
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: xz
 Requires(post,postun): glib2 >= 1:2.26.0
 Requires:      clutter >= 1.6.0
 Requires:      gtk+2
 Requires:      gtk+3
 Requires:      python-modules
 Requires:      python-pyatspi >= 2.0.0
-Requires:      python-pygobject >= 2.28.0
+Requires:      python-pygobject3 >= 2.90.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,8 +51,10 @@ dla użytkowników ekranów dotykowych oraz tabletów.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
@@ -86,8 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/antler-keyboard
 %attr(755,root,root) %{_libdir}/libcaribou.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcaribou.so.0
-%attr(755,root,root) %ghost %{_libdir}/gtk-2.0/modules/libcaribou-gtk-module.so
-%attr(755,root,root) %ghost %{_libdir}/gtk-3.0/modules/libcaribou-gtk-module.so
+%attr(755,root,root) %{_libdir}/gtk-2.0/modules/libcaribou-gtk-module.so
+%attr(755,root,root) %{_libdir}/gtk-3.0/modules/libcaribou-gtk-module.so
 %{_datadir}/antler
 %{_datadir}/caribou
 %{_datadir}/dbus-1/services/org.gnome.Caribou.Antler.service

diff --git a/soname.patch b/soname.patch
new file mode 100644 (file)
index 0000000..7b6e169
--- /dev/null
+++ b/soname.patch
@@ -0,0 +1,11 @@
+--- caribou-0.3.91/libcaribou/Makefile.am.wiget        2011-09-07 10:20:37.606437969 +0200
++++ caribou-0.3.91/libcaribou/Makefile.am      2011-09-07 10:20:49.792646536 +0200
+@@ -63,7 +63,7 @@ Caribou-1.0.gir: _Caribou-1.0.gir
+       $(top_srcdir)/tools/fix_gir.py $< > $@
+ 
+ Caribou-1.0.typelib: Caribou-1.0.gir
+-      @INTROSPECTION_COMPILER@ --shared-library=libcaribou -o $@ $^
++      @INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^
+ 
+ Caribou-1.0.gir caribou-internals-1.0.vapi caribou-1.0.vapi: libcaribou.la
+