From 51ccc7754677e47779f68674d6f97b001c4bbd4a95654b5bf45b57cfe94c7cb1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 10 Dec 2010 14:52:14 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/avahi revision 71.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=3e2da4c4401c1b67bdab65f65f771793 --- avahi-glib2.spec | 2 +- avahi-mono.spec | 2 +- avahi-qt4.spec | 2 +- avahi.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 20392dc..cd36356 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -31,7 +31,7 @@ Name: avahi-glib2 %define build_qt3 0 %define build_qt4 0 Version: 0.6.28 -Release: 1 +Release: 2 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) diff --git a/avahi-mono.spec b/avahi-mono.spec index 35da5ac..1e18b26 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -31,7 +31,7 @@ Name: avahi-mono %define build_qt3 0 %define build_qt4 0 Version: 0.6.28 -Release: 1 +Release: 2 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 02a3567..2946994 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -31,7 +31,7 @@ Name: avahi-qt4 %define build_qt3 0 %define build_qt4 1 Version: 0.6.28 -Release: 1 +Release: 2 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) diff --git a/avahi.spec b/avahi.spec index 7e3866b..cfbc055 100644 --- a/avahi.spec +++ b/avahi.spec @@ -33,7 +33,7 @@ Name: avahi %define build_qt3 0 %define build_qt4 0 Version: 0.6.28 -Release: 1 +Release: 2 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) From 98e98e9c0165ba4dcfecb27fd0ab8fb4a701d70b96d790242a42847c6dfdfd6a Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 21:03:36 +0000 Subject: [PATCH 2/2] Accepting request 60695 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60695 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=51 --- avahi-glib2.spec | 14 +++++++++++++- avahi-mono.spec | 14 +++++++++++++- avahi-qt4.spec | 14 +++++++++++++- avahi.changes | 9 +++++++++ avahi.spec | 14 +++++++++++++- 5 files changed, 61 insertions(+), 4 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index cd36356..36b0e76 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -783,7 +783,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces %endif -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %else # There is no simple way to not install core files. Remove them here. # The rest is enabled/disabled in configure as needed. @@ -911,6 +911,18 @@ fi %post -n libavahi-glib1 -p /sbin/ldconfig %postun -n libavahi-glib1 -p /sbin/ldconfig + +%post -n python-avahi-gtk +%desktop_database_post + +%postun -n python-avahi-gtk +%desktop_database_post + +%post -n avahi-utils-gtk +%desktop_database_post + +%postun -n avahi-utils-gtk +%desktop_database_post %endif %if %build_qt3 diff --git a/avahi-mono.spec b/avahi-mono.spec index 1e18b26..77b1462 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -782,7 +782,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces %endif -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %else # There is no simple way to not install core files. Remove them here. # The rest is enabled/disabled in configure as needed. @@ -910,6 +910,18 @@ fi %post -n libavahi-glib1 -p /sbin/ldconfig %postun -n libavahi-glib1 -p /sbin/ldconfig + +%post -n python-avahi-gtk +%desktop_database_post + +%postun -n python-avahi-gtk +%desktop_database_post + +%post -n avahi-utils-gtk +%desktop_database_post + +%postun -n avahi-utils-gtk +%desktop_database_post %endif %if %build_qt3 diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 2946994..a60b73b 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -785,7 +785,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces %endif -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %else # There is no simple way to not install core files. Remove them here. # The rest is enabled/disabled in configure as needed. @@ -913,6 +913,18 @@ fi %post -n libavahi-glib1 -p /sbin/ldconfig %postun -n libavahi-glib1 -p /sbin/ldconfig + +%post -n python-avahi-gtk +%desktop_database_post + +%postun -n python-avahi-gtk +%desktop_database_post + +%post -n avahi-utils-gtk +%desktop_database_post + +%postun -n avahi-utils-gtk +%desktop_database_post %endif %if %build_qt3 diff --git a/avahi.changes b/avahi.changes index 2f5b197..517be99 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Feb 13 13:48:53 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. + ------------------------------------------------------------------- Tue Dec 7 21:18:09 UTC 2010 - coolo@novell.com diff --git a/avahi.spec b/avahi.spec index cfbc055..434b18f 100644 --- a/avahi.spec +++ b/avahi.spec @@ -785,7 +785,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces %endif -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %else # There is no simple way to not install core files. Remove them here. # The rest is enabled/disabled in configure as needed. @@ -913,6 +913,18 @@ fi %post -n libavahi-glib1 -p /sbin/ldconfig %postun -n libavahi-glib1 -p /sbin/ldconfig + +%post -n python-avahi-gtk +%desktop_database_post + +%postun -n python-avahi-gtk +%desktop_database_post + +%post -n avahi-utils-gtk +%desktop_database_post + +%postun -n avahi-utils-gtk +%desktop_database_post %endif %if %build_qt3