dtardon pushed to calligra (master). "Revert "drop libwps support for f23+, libwps-0.4 not (yet) supported" (..more)"

[notifications at fedoraproject.org]

From 0f4c6d2f82934661ffdd6acd19137017ea81629b Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Sat, 6 Jun 2015 21:39:26 +0200
Subject: Revert "drop libwps support for f23+, libwps-0.4 not (yet) supported"

This reverts commit a73e46c2de9b8e04c3bc0691ab35e0d134406bfc.

diff --git a/calligra.spec b/calligra.spec
index 0793c8f..f8b5ff1 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -14,10 +14,6 @@
 %endif
 %define visio 1
 %define wpd 1
-%if 0%{?fedora} < 23
-# rawhide's libwps-0.4 not supported (yet)
-%define wps 1
-%endif
 %endif
 %if 0%{?rhel}
 %ifnarch ppc64
@@ -25,7 +21,6 @@
 %define okular 1
 %define visio 1
 %define wpd 1
-%define wps 1
 %endif
 %endif
 
@@ -92,10 +87,8 @@ BuildRequires: pkgconfig(libodfgen-0.1)
 BuildRequires: pkgconfig(librevenge-0.0)
 BuildRequires: pkgconfig(libwpd-0.10)
 BuildRequires: pkgconfig(libwpg-0.3)
-%if 0%{?wps}
 BuildRequires: pkgconfig(libwps-0.3)
 %endif
-%endif
 BuildRequires: pkgconfig(OpenColorIO)
 BuildRequires: pkgconfig(poppler-qt4)
 BuildRequires: pkgconfig(libpng)
@@ -1243,12 +1236,10 @@ fi
 %{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpd2odt.desktop
 %{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpg2odg.desktop
 %{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpg2svg.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wps2odt.desktop
 %{_kde4_libdir}/kde4/calligra_filter_wpd2odt.so
 %{_kde4_libdir}/kde4/calligra_filter_wpg2odg.so
 %{_kde4_libdir}/kde4/calligra_filter_wpg2svg.so
-%endif
-%if 0%{?wps}
-%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wps2odt.desktop
 %{_kde4_libdir}/kde4/calligra_filter_wps2odt.so
 %endif
 %{_kde4_datadir}/kde4/services/calligra_filter_odt2wiki.desktop
@@ -1310,7 +1301,7 @@ fi
 - Rebuild (poppler-0.33.0)
 
 * Fri May 22 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.4-3
-- drop libwps support for f23+, libwps-0.4 not (yet) supported
+- rebuild (libwps)
 
 * Thu May 07 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.4-2
 - -qtquick subpkg, -kexi: move kexirelationdesignshape here
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?h=master&id=0f4c6d2f82934661ffdd6acd19137017ea81629b