diff --git a/deja-dup.changes b/deja-dup.changes index 5f034a9..b9b6fc8 100644 --- a/deja-dup.changes +++ b/deja-dup.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Feb 12 17:09:17 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. + ------------------------------------------------------------------- Tue Dec 14 16:17:23 CET 2010 - vuntz@opensuse.org diff --git a/deja-dup.spec b/deja-dup.spec index 7ffeeaa..7777173 100644 --- a/deja-dup.spec +++ b/deja-dup.spec @@ -41,8 +41,8 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(unique-1.0) BuildRequires: update-desktop-files BuildRequires: vala -Requires: %{name}-lang = %{version} Requires: duplicity +Recommends: %{name}-lang %gconf_schemas_prereq %description @@ -96,7 +96,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file deja-dup %suse_update_desktop_file deja-dup-monitor %suse_update_desktop_file deja-dup-preferences -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} # Localized man pages for man in %{buildroot}%{_mandir}/*/man1/*; do LOCALE=`echo $man | sed "s:.*%{_mandir}/\([^/]*\)/man1/.*:\1:g"` @@ -110,18 +110,34 @@ done %fdupes %{buildroot} %find_gconf_schemas +%clean +rm -rf %{buildroot} + %pre -f %{name}.schemas_pre %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun -%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 -f %{name}.schemas_list -f %{name}.man-lang %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/ %{_bindir}/deja-dup %{_bindir}/deja-dup-preferences %{_mandir}/man1/deja-dup.*