Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2015-05-30 12:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2015-05-19 23:20:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2015-05-30 12:33:18.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 21 11:59:03 UTC 2015 - [email protected] + +- Update %post scriptlets to work on sle11 again + +------------------------------------------------------------------- +Wed May 20 08:45:37 UTC 2015 - [email protected] + +- Split out the share -> lib linker to hopefully allow sle11 build + +------------------------------------------------------------------- Old: ---- link-to-ooo-home ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.gTa5f9/_old 2015-05-30 12:33:28.000000000 +0200 +++ /var/tmp/diff_new_pack.gTa5f9/_new 2015-05-30 12:33:28.000000000 +0200 @@ -77,9 +77,6 @@ Source99: %{name}-rpmlintrc # Prebuilt sofficerc for the noarch upstream branding package Source201: sofficerc-upstream -# helper scripts -# create compat symlinks from %{_datadir} to %{_prefix}/lib(64); used by noarch packages -Source300: link-to-ooo-home # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt # used extensions sources @@ -175,6 +172,7 @@ Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff +BuildRequires: %{name}-share-linker BuildRequires: %{python_type}-devel BuildRequires: %{python_type}-xml BuildRequires: ImageMagick @@ -385,8 +383,8 @@ Summary: Crystal LibreOffice Icon Theme (KDE3 default) License: LGPL-2.1 Group: Productivity/Office/Suite -Requires(post): %{name} = %{version} -Requires(postun): %{name} = %{version} +Requires(post): %{name}-share-linker +Requires(postun): %{name}-share-linker Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} %if %{with noarch_subpkgs} @@ -400,8 +398,8 @@ Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default) License: LGPL-3.0 Group: Productivity/Office/Suite -Requires(post): %{name} = %{version} -Requires(postun): %{name} = %{version} +Requires(post): %{name}-share-linker +Requires(postun): %{name}-share-linker Supplements: libreoffice Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} @@ -416,8 +414,8 @@ Summary: Hicontrast LibreOffice Icon Theme License: LGPL-3.0 Group: Productivity/Office/Suite -Requires(post): %{name} = %{version} -Requires(postun): %{name} = %{version} +Requires(post): %{name}-share-linker +Requires(postun): %{name}-share-linker Supplements: libreoffice Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} @@ -432,8 +430,8 @@ Summary: Oxygen LibreOffice Icon Theme (KDE4 default) License: LGPL-3.0 or CC-BY-SA-3.0 Group: Productivity/Office/Suite -Requires(post): %{name} = %{version} -Requires(postun): %{name} = %{version} +Requires(post): %{name}-share-linker +Requires(postun): %{name}-share-linker Supplements: packageand(libreoffice:kdebase4-workspace) Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} @@ -448,8 +446,8 @@ Summary: Sifr LibreOffice Icon Theme License: LGPL-3.0 Group: Productivity/Office/Suite -Requires(post): %{name} = %{version} -Requires(postun): %{name} = %{version} +Requires(post): %{name}-share-linker +Requires(postun): %{name}-share-linker Supplements: libreoffice Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} @@ -464,8 +462,8 @@ Summary: Tango LibreOffice Icon Theme (GNOME default) License: LGPL-3.0 Group: Productivity/Office/Suite -Requires(post): %{name} = %{version} -Requires(postun): %{name} = %{version} +Requires(post): %{name}-share-linker +Requires(postun): %{name}-share-linker Supplements: packageand(libreoffice:gnome-session) Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} @@ -754,12 +752,12 @@ %posttrans %{1} \ rpm -ql %{name}-%{1} > %{_datadir}/libreoffice/%{1}_list.txt || true \ if [ -f %{_datadir}/libreoffice/%{1}_list.txt ] ; then \ - %{_datadir}/libreoffice/link-to-ooo-home %{_datadir}/libreoffice/%{1}_list.txt || true \ + %{_bindir}/libreoffice-share-linker %{_datadir}/libreoffice/%{1}_list.txt || true \ fi \ \ %postun %{1} \ -if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt -a -f %{_datadir}/libreoffice/link-to-ooo-home ]; then \ - %{_datadir}/libreoffice/link-to-ooo-home --unlink %{_datadir}/libreoffice/%{1}_list.txt || true \ +if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt -a -f %{_bindir}/libreoffice-share-linker ]; then \ + %{_bindir}/libreoffice-share-linker --unlink %{_datadir}/libreoffice/%{1}_list.txt || true \ rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \ fi \ %{nil} @@ -840,9 +838,8 @@ Summary: %{langname} Localization Files for LibreOffice \ Group: Productivity/Office/Suite \ Requires: %{name} = %{version} \ +Requires: %{name}-share-linker \ Provides: locale(libreoffice:%{lang}) \ -Requires(post,): %{name} = %{version} \ -Requires(postun,): %{name} = %{version} \ %if %{with noarch_subpkgs} \ BuildArch: noarch \ %endif \ @@ -1189,11 +1186,9 @@ ################ # compat stuff for noarch packages mkdir -p %{buildroot}/%{_datadir}/%{name}/program -install -m 755 $RPM_SOURCE_DIR/link-to-ooo-home %{buildroot}%{_datadir}/%{name}/ echo "%dir %{_libdir}/%{name}" >>file-lists/common_list.txt echo "%dir %{_datadir}/%{name}" >>file-lists/common_list.txt echo "%dir %{_datadir}/%{name}/program" >>file-lists/common_list.txt -echo "%{_datadir}/%{name}/link-to-ooo-home" >>file-lists/common_list.txt ################ # helper script for noarch packages # add missing directories to the file list @@ -1240,7 +1235,6 @@ grep -v '%{_libdir}/%{name}/share/autotext' file-lists/common_list.txt > tmplist mv tmplist file-lists/common_list.txt mv %{buildroot}/%{_libdir}/%{name}/share/autotext/ %{buildroot}/%{_datadir}/%{name}/share/ -echo "%ghost %{_libdir}/%{name}/share/autotext" >> file-lists/common_list.txt ################ # branding split @@ -1324,9 +1318,16 @@ %post /sbin/ldconfig +%if %suse_version > 1130 %mime_database_post %desktop_database_post %icon_theme_cache_post +%else +test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %preun uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/" @@ -1337,45 +1338,112 @@ %postun /sbin/ldconfig +%if %suse_version > 1130 %icon_theme_cache_postun %desktop_database_postun %mime_database_postun +%else +test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %post base +%if %suse_version > 1130 %desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %postun base +%if %suse_version > 1130 %desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %post calc +%if %suse_version > 1130 %desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %postun calc +%if %suse_version > 1130 %desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %post draw +%if %suse_version > 1130 %desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %postun draw +%if %suse_version > 1130 %desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %post math +%if %suse_version > 1130 %desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %postun math +%if %suse_version > 1130 %desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %post impress +%if %suse_version > 1130 %desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %postun impress +%if %suse_version > 1130 %desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %post writer +%if %suse_version > 1130 %desktop_database_post +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %postun writer +%if %suse_version > 1130 %desktop_database_postun +%else +test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : +test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : +%endif %_link_noarch_files icon-theme-crystal %_link_noarch_files icon-theme-galaxy
