2015-01-13 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* inkscape: rebuilt
	* librevenge: NEW
	* libwpd, libwpg: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9259 ec354946-7b23-47d6-9f5a-488ba84defc7

i/inkscape/inkscape-vl.spec

@@ -2,13 +2,14 @@ Name:		inkscape
 Summary:	A Vector Drawing Application
 Summary(ja):	ベクター描画アプリケーション
 Version:	0.48.5
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 
 Group:		Applications/Graphics
-License:	GPLv2
+License:	GPLv2+
 URL:		http://www.inkscape.org/
 
-Source:		http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+Patch14:        0001-update-to-new-libwpg.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel >= 2.8.0
@@ -17,7 +18,7 @@ BuildRequires: libxml2-devel >= 2.6.11
 BuildRequires: libxslt-devel >= 1.0.15
 BuildRequires: gc-devel >= 6.4
 BuildRequires: libsigc++-devel >= 2.0.12
-BuildRequires: gtkmm2-devel >= 2.4.0
+BuildRequires: gtkmm2-devel >= 2.8.0
 BuildRequires: libpng-devel >= 1.2.0
 BuildRequires: libwpg-devel
 BuildRequires: perl-XML-Parser 
@@ -28,10 +29,19 @@ BuildRequires: gsl-devel
 BuildRequires: libboost-devel
 BuildRequires: popt-devel
 BuildRequires: ImageMagick-c++-devel
+BuildRequires: dos2unix
+BuildRequires: automake autoconf 
 Requires:      python-lxml
 Requires:      perl-XML-RegExp
 Requires:      perl-XML-DOM
 Requires:      perl-XML-XQL
+# the package requires libperl.so, so it also has to require this:
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+# Filter out perl requires and provides
+# XXX: For now _all_
+%global __perl_provides %{nil}
+%global __perl_requires %{nil}
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -46,14 +56,26 @@ Linux/Unix/Windows/Mac で動作します。
 
 %prep
 %setup -q -n %{name}-%{version}
-sed -i "s|,;|;|g" src/widgets/desktop-widget.h 
+%patch14 -p1 -b .libwpg
+
+# https://bugs.launchpad.net/inkscape/+bug/314381
+# A couple of files have executable bits set,
+# despite not being executable
+find . -name '*.cpp' | xargs chmod -x
+find . -name '*.h' | xargs chmod -x
+find share/extensions -name '*.py' | xargs chmod -x
+
+# Fix end of line encodings
+dos2unix -k -q share/extensions/*.py
+
+autoreconf -i
 
 %build
 %configure \
     --with-python \
     --with-gnome-vfs \
     --with-inkjar \
-    --enable-lcms \
+    --enable-lcms2 \
     --enable-poppler-cairo
 
 make %{?_smp_mflags}
@@ -98,6 +120,10 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Jan 13 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.48.5-3
+- rebuilt with libwpd 0.3.0
+- added Patch14 to build with libwpd 0.3.0
+
 * Tue Jul 08 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.48.5-2
 - rebuild with poppler-0.26.2
 

lib/libr/librevenge/librevenge-vl.spec

@@ -0,0 +1,119 @@
+%global apiversion 0.0
+
+Name: librevenge
+Version: 0.0.2
+Release: 2%{?_dist_release}
+Summary: A base library for writing document import filters
+Summary(ja): ドキュメントのインポートフィルタを作成するための基礎ライブラリ
+
+# src/lib/RVNGOLEStream.{h,cpp} are BSD
+License: (LGPLv2+ or MPLv2.0) and BSD
+Group: System Environment/Libraries
+URL: http://sourceforge.net/p/libwpd/wiki/librevenge/
+
+Source: http://downloads.sourceforge.net/libwpd/%{name}-%{version}.tar.xz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: cppunit-devel
+BuildRequires: doxygen
+BuildRequires: libboost-devel
+BuildRequires: zlib-devel
+
+%description
+%{name} is a base library for writing document import filters. It has
+interfaces for text documents, vector graphics, spreadsheets and
+presentations.
+
+%package devel
+Summary: Development files for %{name}
+Summary(ja): %{name} の開発用ファイル
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package doc
+Summary: Documentation of %{name} API
+Summary(ja): %{name} API のドキュメント
+Group: Documentation
+BuildArch: noarch
+
+%description doc
+The %{name}-doc package contains documentation files for %{name}.
+
+%prep
+%autosetup -p1
+
+%build
+%configure --disable-silent-rules --disable-static --disable-werror --enable-pretty-printers
+sed -i \
+    -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    libtool
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}/%{_libdir}/*.la
+# we install API docs directly from build
+rm -rf %{buildroot}/%{_docdir}/%{name}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+#%check
+#export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+#make %{?_smp_mflags} check
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%doc COPYING.* README NEWS
+%{_libdir}/%{name}-%{apiversion}.so.*
+%{_libdir}/%{name}-generators-%{apiversion}.so.*
+%{_libdir}/%{name}-stream-%{apiversion}.so.*
+
+%files devel
+%doc ChangeLog
+%{_includedir}/%{name}-%{apiversion}
+%{_libdir}/%{name}-%{apiversion}.so
+%{_libdir}/%{name}-generators-%{apiversion}.so
+%{_libdir}/%{name}-stream-%{apiversion}.so
+%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
+%{_libdir}/pkgconfig/%{name}-generators-%{apiversion}.pc
+%{_libdir}/pkgconfig/%{name}-stream-%{apiversion}.pc
+%{_datadir}/gdb/auto-load%{_libdir}/%{name}-%{apiversion}.py*
+%{_datadir}/gdb/auto-load%{_libdir}/%{name}-stream-%{apiversion}.py*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/python
+
+%files doc
+%doc COPYING.*
+%doc docs/doxygen/html
+
+%changelog
+* Tue Jan 13 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.0.2-2
+- Initial build for Vine Linux
+
+* Wed Dec 24 2014 David Tardon <dtardon@redhat.com> - 0.0.2-1
+- new upstream release
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Jun 03 2014 David Tardon <dtardon@redhat.com> - 0.0.1-1
+- new upstream release
+
+* Tue May 27 2014 David Tardon <dtardon@redhat.com> - 0.0.0-2
+- remove extra dirs from filelist
+
+* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 0.0.0-1
+- initial import

lib/libw/libwpd/libwpd-vl.spec

@@ -1,24 +1,29 @@
-Summary: Library for reading and converting WordPerfect(tm) documents
-Summary(ja): WordPerfect(tm) 文書の読み込みおよび変換をするライブラリ
+%global apiversion 0.10
+
+Summary: A library for import of WordPerfect documents
+Summary(ja): WordPerfect ドキュメントのインポートを行うためのライブラリ
 Name: libwpd
-Version: 0.9.9
+Version: 0.10.0
 Release: 1%{?_dist_release}
 
+License: LGPLv2+ or MPLv2.0
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
-License: LGPL
 
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: zlib-devel
+BuildRequires: cppunit-devel
 BuildRequires: doxygen
+BuildRequires: help2man
+BuildRequires: librevenge-devel
+BuildRequires: zlib-devel
 
 %description
-libwpd is a library that handles WordPerfect documents.
+libwpd is a library for import of WordPerfect documents.
 
 %description -l ja
-libwpd は WordPerfect 文書を扱うためのライブラリです。
+libwpd は WordPerfect 文書をインポートするためのライブラリです。
 
 %package devel
 Summary: Development files for libwpd
@@ -31,28 +36,51 @@ Requires: pkgconfig
 Includes and definitions for developing with libwpd.
 
 %package tools
-Summary: Tools to transform WordPerfect Documents into other formats
+Summary: Tools to transform WordPerfect documents into other formats
 Summary(ja): WordPerfect 文書を他のフォーマットに変換するツール
-Group: Applications/Publishing
+Requires: %{name} = %{version}-%{release}
+Group: Applications/Text
 
 %description tools
 Tools to transform WordPerfect Documents into other formats.
 Currently supported: html, raw, text.
 
+%package doc
+Summary: Documentation of %{name} API
+Summary(ja): %{name} API のドキュメント
+Group: Documentation
+BuildArch: noarch
+
+%description doc
+The %{name}-doc package contains API documentation for %{name}.
+
+
 %prep
 %setup -q
 
+chmod -x docs/%{name}.dia
+
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%configure --disable-static --disable-werror
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags} V=1
+
+export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+help2man -N -n 'debug the conversion library' -o wpd2raw.1 ./src/conv/raw/.libs/wpd2raw
+help2man -N -n 'convert WordPerfect document into HTML' -o wpd2html.1 ./src/conv/html/.libs/wpd2html
+help2man -N -n 'convert WordPerfect document into plain text' -o wpd2text.1 ./src/conv/text/.libs/wpd2text
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-rm -rf _docs_to_install
-mkdir -p _docs_to_install
-mv $RPM_BUILD_ROOT%{_docdir}/libwpd/* _docs_to_install 
+# we install API docs directly from build
+rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
+install -m 0755 -d %{buildroot}/%{_mandir}/man1
+install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,24 +91,36 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING CREDITS README
-%{_libdir}/*.so.*
+%doc COPYING.LGPL COPYING.MPL CREDITS README
+%{_libdir}/%{name}-%{apiversion}.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc HACKING TODO
-%doc _docs_to_install/*
-%dir %{_includedir}/libwpd-0.9
-%{_includedir}/libwpd-0.9/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_includedir}/%{name}-%{apiversion}
+%{_libdir}/%{name}-%{apiversion}.so
+%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
 
 %files tools
 %defattr(-,root,root,-)
-%{_bindir}/wpd2*
-
+%{_bindir}/wpd2html
+%{_bindir}/wpd2raw
+%{_bindir}/wpd2text
+%{_mandir}/man1/wpd2html.1*
+%{_mandir}/man1/wpd2raw.1*
+%{_mandir}/man1/wpd2text.1*
+
+%files doc
+%doc COPYING.LGPL COPYING.MPL
+%doc docs/doxygen/html
+%doc docs/%{name}.dia
+%doc docs/%{name}.png
 
 %changelog
+* Tue Jan 13 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.10.0-1
+- new upstream release
+- split documents to doc subpackage
+
 * Wed Jul 02 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.9-1
 - new upstream release
 - add BuildRequires: zlib-devel

lib/libw/libwpg/libwpg-vl.spec

@@ -1,17 +1,23 @@
+%global apiversion 0.3
+
 Name:           libwpg
-Summary:        Library for reading WordPerfect Graphics images
-Version:        0.2.2
+Summary:        A library for import of WordPerfect Graphics images
+Summary(ja):    WordPerfect のグラフィック画像をインポートするためのライブラリ
+Version:        0.3.0
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
-License:        GPLv2+
+License:        LGPLv2+ or MPLv2.0
 URL:            http://libwpg.sourceforge.net/
 
 Source0:        http://download.sourceforge.net/libwpg/%{name}-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  libwpd-devel >= 0.9
 BuildRequires:  doxygen
+BuildRequires:  help2man
+BuildRequires:  libwpd-devel >= 0.10.0
+BuildRequires:  librevenge-devel
+BuildRequires:  perl(Getopt::Std)
 
 %description
 Libwpg project is a library and to work with graphics in WPG
@@ -21,6 +27,7 @@ in Corel sofware, such as WordPerfect and Presentations.
 
 %package devel
 Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
@@ -30,13 +37,28 @@ developing applications that use %{name}.
 
 
 %package tools
-Summary:        Tools to convert WordPerfect Graphics images
-Group:          Applications/Publishing
+Summary:        Tools to convert WordPerfect Graphics images to other formats
+Summary(ja):    WordPerfect グラフィック画像を他のフォーマットに変換するツール
+# wpg2svgbatch.pl says "GPL", without specifying version, and points to
+# http://www.gnu.org/copyleft/gpl.html . I assume this means "any
+# version".
+License:        (LGPLv2+ or MPLv2.0) and GPL+
+Group:          Applications/Graphics
+Requires:       %{name} = %{version}-%{release}
 
 %description tools
-This package contains tools to work with graphics in WPG (WordPerfect
-Graphics) format. WPG is the format used among others in Corel sofware,
-such as WordPerfect and Presentations.
+Tools to convert WordPerfect Graphics images to other formats. Supported
+are: SVG, raw.
+
+
+%package doc
+Summary: Documentation of %{name} API
+Summary(ja): %{name} API のドキュメント
+Group: Documentation
+BuildArch: noarch
+
+%description doc
+The %{name}-doc package contains API documentation for %{name}.
 
 
 %prep
@@ -44,48 +66,72 @@ such as WordPerfect and Presentations.
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --disable-static --disable-werror
+sed -i \
+    -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    libtool
+make %{?_smp_mflags} V=1
 sed 's/\r//' -i ChangeLog
 find docs/doxygen/html |xargs touch -r docs/doxygen/doxygen.cfg
 
+export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+help2man -N -n 'debug the conversion library' -o wpg2raw.1 ./src/conv/raw/.libs/wpg2raw
+help2man -N -n 'convert WordPerfect Graphics into SVG' -o wpg2svg.1 ./src/conv/svg/.libs/wpg2svg
+help2man -N -n 'batch convert WordPerfect Graphics files into SVG' \
+    --help-option=-h --no-discard-stderr \
+    -o wpg2svgbatch.pl.1 ./src/conv/svg/wpg2svgbatch.pl
+
 %install
 rm -rf $RPM_BUILD_ROOT
-# Documentation is intentionally not installed here,
-# it is included as -devel %%doc
-make SUBDIRS="" install DESTDIR=$RPM_BUILD_ROOT
-make -C src install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# we install API docs directly from build
+rm -rf %{buildroot}/%{_docdir}/%{name}
+
+install -m 0755 -d %{buildroot}/%{_mandir}/man1
+install -m 0644 wpg2*.1 %{buildroot}/%{_mandir}/man1
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING
-%{_libdir}/*.so.*
+%doc AUTHORS ChangeLog COPYING.LGPL COPYING.MPL
+%{_libdir}/%{name}-%{apiversion}.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING docs/doxygen/html
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/%{name}-%{apiversion}
+%{_libdir}/%{name}-%{apiversion}.so
+%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
 
 %files tools
 %defattr(-,root,root,-)
-%doc COPYING
-%{_bindir}/*
+%{_bindir}/wpg2raw
+%{_bindir}/wpg2svg
+%{_bindir}/wpg2svgbatch.pl
+%{_mandir}/man1/wpg2raw.1*
+%{_mandir}/man1/wpg2svg.1*
+%{_mandir}/man1/wpg2svgbatch.pl.1*
+
+%files doc
+%doc COPYING.LGPL COPYING.MPL
+%doc docs/doxygen/html
 
 
 %changelog
+* Tue Jan 13 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.3.0-1
+- new upstream release
+- split documents to doc subpackage
+
 * Wed Jul 02 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.2.2-1
 - update to 0.2.2
 - remove Patch0 (libwpg-0.1.3-nodate.patch)