pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 231663 from GNOME:Factory

Browse Source 
Push GNOME:Factory - GNOME 3.12.1

OBS-URL: https://build.opensuse.org/request/show/231663
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=108
This commit is contained in:
Stephan Kulow 2014-05-05 19:14:03 +00:00 committed by Git OBS Bridge
commit def3b17bb4
5 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avahi-glib2.spec
View File

@ -111,7 +111,6 @@ BuildRequires: libtool
%define python_sitelib %{py_sitedir}
%endif
%if %build_core
BuildRequires: gnome-icon-theme
PreReq: pwdutils
%if %suse_version >= 1140
PreReq: sysvinit(network)
@ -915,9 +914,6 @@ ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dn
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
# network-wired icon is available only in GNOME. Install network-wired.png as fallback system-wide icon. (Avahi#365)
# The icon is installed as part of core, as any of %%build_glib2 subpackages can be installed separately.
install -m 644 /usr/share/icons/gnome/48x48/devices/network-wired.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/network-wired.png
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
%if ! %build_glib2
@ -1116,8 +1112,6 @@ fi
%files
%defattr(-,root,root)
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/network-wired.png
%dir %{_libdir}/avahi/
# Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils:
%{_libdir}/avahi/service-types.db

6
avahi-mono.spec
View File

@ -111,7 +111,6 @@ BuildRequires: libtool
%define python_sitelib %{py_sitedir}
%endif
%if %build_core
BuildRequires: gnome-icon-theme
PreReq: pwdutils
%if %suse_version >= 1140
PreReq: sysvinit(network)
@ -914,9 +913,6 @@ ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dn
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
# network-wired icon is available only in GNOME. Install network-wired.png as fallback system-wide icon. (Avahi#365)
# The icon is installed as part of core, as any of %%build_glib2 subpackages can be installed separately.
install -m 644 /usr/share/icons/gnome/48x48/devices/network-wired.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/network-wired.png
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
%if ! %build_glib2
@ -1115,8 +1111,6 @@ fi
%files
%defattr(-,root,root)
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/network-wired.png
%dir %{_libdir}/avahi/
# Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils:
%{_libdir}/avahi/service-types.db

6
avahi-qt4.spec
View File

@ -111,7 +111,6 @@ BuildRequires: libtool
%define python_sitelib %{py_sitedir}
%endif
%if %build_core
BuildRequires: gnome-icon-theme
PreReq: pwdutils
%if %suse_version >= 1140
PreReq: sysvinit(network)
@ -917,9 +916,6 @@ ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dn
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
# network-wired icon is available only in GNOME. Install network-wired.png as fallback system-wide icon. (Avahi#365)
# The icon is installed as part of core, as any of %%build_glib2 subpackages can be installed separately.
install -m 644 /usr/share/icons/gnome/48x48/devices/network-wired.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/network-wired.png
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
%if ! %build_glib2
@ -1118,8 +1114,6 @@ fi
%files
%defattr(-,root,root)
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/network-wired.png
%dir %{_libdir}/avahi/
# Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils:
%{_libdir}/avahi/service-types.db

12
avahi.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Apr 26 20:06:15 UTC 2014 - dmueller@suse.com
- Do not depend on gnome-icon-theme:
+ the network-wired icon is meanwhile available in faenza, gnome,
mate, nimbus oxygen and tango icon theme.
+ the dependency causes avahi depending on gtk3, which causes a
build loop with gtk2.
+ the avahi-desktop.patch causes these desktop files to be only
shown in GTK based desktops, which have any of those icon
themes available.
-------------------------------------------------------------------
Tue Apr 15 15:55:46 UTC 2014 - aj@suse.com

6
avahi.spec
View File

@ -113,7 +113,6 @@ BuildRequires: libtool
%define python_sitelib %{py_sitedir}
%endif
%if %build_core
BuildRequires: gnome-icon-theme
PreReq: pwdutils
%if %suse_version >= 1140
PreReq: sysvinit(network)
@ -917,9 +916,6 @@ ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dn
install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
# network-wired icon is available only in GNOME. Install network-wired.png as fallback system-wide icon. (Avahi#365)
# The icon is installed as part of core, as any of %%build_glib2 subpackages can be installed separately.
install -m 644 /usr/share/icons/gnome/48x48/devices/network-wired.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/network-wired.png
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 sysconfig.avahi* $RPM_BUILD_ROOT/var/adm/fillup-templates/
%if ! %build_glib2
@ -1118,8 +1114,6 @@ fi
%files
%defattr(-,root,root)
%doc LICENSE docs/*
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
%{_datadir}/pixmaps/network-wired.png
%dir %{_libdir}/avahi/
# Note: This file is intentionally packaged here. It is needed for python-avahi and avahi-utils:
%{_libdir}/avahi/service-types.db