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
This commit is contained in:
Vincent Untz 2011-02-13 21:03:36 +00:00 committed by Git OBS Bridge
parent 51ccc77546
commit 98e98e9c01
5 changed files with 61 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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