From 10d788702e8be44e45ee51897a5cb9c027d4775aa0cf4024ae0c76a9f54c6da2 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 20 Dec 2010 13:49:40 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gnome-user-share revision 24.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=08a5029e92d7d9b7185e358ac2be6c77 --- gnome-user-share.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 4f71401..72d3fa2 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -20,7 +20,7 @@ Name: gnome-user-share Summary: GNOME user file sharing Version: 2.30.1 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Networking/File-Sharing Source: %{name}-%{version}.tar.bz2 From 18f03ef7331d30ba41c2570574af57c45912fb5e57f935fc06540a250e624c32 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 21:11:37 +0000 Subject: [PATCH 2/2] Accepting request 60795 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60795 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=41 --- gnome-user-share.changes | 13 +++++++++++++ gnome-user-share.spec | 25 ++++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/gnome-user-share.changes b/gnome-user-share.changes index 60f2da3..754dae6 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Feb 13 16:19:42 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 15:06:15 CET 2010 - vuntz@opensuse.org diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 72d3fa2..9905a34 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -40,7 +40,7 @@ BuildRequires: libunique-devel BuildRequires: nautilus-devel BuildRequires: update-desktop-files Requires: obex-data-server -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang Suggests: apache2-prefork Suggests: apache2-worker Suggests: apache2-mod_dnssd @@ -83,9 +83,8 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print grep -q X-GNOME-NetworkSettings %{buildroot}%{_datadir}/applications/gnome-user-share-properties.desktop %suse_update_desktop_file -r gnome-user-share-properties GNOME Settings X-GNOME-PersonalSettings X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-user-share -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst %fdupes $RPM_BUILD_ROOT %clean @@ -93,13 +92,28 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre +%post +%desktop_database_post +%icon_theme_cache_post + %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun -%files -f %{name}.lst +%postun +%desktop_database_postun +%icon_theme_cache_postun + +%files -f %{name}.schemas_list %defattr(-,root,root,-) %doc README 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}/* %{_libexecdir}/gnome-user-share %{_datadir}/applications/* @@ -109,8 +123,5 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png %files lang -f %{name}.lang -%defattr(-, root, root) -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help %changelog