- release 18 (by relup.sh)

[packages/abiword.git] / abiword.spec

diff --git a/abiword.spec b/abiword.spec
index 52db328a3de8fa0033e217578eead32305c2ccb3..9c0709d94dbd7930257d6505ae09b832967dd218 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -3,8 +3,8 @@
 # - installed, but unpackaged files
 #         /usr/share/mime-info/abiword.keys
 #
-%bcond_without gda             # libgda support
-%bcond_without goffice         # without plugin-goffice
+%bcond_with    gda             # libgda support
+%bcond_with    goffice         # without plugin-goffice
 %bcond_without gnome           # without GNOME libs
 %bcond_with    gnomevfs        # gnome-vfs support
 %bcond_with    ots             # try build plugin-ots (requires ots >= 0.5.0)
@@ -14,16 +14,20 @@
 Summary:       Multi-platform word processor
 Summary(pl.UTF-8):     Wieloplatformowy procesor tekstu
 Name:          abiword
-Version:       2.8.2
-Release:       5
+Version:       2.8.6
+Release:       18
 Epoch:         1
-License:       GPL
+License:       GPL v2+
 Group:         X11/Applications/Editors
 Source0:       http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.gz
-# Source0-md5: b44ffbebd5bd0f5f98f34dc8c688b4ed
+# Source0-md5: f883b0a7f26229a9c66fd6a1a94381aa
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-mht.patch
 Patch2:                %{name}-libwpd.patch
+Patch3:                %{name}-link.patch
+Patch4:                %{name}-libpng15.patch
+Patch5:                glib.patch
+Patch6:                %{name}-format-security.patch
 URL:           http://www.abisource.com/
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
 BuildRequires: autoconf
@@ -40,7 +44,7 @@ BuildRequires:        gtk+2-devel >= 2:2.12.0
 BuildRequires: gtkmathview-devel >= 0.7.6
 BuildRequires: gucharmap-devel >= 1.7.0
 %if %{with gda}
-BuildRequires: libgda-devel >= 1:1.2.3
+BuildRequires: libgda-devel >= 1:1.2.4-16
 BuildRequires: libgnomedb-devel >= 1:1.2.0
 %else
 Obsoletes:     abiword-plugin-gda
@@ -71,6 +75,7 @@ BuildRequires:        pkgconfig >= 0.9.0
 BuildRequires: popt-devel
 BuildRequires: psiconv-devel >= 0.9.6
 BuildRequires: readline-devel
+BuildRequires: sed >= 4.0
 BuildRequires: t1lib-devel
 BuildRequires: wv-devel >= 1.2.1
 Requires(post,postun): desktop-file-utils
@@ -317,10 +322,14 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 # use generic icon name
-sed -i -e 's|abiword_48.png|abiword.png|' Makefile.am
-sed -i -e 's|abiword_48|abiword|' src/wp/ap/gtk/ap_UnixFrameImpl.cpp
+%{__sed} -i -e 's|abiword_48.png|abiword.png|' Makefile.am
+%{__sed} -i -e 's|abiword_48|abiword|' src/wp/ap/gtk/ap_UnixFrameImpl.cpp
 mv abiword_48.png abiword.png
 
 %build
@@ -351,7 +360,7 @@ rm -rf $RPM_BUILD_ROOT
        icondir=%{_pixmapsdir}
 
 # Remove useless files
-rm -f $RPM_BUILD_ROOT%{_libdir}/abiword-%{mver}/plugins/*.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/abiword-%{mver}/plugins/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT