Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at Mon Feb 14 01:24:46 CET 2011. -------- --- meld/meld.changes 2011-01-07 09:51:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/meld/meld.changes 2011-02-12 20:26:22.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Feb 12 19:30:30 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + + %icon_theme_cache_post/postun because the package ships themed + icons. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.DjOA5o/_old 2011-02-14 01:24:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DjOA5o/_new 2011-02-14 01:24:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package meld (Version 1.5.0) +# spec file for package meld # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: meld Version: 1.5.0 -Release: 1 +Release: 2 License: GPLv2+ Summary: Visual diff and merge tool Url: http://meld.sourceforge.net/ @@ -34,12 +34,12 @@ BuildRequires: scrollkeeper BuildRequires: python BuildRequires: update-desktop-files -Requires: %{name}-lang = %{version} # needed for VCS diffs Requires: patch # For gconf bindings Requires: python-gnome >= 2.6.0 Requires: python-gtk >= 2.8.0 +Recommends: %{name}-lang Recommends: python-gtksourceview BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -63,16 +63,37 @@ make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_datadir} install # Remove scrollkeeper files rm -rf %{buildroot}%{_prefix}%{_localstatedir}/lib/scrollkeeper -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %suse_update_desktop_file -G "Diff Viewer" meld IDE %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} +%if 0%{?suse_version} > 1130 + +%post +%desktop_database_post +%icon_theme_cache_post +%endif + +%if 0%{?suse_version} > 1130 + +%postun +%desktop_database_postun +%icon_theme_cache_postun +%endif + %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ +%dir %{_datadir}/gnome/help/%{name}/ +%doc %{_datadir}/gnome/help/%{name}/C/ +%dir %{_datadir}/omf/ +%dir %{_datadir}/omf/%{name}/ +%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop @@ -80,9 +101,5 @@ %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %files lang -f %{name}.lang -# Temporary workaround to not depend on libgnome: own the directories -%defattr (-, root, root) -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org