diff --git a/.abf.yml b/.abf.yml index 5fbc7fa..a8937f2 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "avahi-0.6.29.tar.gz": af13ae6fdb3cd61b2eafa25a108773156d88b362 + "avahi-0.6.31.tar.gz": 7e05bd78572c9088b03b1207a0ad5aba38490684 diff --git a/avahi-hostname.sh b/avahi-hostname.sh old mode 100755 new mode 100644 diff --git a/avahi.spec b/avahi.spec index c478461..ac2c277 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,57 +1,57 @@ -%define name avahi -%define version 0.6.29 +%define client_name %{name}-client +%define common_name %{name}-common +%define core_name %{name}-core +%define dns_sd_name %{name}-compat-libdns_sd +%define glib_name %{name}-glib +%define gobject_name %{name}-gobject +%define howl_name %{name}-compat-howl +%define qt3_name %{name}-qt3 +%define qt4_name %{name}-qt4 +%define ui_name %{name}-ui +%define ui_gtk3_name %{name}-ui-gtk3 -%define release %mkrel 2 +%define dns_sd_old_name mDNSResponder +%define howl_old_name howl -%define client_name %{name}-client -%define common_name %{name}-common -%define core_name %{name}-core -%define dns_sd_name %{name}-compat-libdns_sd -%define glib_name %{name}-glib -%define gobject_name %name-gobject -%define howl_name %{name}-compat-howl -%define qt3_name %{name}-qt3 -%define qt4_name %{name}-qt4 -%define ui_name %{name}-ui +%define client_major 3 +%define common_major 3 +%define core_major 7 +%define dns_sd_major 1 +%define glib_major 1 +%define gobject_major 0 +%define howl_major 0 +%define qt3_major 1 +%define qt4_major 1 +%define ui_major 0 +%define ui_gtk3_major 0 -%define dns_sd_old_name mDNSResponder -%define howl_old_name howl +%define lib_client_name %mklibname %{client_name} %{client_major} +%define develnameclient %mklibname -d %{client_name} +%define lib_common_name %mklibname %{common_name} %{common_major} +%define develnamecommon %mklibname -d %{common_name} +%define lib_core_name %mklibname %{core_name} %{core_major} +%define develnamecore %mklibname -d %{core_name} +%define lib_dns_sd_name %mklibname %{dns_sd_name} %{dns_sd_major} +%define develnamedns_sd %mklibname -d %{dns_sd_name} +%define lib_glib_name %mklibname %{glib_name} %{glib_major} +%define develnameglib %mklibname -d %{glib_name} +%define lib_gobject_name %mklibname %{gobject_name} %{gobject_major} +%define develnamegobject %mklibname -d %{gobject_name} +%define lib_howl_name %mklibname %{howl_name} %{howl_major} +%define develnamehowl %mklibname -d %{howl_name} +%define lib_qt3_name %mklibname %{qt3_name}_ %{qt3_major} +%define develnameqt3 %mklibname -d %{qt3_name} +%define lib_qt4_name %mklibname %{qt4_name}_ %{qt4_major} +%define develnameqt4 %mklibname -d %{qt4_name} +### not worth it to fix now b/c 1 > 0, but ui_major should be used not qt3_major +%define lib_ui_name %mklibname %{ui_name} %{qt3_major} +%define develnameui %mklibname -d %{ui_name} +%define lib_ui_gtk3_name %mklibname %{ui_gtk3_name}_ %{ui_gtk3_major} +%define develnameui_gtk3 %mklibname -d %{ui_gtk3_name} -%define client_major 3 -%define common_major 3 -%define core_major 7 -%define dns_sd_major 1 -%define glib_major 1 -%define gobject_major 0 -%define howl_major 0 -%define qt3_major 1 -%define qt4_major 1 -%define ui_major 0 - -%define lib_client_name %mklibname %{client_name} %{client_major} -%define develnameclient %mklibname -d %client_name -%define lib_common_name %mklibname %{common_name} %{common_major} -%define develnamecommon %mklibname -d %common_name -%define lib_core_name %mklibname %{core_name} %{core_major} -%define develnamecore %mklibname -d %core_name -%define lib_dns_sd_name %mklibname %{dns_sd_name} %{dns_sd_major} -%define develnamedns_sd %mklibname -d %dns_sd_name -%define lib_glib_name %mklibname %{glib_name} %{glib_major} -%define develnameglib %mklibname -d %glib_name -%define lib_gobject_name %mklibname %{gobject_name} %{gobject_major} -%define develnamegobject %mklibname -d %gobject_name -%define lib_howl_name %mklibname %{howl_name} %{howl_major} -%define develnamehowl %mklibname -d %howl_name -%define lib_qt3_name %mklibname %{qt3_name}_ %{qt3_major} -%define develnameqt3 %mklibname -d %{qt3_name} -%define lib_qt4_name %mklibname %{qt4_name}_ %{qt4_major} -%define develnameqt4 %mklibname -d %qt4_name -%define lib_ui_name %mklibname %{ui_name} %{qt3_major} -%define develnameui %mklibname -d %ui_name - -%define lib_dns_sd_old_name %mklibname %{dns_sd_old_name} 1 -%define lib_howl_old_name %mklibname %{howl_old_name} 0 -%define lib_howl_fake_EVR 1.0.0-7mdk +%define lib_dns_sd_old_name %mklibname %{dns_sd_old_name} 1 +%define lib_howl_old_name %mklibname %{howl_old_name} 0 +%define lib_howl_fake_EVR 1.0.0-7 %define build_mono 1 %{?_with_mono: %{expand: %%global build_mono 1}} @@ -61,60 +61,72 @@ %define build_mono 0 %endif +%define build_qt3 1 +%{?_with_qt3: %{expand: %%global build_qt3 1}} +%{?_without_qt3: %{expand: %%global build_qt3 0}} + %define build_qt4 1 %{?_with_qt4: %{expand: %%global build_qt4 1}} %{?_without_qt4: %{expand: %%global build_qt4 0}} +%define build_gtk3 1 +%{?_with_gtk3: %{expand: %%global build_gtk3 1}} +%{?_without_gtk3: %{expand: %%global build_gtk3 0}} + +%define build_systemd 1 +%{?_with_systemd: %{expand: %%global build_systemd 1}} +%{?_without_systemd: %{expand: %%global build_systemd 0}} + %define build_bootstrap 0 %{?_with_bootstrap: %{expand: %%global build_bootstrap 1}} %if %{build_bootstrap} %define build_mono 0 +%define build_qt3 0 %define build_qt4 0 +%define build_gtk3 0 +%define build_systemd 0 %endif -%define _with_systemd 1 +Summary: Avahi service discovery (mDNS/DNS-SD) suite +Name: avahi +Version: 0.6.31 +Release: 3 +License: LGPLv2+ +Group: System/Servers +Url: http://avahi.org/ -Summary: Avahi service discovery (mDNS/DNS-SD) suite -Name: %{name} -Version: %{version} -Release: %{release} -Source0: http://avahi.org/download/%{name}-%{version}.tar.gz -Source1: avahi-hostname.sh -License: LGPLv2+ -Group: System/Servers -Url: http://avahi.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: daemon-devel -BuildRequires: dbus-devel -BuildRequires: dbus-python -BuildRequires: libexpat-devel >= 2.0.1 -BuildRequires: libgdbm-devel -BuildRequires: libglade2.0-devel +Source0: http://avahi.org/download/%{name}-%{version}.tar.gz +Source1: avahi-hostname.sh + +BuildRequires: cap-devel +BuildRequires: expat-devel >= 2.0.1 +BuildRequires: gdbm-devel +BuildRequires: intltool +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-python) +BuildRequires: pkgconfig(libdaemon) +BuildRequires: pkgconfig(libglade-2.0) BuildRequires: pygtk2.0 -BuildRequires: qt3-devel -BuildRequires: libcap-devel -%if %build_qt4 -BuildRequires: qt4-devel +%if %{build_qt3} +BuildRequires: pkgconfig(qt-mt) %endif -#needed by autoreconf -BuildRequires: intltool -%if %{_with_systemd} +%if %{build_qt4} +BuildRequires: pkgconfig(QtCore) +%endif +%if %{build_gtk3} +BuildRequires: pkgconfig(gtk+-3.0) +%endif +%if %{build_systemd} BuildRequires: systemd-units -BuildRequires: libsystemd-daemon-devel %endif + Requires(pre): rpm-helper Requires(postun): rpm-helper Requires(post): rpm-helper Requires(preun): rpm-helper Requires(post): dbus Requires(preun): dbus -Obsoletes: howl -Provides: howl -Obsoletes: tmdns -Provides: tmdns -Obsoletes: mDNSResponder -Provides: mDNSResponder -Suggests: nss_mdns +Suggests: nss_mdns %description Avahi is a system which facilitates service discovery on a local @@ -125,52 +137,55 @@ of technology is already found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very convenient. %package dnsconfd -Group: System/Servers -Summary: Avahi DNS configuration server -Requires: %{name} = %{version} -Requires(post): rpm-helper +Group: System/Servers +Summary: Avahi DNS configuration server +Requires: %{name} = %{version}-%{release} +Requires(post): rpm-helper Requires(preun): rpm-helper + %description dnsconfd avahi-dnsconfd is a small daemon which may be used to configure conventional DNS servers using mDNS in a DHCP-like fashion. Especially useful on IPv6. %package x11 -Group: System/Servers -Summary: Graphical tools for Avahi -Requires: %{name} = %{version} +Group: System/Servers +Summary: Graphical tools for Avahi +Requires: %{name} = %{version}-%{release} + %description x11 Graphical tools for Avahi. It includes avahi-discover-standalone. -%package python -Group: System/Libraries -Summary: Python bindings and utilities for Avahi -Requires: pygtk2.0-libglade python-twisted-core -Requires: python-twisted-web dbus-python avahi -Requires: %{name}-x11 +%package python +Group: System/Libraries +Summary: Python bindings and utilities for Avahi +Requires: pygtk2.0-libglade python-twisted-core +Requires: python-twisted-web dbus-python avahi +Requires: %{name}-x11 + %description python Python bindings and utilities for Avahi. It includes avahi-bookmarks and avahi-discover. -%if %build_mono +%if %{build_mono} %package sharp -Group: System/Libraries -Summary: Mono bindings for Avahi -BuildRequires: mono-devel mono-tools +Group: System/Libraries +Summary: Mono bindings for Avahi +BuildRequires: mono-devel mono-tools #gw this is needed by mono-find-requires: -BuildRequires: avahi-ui-devel -Requires: %lib_client_name = %version -Requires: %lib_common_name = %version -Requires: %lib_glib_name = %version +BuildRequires: avahi-ui-devel +Requires: %{lib_client_name} = %{version}-%{release} +Requires: %{lib_common_name} = %{version}-%{release} +Requires: %{lib_glib_name} = %{version}-%{release} %description sharp Mono bindings for Avahi. %package sharp-doc -Summary: Development documentation for avahi-sharp -Group: Development/Other -Requires(post): mono-tools >= 1.1.9 +Summary: Development documentation for avahi-sharp +Group: Development/Other +Requires(post): mono-tools >= 1.1.9 Requires(postun): mono-tools >= 1.1.9 %description sharp-doc @@ -179,202 +194,233 @@ Monodoc format. %endif %package -n %{lib_client_name} -Group: System/Libraries -Summary: Library for avahi-client -Requires: %{name} >= %{version} +Group: System/Libraries +Summary: Library for avahi-client + %description -n %{lib_client_name} Library for avahi-client. -%package -n %develnameclient -Group: Development/C -Summary: Devel library for avahi-client -Provides: %{client_name}-devel = %{version}-%{release} -Provides: lib%{client_name}-devel = %{version}-%{release} -Requires: %{lib_client_name} = %{version} -Obsoletes: %mklibname -d %client_name 3 +%package -n %{develnameclient} +Group: Development/C +Summary: Devel library for avahi-client +Provides: %{client_name}-devel = %{version}-%{release} +Provides: lib%{client_name}-devel = %{version}-%{release} +Requires: %{lib_client_name} = %{version}-%{release} +Obsoletes: %{mklibname -d %{client_name} 3} < 0.6.31 -%description -n %develnameclient +%description -n %{develnameclient} Devel library for avahi-client. %package -n %{lib_common_name} -Group: System/Libraries -Summary: Library for avahi-common +Group: System/Libraries +Summary: Library for avahi-common + %description -n %{lib_common_name} Library for avahi-common. -%package -n %develnamecommon -Group: Development/C -Summary: Devel library for avahi-common -Provides: %{common_name}-devel = %{version}-%{release} -Provides: lib%{common_name}-devel = %{version}-%{release} -Requires: %{lib_common_name} = %{version} -Obsoletes: %mklibname -d %common_name 3 +%package -n %{develnamecommon} +Group: Development/C +Summary: Devel library for avahi-common +Provides: %{common_name}-devel = %{version}-%{release} +Provides: lib%{common_name}-devel = %{version}-%{release} +Requires: %{lib_common_name} = %{version}-%{release} +Obsoletes: %{mklibname -d %{common_name} 3} < 0.6.31 -%description -n %develnamecommon +%description -n %{develnamecommon} Devel library for avahi-common. %package -n %{lib_core_name} -Group: System/Libraries -Summary: Library for avahi-core +Group: System/Libraries +Summary: Library for avahi-core + %description -n %{lib_core_name} Library for avahi-core. -%package -n %develnamecore -Group: Development/C -Summary: Devel library for avahi-core -Provides: %{core_name}-devel = %{version}-%{release} -Provides: lib%{core_name}-devel = %{version}-%{release} -Requires: %{lib_core_name} = %{version} -Obsoletes: %mklibname -d %core_name 5 +%package -n %{develnamecore} +Group: Development/C +Summary: Devel library for avahi-core +Provides: %{core_name}-devel = %{version}-%{release} +Provides: lib%{core_name}-devel = %{version}-%{release} +Requires: %{lib_core_name} = %{version}-%{release} +Obsoletes: %{mklibname -d %{core_name} 5} < 0.6.31 -%description -n %develnamecore +%description -n %{develnamecore} Devel library for avahi-core. %package -n %{lib_dns_sd_name} -Group: System/Libraries -Summary: Avahi compatibility library for libdns_sd -Obsoletes: %{lib_dns_sd_old_name} -Provides: %{lib_dns_sd_old_name} +Group: System/Libraries +Summary: Avahi compatibility library for libdns_sd +Obsoletes: %{lib_dns_sd_old_name} < 0.6.31 +Provides: %{lib_dns_sd_old_name} + %description -n %{lib_dns_sd_name} Avahi compatibility library for libdns_sd -%package -n %develnamedns_sd -Group: Development/C -Summary: Avahi devel compatibility library for libdns_sd -Provides: %{dns_sd_name}-devel = %{version}-%{release} -Provides: lib%{dns_sd_name}-devel = %{version}-%{release} -Requires: %{lib_dns_sd_name} = %{version} -Obsoletes: %{lib_dns_sd_old_name}-devel -Provides: %{lib_dns_sd_old_name}-devel -Provides: %{dns_sd_old_name}-devel = %{version}-%{release} -Provides: lib%{dns_sd_old_name}-devel = %{version}-%{release} -Obsoletes: %mklibname -d %dns_sd_name 1 +%package -n %{develnamedns_sd} +Group: Development/C +Summary: Avahi devel compatibility library for libdns_sd +Provides: %{dns_sd_name}-devel = %{version}-%{release} +Provides: lib%{dns_sd_name}-devel = %{version}-%{release} +Requires: %{lib_dns_sd_name} = %{version}-%{release} +Obsoletes: %{lib_dns_sd_old_name}-devel < 0.6.31 +Provides: %{lib_dns_sd_old_name}-devel +Provides: %{dns_sd_old_name}-devel = %{version}-%{release} +Provides: lib%{dns_sd_old_name}-devel = %{version}-%{release} +Obsoletes: %{mklibname -d %{dns_sd_name} 1} < 0.6.31 -%description -n %develnamedns_sd +%description -n %{develnamedns_sd} Avahi devel compatibility library for libdns_sd. %package -n %{lib_glib_name} -Group: System/Libraries -Summary: Library for avahi-glib +Group: System/Libraries +Summary: Library for avahi-glib + %description -n %{lib_glib_name} Library for avahi-glib. -%package -n %develnameglib -Group: Development/C -Summary: Devel library for avahi-glib -Provides: %{glib_name}-devel = %{version}-%{release} -Provides: lib%{glib_name}-devel = %{version}-%{release} -Requires: %{lib_glib_name} = %{version} -Obsoletes: %mklibname -d %glib_name 1 +%package -n %{develnameglib} +Group: Development/C +Summary: Devel library for avahi-glib +Provides: %{glib_name}-devel = %{version}-%{release} +Provides: lib%{glib_name}-devel = %{version}-%{release} +Requires: %{lib_glib_name} = %{version}-%{release} +Obsoletes: %{mklibname -d %{glib_name} 1} < 0.6.31 -%description -n %develnameglib +%description -n %{develnameglib} Devel library for avahi-glib. %package -n %{lib_gobject_name} -Group: System/Libraries -Summary: Library for avahi-gobject +Group: System/Libraries +Summary: Library for avahi-gobject + %description -n %{lib_gobject_name} Library for avahi-gobject. -%package -n %develnamegobject -Group: Development/C -Summary: Devel library for avahi-gobject -Provides: %{gobject_name}-devel = %{version}-%{release} -Provides: lib%{gobject_name}-devel = %{version}-%{release} -Requires: %{lib_gobject_name} = %{version} +%package -n %{develnamegobject} +Group: Development/C +Summary: Devel library for avahi-gobject +Provides: %{gobject_name}-devel = %{version}-%{release} +Provides: lib%{gobject_name}-devel = %{version}-%{release} +Requires: %{lib_gobject_name} = %{version}-%{release} -%description -n %develnamegobject +%description -n %{develnamegobject} Devel library for avahi-gobject. %package -n %{lib_howl_name} -Group: System/Libraries -Summary: Avahi compatibility library for howl -Obsoletes: %{lib_howl_old_name} -Provides: %{lib_howl_old_name} = %{lib_howl_fake_EVR} +Group: System/Libraries +Summary: Avahi compatibility library for howl +Obsoletes: %{lib_howl_old_name} < 0.6.31 +Provides: %{lib_howl_old_name} = %{lib_howl_fake_EVR} + %description -n %{lib_howl_name} Avahi compatibility library for howl. -%package -n %develnamehowl -Group: Development/C -Summary: Avahi devel compatibility library for libdns_sd for howl -Provides: %{howl_name}-devel = %{version}-%{release} -Provides: lib%{howl_name}-devel = %{version}-%{release} -Requires: %{lib_howl_name} = %{version} -Obsoletes: %{lib_howl_old_name}-devel -Provides: %{lib_howl_old_name}-devel = %{lib_howl_fake_EVR} -Provides: %{howl_old_name}-devel = %{version}-%{release} -Provides: lib%{howl_old_name}-devel = %{version}-%{release} -Obsoletes: %mklibname -d %howl_name 0 +%package -n %{develnamehowl} +Group: Development/C +Summary: Avahi devel compatibility library for libdns_sd for howl +Provides: %{howl_name}-devel = %{version}-%{release} +Provides: lib%{howl_name}-devel = %{version}-%{release} +Requires: %{lib_howl_name} = %{version}-%{release} +Obsoletes: %{lib_howl_old_name}-devel < 0.6.31 +Provides: %{lib_howl_old_name}-devel = %{lib_howl_fake_EVR} +Provides: %{howl_old_name}-devel = %{version}-%{release} +Provides: lib%{howl_old_name}-devel = %{version}-%{release} +Obsoletes: %{mklibname -d %{howl_name} 0} < 0.6.31 - -%description -n %develnamehowl +%description -n %{develnamehowl} Avahi devel compatibility library for libdns_sd for howl. +%if %{build_qt3} %package -n %{lib_qt3_name} -Group: System/Libraries -Summary: Library for avahi-qt3 +Group: System/Libraries +Summary: Library for avahi-qt3 + %description -n %{lib_qt3_name} Library for avahi-qt3. -%package -n %develnameqt3 -Group: Development/C -Summary: Devel library for avahi-qt3 -Provides: %{qt3_name}-devel = %{version}-%{release} -Provides: lib%{qt3_name}-devel = %{version}-%{release} -Requires: %{lib_qt3_name} = %{version} -Obsoletes: %mklibname -d %{qt3_name}_ 1 +%package -n %{develnameqt3} +Group: Development/C +Summary: Devel library for avahi-qt3 +Provides: %{qt3_name}-devel = %{version}-%{release} +Provides: lib%{qt3_name}-devel = %{version}-%{release} +Requires: %{lib_qt3_name} = %{version}-%{release} +Obsoletes: %{mklibname -d %{qt3_name}_ 1} < 0.6.31 %description -n %{develnameqt3} Devel library for avahi-qt3. +%endif -%if %build_qt4 +%if %{build_qt4} %package -n %{lib_qt4_name} -Group: System/Libraries -Summary: Library for avahi-qt4 +Group: System/Libraries +Summary: Library for avahi-qt4 + %description -n %{lib_qt4_name} Library for avahi-qt4. -%package -n %develnameqt4 -Group: Development/C -Summary: Devel library for avahi-qt4 -Provides: %{qt4_name}-devel = %{version}-%{release} -Provides: lib%{qt4_name}-devel = %{version}-%{release} -Requires: %{lib_qt4_name} = %{version} -Obsoletes: %mklibname -d %{qt4_name}_ 1 +%package -n %{develnameqt4} +Group: Development/C +Summary: Devel library for avahi-qt4 +Provides: %{qt4_name}-devel = %{version}-%{release} +Provides: lib%{qt4_name}-devel = %{version}-%{release} +Requires: %{lib_qt4_name} = %{version}-%{release} +Obsoletes: %{mklibname -d %{qt4_name}_ 1} < 0.6.31 -%description -n %develnameqt4 +%description -n %{develnameqt4} Devel library for avahi-qt4. %endif %package -n %{lib_ui_name} -Group: System/Libraries -Summary: Library for avahi-ui +Group: System/Libraries +Summary: Library for avahi-ui + %description -n %{lib_ui_name} Library for avahi-ui. -%package -n %develnameui -Group: Development/C -Summary: Devel library for avahi-ui -Provides: %{ui_name}-devel = %{version}-%{release} -Provides: lib%{ui_name}-devel = %{version}-%{release} -Requires: %{lib_ui_name} = %{version} -Obsoletes: %mklibname -d %{ui_name} 1 +%package -n %{develnameui} +Group: Development/C +Summary: Devel library for avahi-ui +Provides: %{ui_name}-devel = %{version}-%{release} +Provides: lib%{ui_name}-devel = %{version}-%{release} +Requires: %{lib_ui_name} = %{version}-%{release} +Obsoletes: %{mklibname -d %{ui_name} 1} < 0.6.31 -%description -n %develnameui +%description -n %{develnameui} Devel library for avahi-ui. +%if %{build_gtk3} +%package -n %{lib_ui_gtk3_name} +Group: System/Libraries +Summary: Library for avahi-gtk3 + +%description -n %{lib_ui_gtk3_name} +Library for avahi-gtk3. + +%package -n %{develnameui_gtk3} +Group: Development/C +Summary: Devel library for avahi-gtk3 +Provides: %{ui_gtk3_name}-devel = %{version}-%{release} +Requires: %{lib_ui_gtk3_name} = %{version}-%{release} + +%description -n %{develnameui_gtk3} +Devel library for avahi-gtk3. +%endif + %prep %setup -q - cp %{SOURCE1} avahi-hostname.sh %build export PKG_CONFIG_PATH=/usr/lib/qt4/%{_lib}/pkgconfig %configure2_5x \ -%if !%build_mono + --disable-static \ +%if !%{build_mono} --disable-mono \ %endif -%if !%build_qt4 +%if !%{build_qt3} + --disable-qt3 \ +%endif +%if !%{build_qt4} --disable-qt4 \ %endif --localstatedir=%{_var} \ @@ -382,10 +428,12 @@ export PKG_CONFIG_PATH=/usr/lib/qt4/%{_lib}/pkgconfig --enable-compat-libdns_sd \ --enable-compat-howl \ --enable-introspection=no \ -%if !%{_with_systemd} - --without-systemdsystemunitdir \ +%if %{build_systemd} + --with-systemdsystemunitdir=/lib/systemd/system \ %endif +%if !%{build_gtk3} --disable-gtk3 +%endif %make @@ -393,21 +441,18 @@ export PKG_CONFIG_PATH=/usr/lib/qt4/%{_lib}/pkgconfig rm -rf %{buildroot} %makeinstall_std rm -f %{buildroot}/%{_sysconfdir}/%{name}/services/ssh.service -ln -s avahi-compat-howl.pc %buildroot%_libdir/pkgconfig/howl.pc -%if "%_lib" != "lib" && %build_mono -mkdir -p %buildroot%_prefix/lib -mv %buildroot%_libdir/mono %buildroot%_prefix/lib -perl -pi -e "s/%_lib/lib/" %buildroot%_libdir/pkgconfig/avahi-{,ui-}sharp.pc +ln -s avahi-compat-howl.pc %{buildroot}%{_libdir}/pkgconfig/howl.pc +%if "%{_lib}" != "lib" && %{build_mono} +mkdir -p %{buildroot}%{_prefix}/lib +mv %{buildroot}%{_libdir}/mono %{buildroot}%{_prefix}/lib +perl -pi -e "s/%{_lib}/lib/" %{buildroot}%{_libdir}/pkgconfig/avahi-{,ui-}sharp.pc %endif # install hostname.d hook mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/hostname.d/ install -m755 avahi-hostname.sh %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/hostname.d/avahi -%find_lang avahi - -%clean -rm -rf %{buildroot} +%find_lang %{name} %pre %_pre_useradd %{name} %{_var}/%{name} /bin/false @@ -429,81 +474,15 @@ rm -rf %{buildroot} %preun dnsconfd %_preun_service %{name}-dnsconfd -%if %mdkversion < 200900 -%post -n %{lib_client_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_client_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%post -n %{lib_common_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_common_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%post -n %{lib_core_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_core_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%post -n %{lib_dns_sd_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_dns_sd_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%post -n %{lib_glib_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_glib_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%post -n %{lib_gobject_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_gobject_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%post -n %{lib_howl_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_howl_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%post -n %{lib_qt3_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_qt3_name} -p /sbin/ldconfig -%endif - -%if %build_qt4 -%if %mdkversion < 200900 -%post -n %{lib_qt4_name} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{lib_qt4_name} -p /sbin/ldconfig -%endif -%endif - -%if %build_mono +%if %{build_mono} %post sharp-doc -%_bindir/monodoc --make-index > /dev/null +%{_bindir}/monodoc --make-index > /dev/null %postun sharp-doc -if [ "$1" = "0" -a -x %_bindir/monodoc ]; then %_bindir/monodoc --make-index > /dev/null +if [ "$1" = "0" -a -x %{_bindir}/monodoc ]; then %{_bindir}/monodoc --make-index > /dev/null fi %endif %files -f avahi.lang -%defattr(-,root,root) %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/services/ %config(noreplace) %{_sysconfdir}/%{name}/hosts @@ -526,15 +505,6 @@ fi %{_sbindir}/avahi-autoipd %{_datadir}/%{name}/%{name}-service.dtd %{_datadir}/dbus-1/interfaces/*.xml -#%{_datadir}/%{name}/introspection/AddressResolver.introspect -#%{_datadir}/%{name}/introspection/DomainBrowser.introspect -#%{_datadir}/%{name}/introspection/EntryGroup.introspect -#%{_datadir}/%{name}/introspection/HostNameResolver.introspect -#%{_datadir}/%{name}/introspection/RecordBrowser.introspect -#%{_datadir}/%{name}/introspection/Server.introspect -#%{_datadir}/%{name}/introspection/ServiceBrowser.introspect -#%{_datadir}/%{name}/introspection/ServiceResolver.introspect -#%{_datadir}/%{name}/introspection/ServiceTypeBrowser.introspect %{_datadir}/%{name}/service-types %{_mandir}/man1/%{name}-browse-domains.1* %{_mandir}/man1/%{name}-browse.1* @@ -550,9 +520,9 @@ fi %{_mandir}/man5/%{name}.service.5* %{_mandir}/man8/%{name}-daemon.8* %{_mandir}/man8/avahi-autoipd* -%dir %_libdir/avahi -%_libdir/avahi/service-types.db -%if %{_with_systemd} +%dir %{_libdir}/avahi +%{_libdir}/avahi/service-types.db +%if %{build_systemd} /lib/systemd/system/avahi-daemon.service /lib/systemd/system/avahi-daemon.socket /lib/systemd/system/avahi-dnsconfd.service @@ -560,7 +530,6 @@ fi %endif %files dnsconfd -%defattr(-,root,root) %{_sysconfdir}/%{name}/%{name}-dnsconfd.action %{_initrddir}/%{name}-dnsconfd %{_sbindir}/%{name}-dnsconfd @@ -568,7 +537,6 @@ fi %{_mandir}/man8/%{name}-dnsconfd.action.8* %files x11 -%defattr(-,root,root) %{_bindir}/%{name}-discover-standalone %{_bindir}/bshell %{_bindir}/bssh @@ -581,7 +549,6 @@ fi %{_datadir}/%{name}/interfaces/%{name}-discover.ui %files python -%defattr(-,root,root) %{_bindir}/%{name}-bookmarks %{_bindir}/%{name}-discover %{py_puresitedir}/%{name}/*.py* @@ -589,9 +556,8 @@ fi %{_mandir}/man1/%{name}-discover.1* %{_mandir}/man1/%{name}-bookmarks.1* -%if %build_mono +%if %{build_mono} %files sharp -%defattr(-,root,root) %{_prefix}/lib/mono/%{name}-sharp/%{name}-sharp.dll %{_prefix}/lib/mono/gac/%{name}-sharp/ %{_libdir}/pkgconfig/%{name}-sharp.pc @@ -600,7 +566,6 @@ fi %{_libdir}/pkgconfig/%{name}-ui-sharp.pc %files sharp-doc -%defattr(-,root,root) %{_usr}/lib/monodoc/sources/%{name}-sharp-docs.source %{_usr}/lib/monodoc/sources/%{name}-sharp-docs.tree %{_usr}/lib/monodoc/sources/%{name}-sharp-docs.zip @@ -610,133 +575,158 @@ fi %endif %files -n %{lib_client_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-client.so.%{client_major}* %files -n %{lib_common_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-common.so.%{common_major}* %files -n %{lib_core_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-core.so.%{core_major}* %files -n %{lib_dns_sd_name} -%defattr(-,root,root) %{_libdir}/libdns_sd.so.%{dns_sd_major}* %files -n %{lib_glib_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-glib.so.%{glib_major}* %files -n %{lib_gobject_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-gobject.so.%{gobject_major}* %files -n %{lib_howl_name} -%defattr(-,root,root) %{_libdir}/libhowl.so.%{howl_major}* +%if %{build_qt3} %files -n %{lib_qt3_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-qt3.so.%{qt3_major}* +%endif -%if %build_qt4 +%if %{build_qt4} %files -n %{lib_qt4_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-qt4.so.%{qt4_major}* %endif %files -n %{lib_ui_name} -%defattr(-,root,root) %{_libdir}/lib%{name}-ui.so.%{ui_major}* -%files -n %develnameclient -%defattr(-,root,root) +%files -n %{develnameclient} %{_includedir}/%{name}-client -%{_libdir}/lib%{name}-client.a -%attr(644,root,root) %{_libdir}/lib%{name}-client.la %{_libdir}/lib%{name}-client.so %{_libdir}/pkgconfig/%{name}-client.pc -%files -n %develnamecommon -%defattr(-,root,root) +%files -n %{develnamecommon} %{_includedir}/%{name}-common -%{_libdir}/lib%{name}-common.a -%attr(644,root,root) %{_libdir}/lib%{name}-common.la %{_libdir}/lib%{name}-common.so -%files -n %develnamecore -%defattr(-,root,root) +%files -n %{develnamecore} %{_includedir}/%{name}-core -%{_libdir}/lib%{name}-core.a -%attr(644,root,root) %{_libdir}/lib%{name}-core.la %{_libdir}/lib%{name}-core.so %{_libdir}/pkgconfig/%{name}-core.pc -%files -n %develnamedns_sd -%defattr(-,root,root) +%files -n %{develnamedns_sd} %{_includedir}/%{name}-compat-libdns_sd -%{_libdir}/libdns_sd.a -%attr(644,root,root) %{_libdir}/libdns_sd.la %{_libdir}/libdns_sd.so %{_libdir}/pkgconfig/%{name}-compat-libdns_sd.pc -%files -n %develnameglib -%defattr(-,root,root) +%files -n %{develnameglib} %{_includedir}/%{name}-glib -%{_libdir}/lib%{name}-glib.a -%attr(644,root,root) %{_libdir}/lib%{name}-glib.la %{_libdir}/lib%{name}-glib.so %{_libdir}/pkgconfig/%{name}-glib.pc -%files -n %develnamegobject -%defattr(-,root,root) +%files -n %{develnamegobject} %{_includedir}/%{name}-gobject -%{_libdir}/lib%{name}-gobject.a -%attr(644,root,root) %{_libdir}/lib%{name}-gobject.la %{_libdir}/lib%{name}-gobject.so %{_libdir}/pkgconfig/%{name}-gobject.pc -%files -n %develnamehowl -%defattr(-,root,root) +%files -n %{develnamehowl} %{_includedir}/%{name}-compat-howl -%{_libdir}/libhowl.a -%attr(644,root,root) %{_libdir}/libhowl.la %{_libdir}/libhowl.so %{_libdir}/pkgconfig/%{name}-compat-howl.pc %{_libdir}/pkgconfig/howl.pc -%files -n %develnameqt3 -%defattr(-,root,root) +%if %{build_qt3} +%files -n %{develnameqt3} %{_includedir}/%{name}-qt3 -%{_libdir}/lib%{name}-qt3.a -%attr(644,root,root) %{_libdir}/lib%{name}-qt3.la %{_libdir}/lib%{name}-qt3.so %{_libdir}/pkgconfig/%{name}-qt3.pc +%endif -%if %build_qt4 -%files -n %develnameqt4 -%defattr(-,root,root) +%if %{build_qt4} +%files -n %{develnameqt4} %{_includedir}/%{name}-qt4 -%{_libdir}/lib%{name}-qt4.a -%attr(644,root,root) %{_libdir}/lib%{name}-qt4.la %{_libdir}/lib%{name}-qt4.so %{_libdir}/pkgconfig/%{name}-qt4.pc %endif -%files -n %develnameui -%defattr(-,root,root) +%files -n %{develnameui} %{_includedir}/%{name}-ui -%{_libdir}/lib%{name}-ui.a -%attr(644,root,root) %{_libdir}/lib%{name}-ui.la %{_libdir}/lib%{name}-ui.so %{_libdir}/pkgconfig/%{name}-ui.pc +%if %{build_gtk3} +%files -n %{lib_ui_gtk3_name} +%{_libdir}/lib%{name}-ui-gtk3.so.%{ui_gtk3_major}* + +%files -n %{develnameui_gtk3} +%{_libdir}/libavahi-ui-gtk3.so +%{_libdir}/pkgconfig/avahi-ui-gtk3.pc +%endif + + %changelog -* Thu Mar 17 2011 Oden Eriksson 0.6.29-1mdv2011.0 +* Thu Feb 16 2012 Götz Waschk 0.6.31-2 ++ Revision: 775266 +- reenable mono + +* Thu Feb 16 2012 Matthew Dawkins 0.6.31-1 ++ Revision: 774825 +- disabled mono build, deps are broken +- new version 0.6.31 +- cleaned up spec + +* Sat Nov 26 2011 Matthew Dawkins 0.6.30-5 ++ Revision: 733640 +- removed dep loop +- added not about wrong major used for ui_name + +* Wed Nov 16 2011 Matthew Dawkins 0.6.30-4 ++ Revision: 731053 +- added _ after gtk3 name for major +- fixed ui_gtk3_major typo +- add back BR +- remove - for _ in gtk3 macro names.. oops +- fixed typoes for gtk3 naming +- fixed ui-gtk3 name + aligned systemd _with macro to be like build_ macros + more clean ups for bracketing of macros + b/c of build failure switched with-systemd... + removed old obsoletes & provides + converted BRs to pkgconfig provides +- rebuild + removed defattr + disabled static build + removed .la files + cleaned up spec + added build with gtk3 + removed old ldconfig scriptlets + removed clean section + removed mkrel + remove BuildRoot + +* Thu Sep 22 2011 Götz Waschk 0.6.30-2 ++ Revision: 700862 +- rebuild + +* Tue Sep 06 2011 Götz Waschk 0.6.30-1 ++ Revision: 698491 +- new version + + + Matthew Dawkins + - added qt3 build option + - and included systemd in with the bootstrap build option + +* Thu Mar 17 2011 Oden Eriksson 0.6.29-1 + Revision: 646045 - 0.6.29 - drop the CVE-2011-1002 fix, it's fixed with 0.6.29 @@ -785,7 +775,7 @@ fi + Revision: 520015 - rebuilt for 2010.1 -* Fri Sep 25 2009 Olivier Blin 0.6.25-3mdv2010.0 +* Fri Sep 25 2009 Olivier Blin 0.6.25-3mdv2010.0 + Revision: 448777 - do not build mono support on arm and mips (from Arnaud Patard) @@ -830,7 +820,7 @@ fi + Funda Wang - rebuild for new qtlibs location -* Mon Mar 03 2008 Olivier Blin 0.6.22-3mdv2008.1 +* Mon Mar 03 2008 Olivier Blin 0.6.22-3mdv2008.1 + Revision: 177826 - add avahi-autoipd user and group (#33885) @@ -841,7 +831,7 @@ fi + Revision: 136229 - fix devel obsoletes - + Olivier Blin + + Olivier Blin - restore BuildRoot * Mon Dec 17 2007 Götz Waschk 0.6.22-1mdv2008.1 @@ -866,12 +856,12 @@ fi + Revision: 65177 - fix desktop conflict bewteen x11 and python sub package -* Mon Aug 13 2007 Olivier Blin 0.6.21-1mdv2008.0 +* Mon Aug 13 2007 Olivier Blin 0.6.21-1mdv2008.0 + Revision: 62591 - add patch to allow build with dbus < 1.1.1 (from upstream SVN) - 0.6.21 -* Sun Jun 24 2007 Olivier Blin 0.6.20-2mdv2008.0 +* Sun Jun 24 2007 Olivier Blin 0.6.20-2mdv2008.0 + Revision: 43749 - 0.6.20 (and drop upstream patches) @@ -879,14 +869,14 @@ fi + Revision: 36904 - rebuild for expat -* Mon May 14 2007 Olivier Blin 0.6.19-1mdv2008.0 +* Mon May 14 2007 Olivier Blin 0.6.19-1mdv2008.0 + Revision: 26632 - 0.6.19 - fix zssh build (patches from upstream SVN) - zssh/zvnc are renamed bssh/bvnc - package avahi-ui-sharp files in main avahi-sharp package (for now) -* Thu Apr 19 2007 Olivier Blin 0.6.18-1mdv2008.0 +* Thu Apr 19 2007 Olivier Blin 0.6.18-1mdv2008.0 + Revision: 14986 - add ui applications in avahi-x11 and create ui library packages - really use qt4 major macro