From 13ae4c927f3ceecd84ef4bc7fab07ff5a8054ec3 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 25 Apr 2013 17:37:45 +0200 Subject: [PATCH] - updated to 0.2.8 - removed obsolete werror patch --- libwps-werror.patch | 27 --------------------------- libwps.spec | 25 +++++++++++++++---------- 2 files changed, 15 insertions(+), 37 deletions(-) delete mode 100644 libwps-werror.patch diff --git a/libwps-werror.patch b/libwps-werror.patch deleted file mode 100644 index 03dc17a..0000000 --- a/libwps-werror.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- libwps-0.2.0/configure.in~ 2008-04-14 09:55:28.000000000 +0200 -+++ libwps-0.2.0/configure.in 2011-09-12 09:36:33.511331605 +0200 -@@ -202,8 +202,8 @@ - - else - if test x"$GCC" = xyes; then -- CFLAGS="$CFLAGS -Wall -Werror -pedantic" -- CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic" -+ CFLAGS="$CFLAGS -Wall -pedantic" -+ CXXFLAGS="$CXXFLAGS -Wall -pedantic" - fi - fi - ---- libwps-0.2.0/src/lib/WPS4.cpp~ 2010-06-16 00:19:39.000000000 +0200 -+++ libwps-0.2.0/src/lib/WPS4.cpp 2011-09-12 09:39:25.561840062 +0200 -@@ -156,10 +156,7 @@ - } - input->seek(page_offset, WPX_SEEK_SET); - -- uint32_t fcFirst; /* Byte number of first character covered by this page -- of formatting information */ -- -- fcFirst = readU32(input); -+ readU32(input); - - int first_fod = FODs->size(); - diff --git a/libwps.spec b/libwps.spec index 8c9caac..c9a941f 100644 --- a/libwps.spec +++ b/libwps.spec @@ -1,21 +1,23 @@ Summary: A library for importing MS Works documents Summary(pl.UTF-8): Biblioteka importu dokumentów MS Works Name: libwps -Version: 0.2.0 -Release: 5 +Version: 0.2.8 +Release: 1 License: LGPL v2+ Group: Libraries -Source0: http://downloads.sourceforge.net/libwps/%{name}-%{version}.tar.gz -# Source0-md5: b569376fb0aefc5284b10a695bd2daa6 -Patch0: %{name}-werror.patch +Source0: http://downloads.sourceforge.net/libwps/%{name}-%{version}.tar.xz +# Source0-md5: 0a7b754a3c9462c4adfb42811e6754dd URL: http://libwps.sourceforge.net/ -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: autoconf >= 0.65 +BuildRequires: automake >= 1:1.11 +BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: libwpd-devel >= 0.9 -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 1:0.20 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz Requires: libwpd >= 0.9 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -73,14 +75,15 @@ formatów. Obecnie obsługiwane: html, raw, tekst. %prep %setup -q -%patch0 -p1 %build %{__libtoolize} %{__aclocal} %{__automake} +%{__autoheader} %{__autoconf} %configure \ + --disable-silent-rules \ --enable-static %{__make} @@ -91,6 +94,8 @@ rm -rf $RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la +# packaged as %doc in -devel +%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/html %clean rm -rf $RPM_BUILD_ROOT @@ -100,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc CHANGES CREDITS HACKING README +%doc CREDITS ChangeLog HACKING NEWS README %attr(755,root,root) %{_libdir}/libwps-0.2.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libwps-0.2.so.2 -- 2.44.0