- updated to 3.0.5

diff --git a/abiword.spec b/abiword.spec
index 1d3f3cab10447832fed67286c3c75dfedbc2d1f3..ec23351c63c776a293444bf96ae5ca51502fc347 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -20,18 +20,16 @@
 Summary:       Multi-platform word processor
 Summary(pl.UTF-8):     Wieloplatformowy procesor tekstu
 Name:          abiword
-Version:       3.0.2
-Release:       8
+Version:       3.0.5
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications/Editors
 Source0:       http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.gz
-# Source0-md5: cda6dd58c747c133b421cc7eb18f5796
+# Source0-md5: a8f218b711450e4ccae43a0522e0e806
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-mht.patch
 Patch2:                %{name}-librevenge.patch
-Patch3:                ecal.patch
-Patch4:                icu.patch
 Patch6:                %{name}-tidy.patch
 Patch7:                %{name}-asio.patch
 URL:           http://www.abisource.com/
@@ -379,8 +377,6 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%patch3 -p1
-%patch4 -p1
 %patch6 -p1
 %patch7 -p1
 
@@ -453,10 +449,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/abiword-%{mver}/templates
 %{_datadir}/abiword-%{mver}/ui
 %{_datadir}/abiword-%{mver}/xsltml
+%{_datadir}/appdata/abiword.appdata.xml
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
 %{_desktopdir}/abiword.desktop
 %{_iconsdir}/hicolor/*/apps/abiword.*
 %{_mandir}/man1/abiword.1*
-%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
 %{_datadir}/telepathy/clients/AbiCollab.client
 
 # These don't add any additional dependencies so there's no reason to split

diff --git a/ecal.patch b/ecal.patch
deleted file mode 100644 (file)
index 80ac2b7..0000000
--- a/ecal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abiword-3.0.2/configure.ac~        2016-10-21 02:38:12.000000000 +0200
-+++ abiword-3.0.2/configure.ac 2019-10-19 23:08:25.758721467 +0200
-@@ -477,7 +477,7 @@ AM_CONDITIONAL([WITH_REDLAND], test "$ab
- AM_CONDITIONAL([HAVE_REDLAND], test "$abi_cv_redland" = "yes")
- 
- 
--evolution_data_server_req='libebook-1.2 >= 3.6 libecal-1.2'
-+evolution_data_server_req='libebook-1.2 >= 3.6 libecal-2.0'
- AC_ARG_WITH([evolution_data_server], 
-       [AS_HELP_STRING([--with-evolution-data-server], [Use Evolution Data Server to get at contact and calendar information])], 
- [

diff --git a/icu.patch b/icu.patch
deleted file mode 100644 (file)
index ba84c3c..0000000
--- a/icu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp~ 2015-04-02 05:09:20.000000000 +0200
-+++ abiword-3.0.2/src/text/ptbl/xp/pd_DocumentRDF.cpp  2019-10-19 23:16:42.823811887 +0200
-@@ -2269,8 +2269,8 @@ PD_RDFEvent::exportToFile( const std::st
-         icalcomponent_set_uid( c,         m_uid.c_str() );
-         icalcomponent_set_location( c,    m_location.c_str() );
-         icalcomponent_set_description( c, m_desc.c_str() );
--        icalcomponent_set_dtstart( c,     icaltime_from_timet( m_dtstart, 0 ) );
--        icalcomponent_set_dtend( c,       icaltime_from_timet( m_dtend, 0 ) );
-+        icalcomponent_set_dtstart( c,     icaltime_from_timet_with_zone ( m_dtstart, 0, NULL) );
-+        icalcomponent_set_dtend( c,       icaltime_from_timet_with_zone( m_dtend, 0, NULL ) );
- 
-         char* data = icalcomponent_as_ical_string( c );
-         std::ofstream oss( filename.c_str() );