This commit is contained in:
parent
41ec9638cc
commit
883a3c9575
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 15 18:21:42 CET 2008 - sbrabec@suse.cz
|
||||
|
||||
- avahi-discover.glade is required by avahi-utils-gtk and
|
||||
python-avahi-gtk => move to avahi (bnc#456418).
|
||||
- Upgrade protection for avahi-utils-gtk built as
|
||||
avahi-glib2-utils-gtk (bnc#456418).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 1 10:22:46 CEST 2008 - meissner@suse.de
|
||||
|
||||
|
@ -31,7 +31,7 @@ Name: avahi-glib2
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.23
|
||||
Release: 8
|
||||
Release: 9
|
||||
%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})
|
||||
@ -88,6 +88,8 @@ Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
@ -528,6 +530,16 @@ License: LGPL v2.1 or later
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
Requires: %{_name} >= %{version}
|
||||
Group: System/Daemons
|
||||
%if "%name" == "avahi"
|
||||
# Due to a mistake in the spec file build staging, this package have
|
||||
# name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in
|
||||
# all other products. This bug happens only in multi-stage build.
|
||||
Provides: avahi-glib2-utils-gtk = %{version}
|
||||
Obsoletes: avahi-glib2-utils-gtk < %{version}
|
||||
%else
|
||||
Provides: avahi-utils-gtk = %{version}
|
||||
Obsoletes: avahi-utils-gtk < %{version}
|
||||
%endif
|
||||
|
||||
%description utils-gtk
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
@ -950,6 +962,11 @@ install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%if ! %build_glib2
|
||||
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
%endif
|
||||
%find_lang %{name}
|
||||
%else
|
||||
# There is no simple way to not install core files. Remove them here.
|
||||
@ -977,6 +994,10 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-autoipd.action.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
|
||||
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
|
||||
%else
|
||||
%if %build_mono
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
@ -1109,6 +1130,9 @@ fi
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
# Common file for avahi-utils-gtk and python-avahi-gtk:
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
@ -1222,8 +1246,6 @@ fi
|
||||
%{_bindir}/avahi-discover-standalone
|
||||
%{_datadir}/applications/bssh.desktop
|
||||
%{_datadir}/applications/bvnc.desktop
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
%doc %{_mandir}/man1/bssh.1.*
|
||||
%doc %{_mandir}/man1/bvnc.1.*
|
||||
|
||||
@ -1290,6 +1312,11 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Dec 15 2008 sbrabec@suse.cz
|
||||
- avahi-discover.glade is required by avahi-utils-gtk and
|
||||
python-avahi-gtk => move to avahi (bnc#456418).
|
||||
- Upgrade protection for avahi-utils-gtk built as
|
||||
avahi-glib2-utils-gtk (bnc#456418).
|
||||
* Mon Sep 01 2008 meissner@suse.de
|
||||
- Added GCC attribute alloc_size markup for allocator functions
|
||||
* Mon Aug 04 2008 ro@suse.de
|
||||
|
@ -31,7 +31,7 @@ Name: avahi-mono
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.23
|
||||
Release: 56
|
||||
Release: 57
|
||||
%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})
|
||||
@ -88,6 +88,8 @@ Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
@ -527,6 +529,16 @@ License: LGPL v2.1 or later
|
||||
Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour
|
||||
Requires: %{_name} >= %{version}
|
||||
Group: Productivity/Networking/Other
|
||||
%if "%name" == "avahi"
|
||||
# Due to a mistake in the spec file build staging, this package have
|
||||
# name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in
|
||||
# all other products. This bug happens only in multi-stage build.
|
||||
Provides: avahi-glib2-utils-gtk = %{version}
|
||||
Obsoletes: avahi-glib2-utils-gtk < %{version}
|
||||
%else
|
||||
Provides: avahi-utils-gtk = %{version}
|
||||
Obsoletes: avahi-utils-gtk < %{version}
|
||||
%endif
|
||||
|
||||
%description utils-gtk
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
@ -949,6 +961,11 @@ install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%if ! %build_glib2
|
||||
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
%endif
|
||||
%find_lang %{name}
|
||||
%else
|
||||
# There is no simple way to not install core files. Remove them here.
|
||||
@ -976,6 +993,10 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-autoipd.action.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
|
||||
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
|
||||
%else
|
||||
%if %build_mono
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
@ -1108,6 +1129,9 @@ fi
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
# Common file for avahi-utils-gtk and python-avahi-gtk:
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
@ -1221,8 +1245,6 @@ fi
|
||||
%{_bindir}/avahi-discover-standalone
|
||||
%{_datadir}/applications/bssh.desktop
|
||||
%{_datadir}/applications/bvnc.desktop
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
%doc %{_mandir}/man1/bssh.1.*
|
||||
%doc %{_mandir}/man1/bvnc.1.*
|
||||
|
||||
|
@ -31,7 +31,7 @@ Name: avahi-qt4
|
||||
%define build_qt3 0
|
||||
%define build_qt4 1
|
||||
Version: 0.6.23
|
||||
Release: 8
|
||||
Release: 9
|
||||
%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})
|
||||
@ -88,6 +88,8 @@ Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
@ -530,6 +532,16 @@ License: LGPL v2.1 or later
|
||||
Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour
|
||||
Requires: %{_name} >= %{version}
|
||||
Group: Productivity/Networking/Other
|
||||
%if "%name" == "avahi"
|
||||
# Due to a mistake in the spec file build staging, this package have
|
||||
# name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in
|
||||
# all other products. This bug happens only in multi-stage build.
|
||||
Provides: avahi-glib2-utils-gtk = %{version}
|
||||
Obsoletes: avahi-glib2-utils-gtk < %{version}
|
||||
%else
|
||||
Provides: avahi-utils-gtk = %{version}
|
||||
Obsoletes: avahi-utils-gtk < %{version}
|
||||
%endif
|
||||
|
||||
%description utils-gtk
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
@ -952,6 +964,11 @@ install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%if ! %build_glib2
|
||||
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
%endif
|
||||
%find_lang %{name}
|
||||
%else
|
||||
# There is no simple way to not install core files. Remove them here.
|
||||
@ -979,6 +996,10 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-autoipd.action.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
|
||||
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
|
||||
%else
|
||||
%if %build_mono
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
@ -1111,6 +1132,9 @@ fi
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
# Common file for avahi-utils-gtk and python-avahi-gtk:
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
@ -1224,8 +1248,6 @@ fi
|
||||
%{_bindir}/avahi-discover-standalone
|
||||
%{_datadir}/applications/bssh.desktop
|
||||
%{_datadir}/applications/bvnc.desktop
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
%doc %{_mandir}/man1/bssh.1.*
|
||||
%doc %{_mandir}/man1/bvnc.1.*
|
||||
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 15 18:21:42 CET 2008 - sbrabec@suse.cz
|
||||
|
||||
- avahi-discover.glade is required by avahi-utils-gtk and
|
||||
python-avahi-gtk => move to avahi (bnc#456418).
|
||||
- Upgrade protection for avahi-utils-gtk built as
|
||||
avahi-glib2-utils-gtk (bnc#456418).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 24 15:22:14 CET 2008 - sbrabec@suse.cz
|
||||
|
||||
|
33
avahi.spec
33
avahi.spec
@ -33,7 +33,7 @@ Name: avahi
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.23
|
||||
Release: 37
|
||||
Release: 38
|
||||
%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})
|
||||
@ -90,6 +90,8 @@ Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
@ -530,6 +532,16 @@ License: LGPL v2.1 or later
|
||||
Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour
|
||||
Requires: %{_name} >= %{version}
|
||||
Group: Productivity/Networking/Other
|
||||
%if "%name" == "avahi"
|
||||
# Due to a mistake in the spec file build staging, this package have
|
||||
# name avahi-glib2-utils-gtk in 11.1 and SLE11 and avahi-utils-gtk in
|
||||
# all other products. This bug happens only in multi-stage build.
|
||||
Provides: avahi-glib2-utils-gtk = %{version}
|
||||
Obsoletes: avahi-glib2-utils-gtk < %{version}
|
||||
%else
|
||||
Provides: avahi-utils-gtk = %{version}
|
||||
Obsoletes: avahi-utils-gtk < %{version}
|
||||
%endif
|
||||
|
||||
%description utils-gtk
|
||||
Avahi is an implementation of the DNS Service Discovery and Multicast
|
||||
@ -952,6 +964,11 @@ install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se
|
||||
ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
|
||||
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%if ! %build_glib2
|
||||
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
%endif
|
||||
%find_lang %{name}
|
||||
%else
|
||||
# There is no simple way to not install core files. Remove them here.
|
||||
@ -979,6 +996,10 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-autoipd.action.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
|
||||
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
|
||||
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
|
||||
%else
|
||||
%if %build_mono
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
|
||||
@ -1111,6 +1132,9 @@ fi
|
||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
%{_sysconfdir}/init.d/avahi-dnsconfd
|
||||
%{_sysconfdir}/init.d/avahi-daemon
|
||||
# Common file for avahi-utils-gtk and python-avahi-gtk:
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
@ -1224,8 +1248,6 @@ fi
|
||||
%{_bindir}/avahi-discover-standalone
|
||||
%{_datadir}/applications/bssh.desktop
|
||||
%{_datadir}/applications/bvnc.desktop
|
||||
%dir %{_datadir}/avahi/
|
||||
%{_datadir}/avahi/interfaces
|
||||
%doc %{_mandir}/man1/bssh.1.*
|
||||
%doc %{_mandir}/man1/bvnc.1.*
|
||||
|
||||
@ -1292,6 +1314,11 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Dec 15 2008 sbrabec@suse.cz
|
||||
- avahi-discover.glade is required by avahi-utils-gtk and
|
||||
python-avahi-gtk => move to avahi (bnc#456418).
|
||||
- Upgrade protection for avahi-utils-gtk built as
|
||||
avahi-glib2-utils-gtk (bnc#456418).
|
||||
* Mon Nov 24 2008 sbrabec@suse.cz
|
||||
- Removed dependency libavahi-common3 -> avahi (bnc#447101).
|
||||
* Thu Oct 23 2008 maw@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user