Hello community, here is the log from the commit of package libreoffice-openclipart for openSUSE:Factory checked in at 2012-06-01 22:31:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice-openclipart (Old) and /work/SRC/openSUSE:Factory/.libreoffice-openclipart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice-openclipart", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice-openclipart/libreoffice-openclipart.changes 2012-03-17 13:22:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice-openclipart.new/libreoffice-openclipart.changes 2012-06-01 22:32:31.000000000 +0200 @@ -1,0 +2,18 @@ +Thu May 24 15:39:03 UTC 2012 - [email protected] + +- add librsvg into BuildRequires; it is needed to draw the SVG pictures + for thumbnails; the library is dlopened and there is no direct + dependency at the moment + +------------------------------------------------------------------- +Fri May 11 15:39:23 UTC 2012 - [email protected] + +- bump version to make sure that it is considered as a replacement + of the older package +- LO-3.5 does not longer has basis3.x subdirectory; fix installation path; + remove obsolete requires because the package should work with any LO >= 3.5 +- add coreutils, grep, libreoffice as the dependency for postinstall scripts +- remove build support for openSUSE < 11.1 +- remove obsolete compat symlinks for OOo + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-openclipart.spec ++++++ --- /var/tmp/diff_new_pack.1wJqOG/_old 2012-06-01 22:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.1wJqOG/_new 2012-06-01 22:32:33.000000000 +0200 @@ -20,29 +20,39 @@ Url: http://www.documentfoundation.org/ # We use the gengal in the headles mode; it was added in OpenOffice_org-2.2.99.221 BuildRequires: libreoffice >= 3.3.98 +# SVG import filter is in the optional package +BuildRequires: libreoffice-filters-optional +# the system librsvg is dlopened; there is no direct dependency +BuildRequires: librsvg BuildRequires: openclipart-svg -%if 0%{?suse_version} == 01010 -BuildRequires: update-alternatives -%endif -%if 0%{?suse_version} > 01000 || 0%{?meego_version} %define openclipart_dir %_datadir/clipart/openclipart -%else -%define openclipart_dir %_datadir/openclipart -%endif -%define ooo_home libreoffice -%define ooo_basis basis3.4 -# OOo uses ugly names for galleries (std_prefix + index + std_suffix) +%define lo_home libreoffice +# LO uses ugly names for galleries (std_prefix + index + std_suffix) # The openlipart gallery should start from the index 70 %define gal_num_from 70 Summary: Extra Galleries for LibreOffice License: GPL-2.0+ ; LGPL-2.1+ Group: Productivity/Office/Suite -Version: 3.4 +Version: 3.5 Release: 0 -# OOo-2.x with link-to-ooo-home script is required -Requires: libreoffice < 3.4.98 -Requires: libreoffice >= 3.3.98 +# LO-2.x with link-to-ooo-home script is required +Requires: libreoffice >= 3.4.98 +# SVG import filter is in the optional package Requires: libreoffice-filters-optional >= 3.3.98 +# postinstall script dependencies +%if 0%{?suse_version} > 01120 +Requires(post): coreutils +Requires(post): grep +Requires(post): libreoffice >= 3.4.98 +Requires(postun): coreutils +Requires(postun): grep +Requires(postun): libreoffice >= 3.4.98 +%endif +%if 0%{?suse_version} && 0%{?suse_version} <= 01120 +PreReq: coreutils +PreReq: grep +PreReq: libreoffice >= 3.4.98 +%endif # this package includes only thumbnails, the original clipart is still neeeded %requires_eq openclipart-svg %if 0%{?suse_version} @@ -74,8 +84,8 @@ %build for prefix in /usr/lib /usr/lib64 ; do - if test -x $prefix/%ooo_home/program/gengal ; then - GENGAL_BIN=$prefix/%ooo_home/program/gengal + if test -x $prefix/%lo_home/program/gengal ; then + GENGAL_BIN=$prefix/%lo_home/program/gengal break fi done @@ -122,48 +132,30 @@ %install # FIXME: The stuff from this directory is linked to ooo-home by the script # link-to-ooo-home; so it must keep the usual OOo structure -install -m 755 -d $RPM_BUILD_ROOT%_datadir/%ooo_home/%ooo_basis/share/gallery -# compat stuff -install -m 755 -d $RPM_BUILD_ROOT%_datadir/ooo3/%ooo_basis/share/gallery +install -m 755 -d $RPM_BUILD_ROOT%_datadir/%lo_home/share/gallery for file in `ls sg*` ; do - install -m 644 $file $RPM_BUILD_ROOT%_datadir/%ooo_home/%ooo_basis/share/gallery - echo "%_datadir/%ooo_home/%ooo_basis/share/gallery/$file" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt - # compat stuff - ln -sf ../../../../%ooo_home/%ooo_basis/share/gallery/$file $RPM_BUILD_ROOT%_datadir/ooo3/%ooo_basis/share/gallery - echo "%_datadir/ooo3/%ooo_basis/share/gallery/$file" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt + install -m 644 $file $RPM_BUILD_ROOT%_datadir/%lo_home/share/gallery + echo "%_datadir/%lo_home/share/gallery/$file" >>$RPM_BUILD_ROOT%_datadir/%lo_home/openclipart_list.txt done -echo "%dir %_datadir/%ooo_home/" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt -echo "%dir %_datadir/%ooo_home/%ooo_basis" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt -echo "%dir %_datadir/%ooo_home/%ooo_basis/share" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt -echo "%dir %_datadir/%ooo_home/%ooo_basis/share/gallery" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt -# compat stuff -echo "%dir %_datadir/ooo3/" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt -echo "%dir %_datadir/ooo3/%ooo_basis" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt -echo "%dir %_datadir/ooo3/%ooo_basis/share" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt -echo "%dir %_datadir/ooo3/%ooo_basis/share/gallery" >>$RPM_BUILD_ROOT%_datadir/%ooo_home/openclipart_list.txt +echo "%dir %_datadir/%lo_home/" >>$RPM_BUILD_ROOT%_datadir/%lo_home/openclipart_list.txt +echo "%dir %_datadir/%lo_home/share" >>$RPM_BUILD_ROOT%_datadir/%lo_home/openclipart_list.txt +echo "%dir %_datadir/%lo_home/share/gallery" >>$RPM_BUILD_ROOT%_datadir/%lo_home/openclipart_list.txt %clean rm -rf $RPM_BUILD_ROOT %post -%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/openclipart_list.txt || true +%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/openclipart_list.txt || true %preun -test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/openclipart_list.txt || true +test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/openclipart_list.txt || true %files %defattr(-, root, root) -%dir %_datadir/%ooo_home -%_datadir/%ooo_home/openclipart_list.txt -%dir %_datadir/%ooo_home/%ooo_basis -%dir %_datadir/%ooo_home/%ooo_basis/share -%dir %_datadir/%ooo_home/%ooo_basis/share/gallery -%_datadir/%ooo_home/%ooo_basis/share/gallery/* -# compat stuff -%dir %_datadir/ooo3 -%dir %_datadir/ooo3/%ooo_basis -%dir %_datadir/ooo3/%ooo_basis/share -%dir %_datadir/ooo3/%ooo_basis/share/gallery -%_datadir/ooo3/%ooo_basis/share/gallery/* +%dir %_datadir/%lo_home +%_datadir/%lo_home/openclipart_list.txt +%dir %_datadir/%lo_home/share +%dir %_datadir/%lo_home/share/gallery +%_datadir/%lo_home/share/gallery/* %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
