From 38f0ca7c371d3864a514c625620c4f799f29a124af0a87222a497aa0456ed249 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 6 Apr 2008 01:13:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libwpd?expand=0&rev=7 --- libwpd-0.8.12.tar.bz2 | 3 - libwpd-0.8.14-install-docs.patch | 75 ++++++++++++++ libwpd-0.8.14.tar.bz2 | 3 + libwpd.changes | 44 ++++++++ libwpd.spec | 169 +++++++++++++++++++++++-------- 5 files changed, 248 insertions(+), 46 deletions(-) delete mode 100644 libwpd-0.8.12.tar.bz2 create mode 100644 libwpd-0.8.14-install-docs.patch create mode 100644 libwpd-0.8.14.tar.bz2 diff --git a/libwpd-0.8.12.tar.bz2 b/libwpd-0.8.12.tar.bz2 deleted file mode 100644 index 10cab89..0000000 --- a/libwpd-0.8.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae758cc42d0d6c4272ae241bb6ae105014225f85f6923d4c99c98327ceacf496 -size 421931 diff --git a/libwpd-0.8.14-install-docs.patch b/libwpd-0.8.14-install-docs.patch new file mode 100644 index 0000000..0ef65c9 --- /dev/null +++ b/libwpd-0.8.14-install-docs.patch @@ -0,0 +1,75 @@ +Don't install executable documentation. +Respect --docdir configure option +--- + Makefile.am | 18 +++++++++--------- + docs/Makefile.am | 10 +++++----- + docs/doxygen/Makefile.am | 10 +++++----- + 3 files changed, 19 insertions(+), 19 deletions(-) + +--- Makefile.am.orig ++++ Makefile.am +@@ -38,14 +38,14 @@ check: all + + if WITH_LIBWPD_DOCS + install-data-local: +- mkdir -p $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@ +- $(INSTALL) $(srcdir)/CHANGES $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ +- $(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ +- $(INSTALL) $(srcdir)/CREDITS $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ +- $(INSTALL) $(srcdir)/HACKING $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ +- $(INSTALL) $(srcdir)/INSTALL $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ +- $(INSTALL) $(srcdir)/README $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ +- $(INSTALL) $(srcdir)/TODO $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ ++ mkdir -p $(DESTDIR)$(docdir) ++ $(INSTALL_DATA) $(srcdir)/CHANGES $(DESTDIR)$(docdir)/ ++ $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir)/ ++ $(INSTALL_DATA) $(srcdir)/CREDITS $(DESTDIR)$(docdir)/ ++ $(INSTALL_DATA) $(srcdir)/HACKING $(DESTDIR)$(docdir)/ ++ $(INSTALL_DATA) $(srcdir)/INSTALL $(DESTDIR)$(docdir)/ ++ $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(docdir)/ ++ $(INSTALL_DATA) $(srcdir)/TODO $(DESTDIR)$(docdir)/ + uninstall-local: +- -rm -rf $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@ ++ -rm -rf $(DESTDIR)$(docdir) + endif +--- docs/Makefile.am.orig ++++ docs/Makefile.am +@@ -5,12 +5,12 @@ EXTRA_DIST = libwpd.dia libwpd.png + if WITH_LIBWPD_DOCS + + install-data-am: +- mkdir -p $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@ +- $(INSTALL) $(srcdir)/libwpd.dia $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ +- $(INSTALL) $(srcdir)/libwpd.png $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/ ++ mkdir -p $(DESTDIR)$(docdir) ++ $(INSTALL_DATA) $(srcdir)/libwpd.dia $(DESTDIR)$(docdir)/libwpd.dia ++ $(INSTALL_DATA) $(srcdir)/libwpd.png $(DESTDIR)$(docdir)/libwpd.png + + uninstall-am: +- -rm -f $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/libwpd.dia +- -rm -f $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/libwpd.png ++ -rm -f $(DESTDIR)$(docdir)/libwpd.dia ++ -rm -f $(DESTDIR)$(docdir)/libwpd.png + + endif +--- docs/doxygen/Makefile.am.orig ++++ docs/doxygen/Makefile.am +@@ -5,13 +5,13 @@ EXTRA_DIST = doxygen.cfg \ + if WITH_LIBWPD_DOCS + + install-data-am: +- mkdir -p $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/html +- $(INSTALL) html/*.html $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/html/ +- $(INSTALL) html/*.png $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/html/ +- $(INSTALL) html/*.css $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/html/ ++ mkdir -p $(DESTDIR)$(docdir)/html ++ $(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/ ++ $(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/ ++ $(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/ + + uninstall-am: +- -rm -rf $(DESTDIR)$(datadir)/doc/libwpd-@WPD_VERSION@/html ++ -rm -rf $(DESTDIR)$(docdir)/html + + all: + test -f header.html.in || $(LN_S) $(srcdir)/header.html.in ./ diff --git a/libwpd-0.8.14.tar.bz2 b/libwpd-0.8.14.tar.bz2 new file mode 100644 index 0000000..5382445 --- /dev/null +++ b/libwpd-0.8.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4aca91b90d6faf9b01fbc4695074ac43f236eb39aee6f8bd993e1c241149901 +size 424176 diff --git a/libwpd.changes b/libwpd.changes index 743963f..b0c6645 100644 --- a/libwpd.changes +++ b/libwpd.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Fri Apr 4 09:41:27 CEST 2008 - mmarek@suse.cz + +- rename the library package to libwpd-0_8-8, as required by the + library policy (libwpd-0.8.so.8 -> libwpd-0_8-8) +- don't version the devel package after discussion with pmladek + we'll do it only if the need arises + +------------------------------------------------------------------- +Wed Apr 2 15:33:44 CEST 2008 - mmarek@suse.cz + +- update to version 0.8.14: + - Fix some warnings due to unused variables + - Fix a warning due to a name hiding. + - Fix two loops with corrupted documents (Thank you, sum1!) + - Implement readahead in the WPXStreamImplementation class (Jan + Holesovsky, Fridrich) + - Fix some memory issues properly (each class deletes what it + allocated) (Fridrich) + - Work around an issue with relative seeks backward and certain + versions of libstdc++ in the buffered stream implementation + (Fridrich, sum1) + - Fix a problem of conversion of some page breaks due to an + unreachable block in the code (Fridrich) + - Fix a crasher in a rare case of a footnote/endnote being + defined in a table and the footnote/endnote having itself a + table (Fridrich). + - Fix some null pointer crashes with corrupted documents in table + code and in cases where there is no prefix ID present (sum1, + Fridrich). + - Fix a out of bounds array in parsing WP5 extended characters + with broken documents (sum1). + - Remove some abuse of pointers (Fridrich). + - In "wpd2raw --callback", return "-1" if no one callback was + called (Fridrich). + - Fix some issues with incorrect indents in some rear cases + (Fridrich). + - Fix some signedness problems (Fridrich). +- don't install static libraries and libtool archives +- renamed library and devel package to libwpd-0_8 and + libwpd-0_8-devel respectively, to allow parallel installation +- split off libwpd-devel-doc subpackage +- cleaned up spec a bit + ------------------------------------------------------------------- Mon Nov 26 10:57:45 CET 2007 - pmladek@suse.cz diff --git a/libwpd.spec b/libwpd.spec index bc46bae..efb24c1 100644 --- a/libwpd.spec +++ b/libwpd.spec @@ -1,7 +1,7 @@ # -# spec file for package libwpd (Version 0.8.12) +# spec file for package libwpd (Version 0.8.14) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,15 +10,18 @@ # norootforbuild + Name: libwpd +# note: the main package is empty, it only sets a sane name for the source rpm BuildRequires: doxygen gcc-c++ libgsf-devel License: LGPL v2.1 or later Group: System/Libraries AutoReqProv: on -Version: 0.8.12 +Version: 0.8.14 Release: 1 Summary: Library for Importing WordPerfect (tm) Documents -Source: %{name}-%{version}.tar.bz2 +Source: libwpd-%{version}.tar.bz2 +Patch0: libwpd-0.8.14-install-docs.patch Url: http://libwpd.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,10 +39,35 @@ Authors: Marc Maurer Fridrich Strba +%package -n libwpd-0_8-8 +License: LGPL v2.1 or later +%define libname libwpd-0_8-8 +Group: System/Libraries +# remove the old non-versioned package (built in the bs for instance) +Obsoletes: libwpd < %version +Summary: Library for Importing WordPerfect (tm) Documents + +%description -n %libname +libwpd is a general purpose library for reading or interpreting data +from WordPerfect files. The library is not a stand-alone utility: it is +designed to be used by another program (for example, a word processor) +as an in-process component. + + + +Authors: +-------- + William Lachance + Marc Maurer + Fridrich Strba + + %package devel +License: LGPL v2.1 or later Group: System/Libraries Summary: Library for importing WordPerfect (tm) documents -Requires: %{name} = %{version} libstdc++-devel libgsf-devel glibc-devel glib2-devel +Provides: libwpd-devel = %{version}-%{release} +Requires: %{libname} = %{version} libstdc++-devel libgsf-devel %description devel libwpd is a general purpose library for reading (or, interpreting data @@ -49,6 +77,23 @@ an in-process component. +Authors: +-------- + William Lachance + Marc Maurer + Fridrich Strba + +%package devel-doc +License: LGPL v2.1 or later +Group: System/Libraries +Summary: Documentation for the libwpd API +Requires: libwpd-devel + +%description devel-doc +This package contains documentation for the libwpd API. + + + Authors: -------- William Lachance @@ -56,9 +101,9 @@ Authors: Fridrich Strba %package tools +License: LGPL v2.1 or later Group: Productivity/Publishing/Word Summary: Library for importing WordPerfect (tm) documents -Requires: %{name} = %{version} libstdc++-devel libgsf-devel glibc-devel glib2-devel %description tools Tools to transform WordPerfect Documents into other formats. Currently @@ -74,50 +119,88 @@ Authors: %prep %setup -q +%patch0 %build -touch AUTHORS ChangeLog NEWS ; autoreconf -f -i -%configure +AUTOMAKE="automake --foreign" autoreconf -fi +%configure --disable-static --docdir=%_docdir/%name make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{_docdir} -mv $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -p CHANGES COPYING CREDITS HACKING README TODO $RPM_BUILD_ROOT%{_docdir}/%{name} -chmod -x $RPM_BUILD_ROOT%{_docdir}/%{name}/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}/*.png +rm $RPM_BUILD_ROOT%_libdir/*.la +# not needed in binary packages +rm $RPM_BUILD_ROOT/%_docdir/%name/{HACKING,INSTALL,README} %clean rm -rf $RPM_BUILD_ROOT -%post -%run_ldconfig +%post -n %libname -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -n %libname -p /sbin/ldconfig -%files -%defattr(-, root, root) -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/[A-Z]* -%{_docdir}/%{name}/libwpd.png +%files -n %libname +%defattr(-,root,root) %{_libdir}/*.so.* %files devel -%defattr (-, root, root) -%doc %{_docdir}/%{name}/html -%doc %{_docdir}/%{name}/libwpd.dia +%defattr(-,root,root) %{_libdir}/*.so -%{_libdir}/*.*a -%{_libdir}/pkgconfig/*.pc -%{_includedir}/libwpd-0.8 +%{_libdir}/pkgconfig/libwpd*.pc +%{_includedir}/libwpd-* + +%files devel-doc +%defattr(-,root,root) +%doc %dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/html +%doc %{_docdir}/%{name}/libwpd.* %files tools -%defattr (-, root, root) +%defattr(-,root,root) %{_bindir}/* +%doc %dir %{_docdir}/%{name} +%doc %{_docdir}/%{name}/[A-Z]* %changelog -* Mon Nov 26 2007 - pmladek@suse.cz +* Fri Apr 04 2008 mmarek@suse.cz +- rename the library package to libwpd-0_8-8, as required by the + library policy (libwpd-0.8.so.8 -> libwpd-0_8-8) +- don't version the devel package after discussion with pmladek + we'll do it only if the need arises +* Wed Apr 02 2008 mmarek@suse.cz +- update to version 0.8.14: + - Fix some warnings due to unused variables + - Fix a warning due to a name hiding. + - Fix two loops with corrupted documents (Thank you, sum1!) + - Implement readahead in the WPXStreamImplementation class (Jan + Holesovsky, Fridrich) + - Fix some memory issues properly (each class deletes what it + allocated) (Fridrich) + - Work around an issue with relative seeks backward and certain + versions of libstdc++ in the buffered stream implementation + (Fridrich, sum1) + - Fix a problem of conversion of some page breaks due to an + unreachable block in the code (Fridrich) + - Fix a crasher in a rare case of a footnote/endnote being + defined in a table and the footnote/endnote having itself a + table (Fridrich). + - Fix some null pointer crashes with corrupted documents in table + code and in cases where there is no prefix ID present (sum1, + Fridrich). + - Fix a out of bounds array in parsing WP5 extended characters + with broken documents (sum1). + - Remove some abuse of pointers (Fridrich). + - In "wpd2raw --callback", return "-1" if no one callback was + called (Fridrich). + - Fix some issues with incorrect indents in some rear cases + (Fridrich). + - Fix some signedness problems (Fridrich). +- don't install static libraries and libtool archives +- renamed library and devel package to libwpd-0_8 and + libwpd-0_8-devel respectively, to allow parallel installation +- split off libwpd-devel-doc subpackage +- cleaned up spec a bit +* Mon Nov 26 2007 pmladek@suse.cz - update to version 0.8.12: - Convert Tab Set function for WP5 parser - Basic conversion of tabulators and indents in WP3 parser @@ -125,12 +208,12 @@ rm -rf $RPM_BUILD_ROOT - Convert the most usual Macintosh fonts from fontId to font name in WP1 parser - Fix compilation with the upcoming gcc 4.3 -* Mon Oct 01 2007 - stbinner@suse.de +* Mon Oct 01 2007 stbinner@suse.de - update to version 0.8.11: - Fix incorrect conversion of tables with cells spanning more then 127 rows due to incorrect information in the file-format - Fix incorrect reading of font name information in prefix packets -* Sun Jun 17 2007 - stbinner@suse.de +* Sun Jun 17 2007 stbinner@suse.de - update to version 0.8.10: * Fix a locale dependency in our float to string conversion * Enhance our reading of document meta data for WP6 @@ -139,7 +222,7 @@ rm -rf $RPM_BUILD_ROOT * Prevent the heuristic typedetection from throwing * Add a new stream implementation based on C++ streams, rendering libgsf dependency very optional; deprecate GSFInputStream -* Fri Mar 16 2007 - stbinner@suse.de +* Fri Mar 16 2007 stbinner@suse.de - update to version 0.8.9: * Fix a bug in WP1 document type detection where we could try to seek to a negative place in document (Fridrich) @@ -150,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT cause an application linked with libwpd, such as OpenOffice, to crash or possibly execute arbitrary code if the file was opened by a victim. (CVE-2007-0002) (iDefense's Sean Larsson, Fridrich) -* Sun Jan 14 2007 - dmueller@suse.de +* Sun Jan 14 2007 dmueller@suse.de - update to version 0.8.8: * Add unit tests for the stream class * Ignore foot/endnotes that are referenced inside other foot/endnotes @@ -159,24 +242,24 @@ rm -rf $RPM_BUILD_ROOT fixes http://www.openoffice.org/issues/show_bug.cgi?id=72307 * Remove some potential memory leaks in the WPXPropertyList class and optimize the WPXPropertyList subscription operator -* Mon Dec 18 2006 - sbrabec@suse.cz +* Mon Dec 18 2006 sbrabec@suse.cz - Spec file cleanup. -* Tue Nov 07 2006 - ro@suse.de +* Tue Nov 07 2006 ro@suse.de - fix docu permissions -* Mon Oct 09 2006 - stbinner@suse.de +* Mon Oct 09 2006 stbinner@suse.de - update to version 0.8.7: * Revert the alignment fix, in order to mimick the way WP for Mac renders the documents * Support for WP Mac 1.x documents * Fix memory leak in standalone converters * Miscellaneous code cleanups -* Mon Jul 17 2006 - stbinner@suse.de +* Mon Jul 17 2006 stbinner@suse.de - update to version 0.8.6: * Initial support of WP Mac 2.x documents * Initial conversion of headers/footers in WP42 parser * General improvement of libwpd's conversion-success-rate and extensive QA with more than 46'000 real life documents -* Thu Jun 01 2006 - stbinner@suse.de +* Thu Jun 01 2006 stbinner@suse.de - update to version 0.8.5 * adds header and footer conversion in WP5.x and WP3.x for Macintosh file formats. @@ -184,14 +267,14 @@ rm -rf $RPM_BUILD_ROOT * improves the conversion of page margins and corrects issues with conversion of the position of tables and tabstops in multicolumn sections -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Dec 08 2005 - stbinner@suse.de +* Thu Dec 08 2005 stbinner@suse.de - update to version 0.8.4 -* Wed Oct 19 2005 - sbrabec@suse.cz +* Wed Oct 19 2005 sbrabec@suse.cz - Package documentation. - Split to subpackages. -* Sat Oct 08 2005 - coolo@suse.de +* Sat Oct 08 2005 coolo@suse.de - make it build with gcc 4.1 (sent upstream) -* Tue Oct 04 2005 - stbinner@suse.de +* Tue Oct 04 2005 stbinner@suse.de - initial package of version 0.8.3