- s/__FUNCTION__/__func__

[packages/diacanvas.git] / diacanvas.spec

diff --git a/diacanvas.spec b/diacanvas.spec
index 9a3f2fc8b1ead9d086426983845a4cc329555836..88e8236cf0a40b641360fe9ef850c532f6e2f32f 100644 (file)
--- a/diacanvas.spec
+++ b/diacanvas.spec
@@ -1,18 +1,19 @@
 
-%include       /usr/lib/rpm/macros.python
 
 %define src_name diacanvas2
 
 Summary:       Library for easely creating diagrams
 Summary(pl):   Biblioteka do prostego tworzenia diagramów
 Name:          diacanvas
-Version:       0.12.0
+Version:       0.14.0
 Release:       1
 License:       GPL
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/diacanvas/%{src_name}-%{version}.tar.gz
-# Source0-md5: 0b98f1a25aab21413a25922d1654ef35
+# Source0-md5: f00a9c023f51ffbaecc03f5f08d0d681
 Patch0:                %{name}-no_check.patch
+Patch1:                %{name}-text-stroke.patch
+Patch2:                %{name}-func.patch
 URL:           http://diacanvas.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -83,8 +84,11 @@ Pliki dla programist
 %prep
 %setup -q -n %{src_name}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+glib-gettextize -f
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -95,14 +99,17 @@ Pliki dla programist
        --enable-python \
        --with-html-dir=%{_gtkdocdir}
 
-%{__make}
+%{__make} \
+       pythondir=%{py_sitedir} \
+       pyexecdir=%{py_sitedir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       pythondir=%{py_sitedir} \
+       pyexecdir=%{py_sitedir}
 
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{name}/*.{la,a}