From 1ebb598a52cfbaec5936275193d81b75fb57cad8883f66247ba2e2182bb39951 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 19 Apr 2013 07:28:01 +0000
Subject: [PATCH] Accepting request 172400 from home:fstrba

- Upgrade to upstream 0.2.1
  - Add MPL 2.0+ as license under which libwpg is distributed
  - Numerous coverity fixes
- Remove integrated patch

OBS-URL: https://build.opensuse.org/request/show/172400
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libwpg?expand=0&rev=4
---
 libwpg-0.2.1.tar.bz2    |  3 ---
 libwpg-0.2.2.tar.xz     |  3 +++
 libwpg-nodatetime.patch | 17 -----------------
 libwpg.changes          |  8 ++++++++
 libwpg.spec             | 11 +++++------
 5 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 libwpg-0.2.1.tar.bz2
 create mode 100644 libwpg-0.2.2.tar.xz
 delete mode 100644 libwpg-nodatetime.patch

diff --git a/libwpg-0.2.1.tar.bz2 b/libwpg-0.2.1.tar.bz2
deleted file mode 100644
index 3da1f95..0000000
--- a/libwpg-0.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0bc8854af5affbcf6f91731d867163b96c4991220f8e3b28b9d49ca3cfba169
-size 335521
diff --git a/libwpg-0.2.2.tar.xz b/libwpg-0.2.2.tar.xz
new file mode 100644
index 0000000..3642e0d
--- /dev/null
+++ b/libwpg-0.2.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b49bfd77b9447534dee0d43bbdc48b4dcb09339605be21c01726243d5069a6cd
+size 301000
diff --git a/libwpg-nodatetime.patch b/libwpg-nodatetime.patch
deleted file mode 100644
index d21057d..0000000
--- a/libwpg-nodatetime.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- docs/doxygen/doxygen.cfg.orig
-+++ docs/doxygen/doxygen.cfg
-@@ -674,7 +674,7 @@ HTML_HEADER            = header.html.in
- # each generated HTML page. If it is left blank doxygen will generate a 
- # standard footer.
- 
--HTML_FOOTER            = footer.html.in
-+#HTML_FOOTER            = footer.html.in
- 
- # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
- # style sheet that is used by each HTML page. It can be used to 
-@@ -1256,3 +1256,5 @@ DOT_CLEANUP            = YES
- # used. If set to NO the values of all tags below this one will be ignored.
- 
- SEARCHENGINE           = NO
-+
-+HTML_TIMESTAMP         = NO
diff --git a/libwpg.changes b/libwpg.changes
index b0d1f4f..7f7925b 100644
--- a/libwpg.changes
+++ b/libwpg.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr 19 07:07:14 UTC 2013 - fridrich.strba@suse.com
+
+- Upgrade to upstream 0.2.1
+  - Add MPL 2.0+ as license under which libwpg is distributed
+  - Numerous coverity fixes
+- Remove integrated patch
+
 -------------------------------------------------------------------
 Tue Apr 16 07:00:09 UTC 2013 - mmeister@suse.com
 
diff --git a/libwpg.spec b/libwpg.spec
index 238bf41..eccd559 100644
--- a/libwpg.spec
+++ b/libwpg.spec
@@ -27,15 +27,15 @@ BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  libwpd-devel >= 0.9.0
 BuildRequires:  pkgconfig
+BuildRequires:  xz
 Summary:        Library to read and parse graphics in WordPerfect Graphics format
-License:        LGPL-2.1+
+License:        LGPL-2.1+ and MPL-2.0+
 Group:          Productivity/Publishing/Word
-Version:        0.2.1
+Version:        0.2.2
 Release:        0
 Url:            http://libwpg.sourceforge.net/
-Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
+Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch0:         libwpg-nodatetime.patch
 
 %description
 libwpg is a C++ library to read and parse graphics in WPG (WordPerfect
@@ -88,7 +88,6 @@ Tools to work with graphics in WPG (WordPerfect Graphics) format.
 
 %prep
 %setup -q
-%patch0
 
 %build
 export CXXFLAGS="%optflags -fvisibility-inlines-hidden"
@@ -100,7 +99,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT%_libdir/*.la
 # documentation
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
-cp -p AUTHORS COPYING ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}
+cp -p AUTHORS COPYING.LGPL COPYING.MPL ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %post -n %libname -p /sbin/ldconfig