Release 29 (by relup.sh)

[packages/tomoe.git] / tomoe.spec

diff --git a/tomoe.spec b/tomoe.spec
index a5a2a296df6f6c263cf5988ff4f29e323d80bf51..68934bf50c5970d017457c35d60ee5bc75f52eaf 100644 (file)
--- a/tomoe.spec
+++ b/tomoe.spec
@@ -8,7 +8,7 @@ Summary:        Handwritten input system for Japanese and Chinese
 Summary(pl.UTF-8):     System wprowadzania pisma ręcznego dla japońskiego i chińskiego
 Name:          tomoe
 Version:       0.6.0
-Release:       8
+Release:       29
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/tomoe/%{name}-%{version}.tar.gz
@@ -18,11 +18,14 @@ Patch1:             %{name}-bz502662.patch
 Patch2:                %{name}-svn-libs.patch
 Patch3:                %{name}-glib2.32.patch
 Patch4:                %{name}-ruby.patch
+Patch5:                %{name}-format.patch
+Patch6:                am.patch
+Patch7:                %{name}-glibc.patch
 URL:           http://tomoe.sourceforge.jp/
 BuildRequires: apr-util-devel
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.4.0
 BuildRequires: gtk-doc >= 1.4
 BuildRequires: hyperestraier-devel
@@ -38,7 +41,7 @@ BuildRequires:        subversion-devel
 %if %{with python}
 BuildRequires: python-devel
 BuildRequires: python-pygobject-devel
-BuildRequires: python-pygtk-devel
+BuildRequires: python-pygtk-devel >= 2:2.0
 %endif
 %if %{with ruby}
 BuildRequires: ruby-glib2-devel
@@ -128,6 +131,20 @@ Tomoe bindings for Python.
 %description -n python-tomoe -l pl.UTF-8
 Wiązania tomoe dla Pythona.
 
+%package -n python-tomoe-devel
+Summary:       Development files for Tomoe Python binding
+Summary(pl.UTF-8):     Pliki programistyczne wiązań Pythona do Tomoe
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      python-tomoe = %{version}-%{release}
+Requires:      python-pygobject-devel
+
+%description -n python-tomoe-devel
+Development files for Tomoe Python binding.
+
+%description -n python-tomoe-devel -l pl.UTF-8
+Pliki programistyczne wiązań Pythona do Tomoe.
+
 %package -n ruby-tomoe
 Summary:       Tomoe bindings for Ruby
 Summary(pl.UTF-8):     Wiązania tomoe dla języka Ruby
@@ -161,11 +178,15 @@ Plik nagłówkowy biblioteki Ruby/Tomoe.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1 -b .orig
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' data/xml2est.rb
 
 %build
+%{__gtkdocize}
 %{__libtoolize}
 %{__aclocal} -I macros
 %{__autoconf}
@@ -174,6 +195,8 @@ export CFLAGS="%{rpmcflags} -I/usr/include/apr-util"
 %configure \
        UNZIP=/usr/bin/unzip \
        %{!?with_static_libs:--disable-static} \
+       %{?with_ruby:--with-ruby-bindingdir=%{ruby_vendorarchdir}} \
+       %{?with_ruby:--with-ruby-libdir=%{ruby_vendorlibdir}} \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir} \
        --with-svn-lib=%{_libdir}
@@ -190,7 +213,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/tomoe/dict
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/tomoe/module/{dict,recognizer}/*.{a,la}
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/tomoe.{a,la}
-%{?with_ruby:%{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/tomoe.{a,la}}
+%{?with_ruby:%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/tomoe.{a,la}}
 
 %if %{without ruby}
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/tomoe/xml2est.rb
@@ -253,7 +276,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-tomoe
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/tomoe.so
-%{_datadir}/tomoe/python
+
+%files -n python-tomoe-devel
+%defattr(644,root,root,755)
+%dir %{_datadir}/tomoe/python
+%{_datadir}/tomoe/python/tomoe.defs
 %{_pkgconfigdir}/pytomoe.pc
 %endif
 
@@ -261,10 +288,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-tomoe
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_datadir}/tomoe/xml2est.rb
-%attr(755,root,root) %{ruby_sitearchdir}/tomoe.so
-%{ruby_sitelibdir}/tomoe.rb
+%attr(755,root,root) %{ruby_vendorarchdir}/tomoe.so
+%{ruby_vendorlibdir}/tomoe.rb
 
 %files -n ruby-tomoe-devel
 %defattr(644,root,root,755)
-%{ruby_sitearchdir}/rbtomoe.h
+%{ruby_vendorarchdir}/rbtomoe.h
 %endif