!1 rename docs subpackage as help subpackage

Merge pull request !1 from openeuler-net/master

avahi.spec

@@ -1,16 +1,14 @@
 Name:             avahi
 Version:          0.7
-Release:          18
+Release:          19
 Summary:          Avahi is a local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
 Source0:          http://avahi.org/download/%{name}-%{version}.tar.gz
 
 Patch1:           avahi-0.6.30-mono-libdir.patch
-
 Patch6000:        CVE-2017-6519-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
 
-
 BuildRequires:    gcc automake libtool python2-dbus python2-libxml2 desktop-file-utils gtk2-devel glib2-devel
 BuildRequires:    libcap-devel expat-devel python2-devel python3-devel gdbm-devel pygobject3-devel pygtk2
 BuildRequires:    intltool perl-XML-Parser xmltoman systemd
@@ -22,27 +20,21 @@ Requires(post):   dbus systemd
 Requires(preun):  systemd
 Requires(postun): systemd
 
-
 Provides:         avahi-autoipd = %{version}-%{release}
 Obsoletes:        avahi-autoipd < %{version}-%{release}
 
-
 %description
 Avahi is a system which facilitates service discovery on a local network
 via the mDNS/DNS-SD protocol suite. This enables you to plug your laptop
 or computer into a network and instantly be able to view other people who
 you can chat with, find printers to print to or find files being shared.
 
-
 %package tools
 Summary:          CMD tools for mDNS browsing and publishing
 Requires:         %{name}-libs = %{version}-%{release}
 %description tools
 CMD tools for mDNS services.
 
-
-
-
 %package ui-tools
 Summary:          ui-tools for mDNS
 Requires:         %{name}-libs = %{version}-%{release} python2-avahi = %{version}-%{release}
@@ -51,7 +43,6 @@ Requires:         tigervnc openssh-clients pygtk2 pygtk2-libglade gdbm python2-d
 %description ui-tools
 Avahi Graphical user interface tools for mDNS services.
 
-
 %package ui
 Summary:          Gtk library for Avahi (Gtk2)
 Requires:         %{name}-libs = %{version}-%{release} gtk2
@@ -59,8 +50,6 @@ Requires:         %{name}-libs = %{version}-%{release} gtk2
 %description ui
 This package contains a Gtk 2.x widget for browsing services.
 
-
-
 %package dnsconfd
 Summary:          This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS
 Requires:         %{name}-libs = %{version}-%{release}
@@ -68,7 +57,6 @@ Requires:         %{name}-libs = %{version}-%{release}
 %description dnsconfd
 This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS.
 
-
 %package compat-howl
 Summary:          Libraries for compat-howl
 Requires:         %{name}-libs = %{version}-%{release}
@@ -78,7 +66,6 @@ Provides:         howl-libs
 %description compat-howl
 Libraries for compat-howl.
 
-
 %package compat-howl-devel
 Summary:          Header files and libs for howl compatibility libraries
 Requires:         %{name}-compat-howl = %{version}-%{release}
@@ -104,7 +91,6 @@ Requires:         %{name}-devel = %{version}-%{release}
 %description compat-libdns_sd-devel
 Header files and libs for compat-libdns_sd-devel
 
-
 %package devel
 Summary:           Libraries and header files for avahi development
 Requires:          %{name}-libs = %{version}-%{release} %{name}-ui = %{version}-%{release}
@@ -115,7 +101,6 @@ Obsoletes:         %{name}-glib-devel = %{version}-%{release} %{name}-gobject-de
 %description devel
 Header files for using the avahi libraries.
 
-
 %package -n python2-avahi
 Summary:          Python2 Avahi api
 Obsoletes:        python-avahi < 0.7
@@ -163,12 +148,7 @@ Summary:          Libraries for avahi run-time use
 The avahi-libs package contains the libraries needed
 to run programs that use avahi.
 
-
+%package_help
-%package docs
-Summary: Documentation files for avahi.
-
-%description docs
-The avahi package contains documentation files.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
@@ -219,7 +199,6 @@ for i in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop ; do
 desktop-file-validate $i
 done
 
-
 %pre
 %define gid_uid 70
 if ! getent group avahi > /dev/null ; then
@@ -234,7 +213,6 @@ if ! getent passwd avahi > /dev/null ; then
   fi
 fi
 
-
 %define autoipd_gid_pid 170
 if ! getent group avahi-autoipd >/dev/null ; then
     groupadd -f -g %{autoipd_gid_pid} -r avahi-autoipd
@@ -247,12 +225,8 @@ if ! getent passwd avahi-autoipd > /dev/null ; then
   fi
 fi
 
-
 exit 0
 
-
-
-
 %preun
 %systemd_preun avahi-daemon.socket avahi-daemon.service
 
@@ -264,13 +238,10 @@ if [ "$1" -eq 1 -a -s /etc/localtime ]; then
 fi
 %systemd_post avahi-daemon.socket avahi-daemon.service
 
-
 %postun
 /sbin/ldconfig
 %systemd_postun_with_restart avahi-daemon.socket avahi-daemon.service
 
-
-
 %post dnsconfd
 %systemd_post avahi-dnsconfd.service
 
@@ -280,7 +251,6 @@ fi
 %postun dnsconfd
 %systemd_postun_with_restart avahi-dnsconfd.service
 
-
 %post   compat-howl -p /sbin/ldconfig
 
 %postun compat-howl -p /sbin/ldconfig
@@ -361,7 +331,6 @@ fi
 %files ui-gtk3
 %{_libdir}/libavahi-ui-gtk3.so.*
 
-
 %files  devel
 %{_libdir}/libavahi-common.so
 %{_libdir}/libavahi-core.so
@@ -381,27 +350,17 @@ fi
 %exclude %{_includedir}/avahi-compat-libdns_sd
 %exclude %{_includedir}/dns_sd.h
 
-%files docs
-%defattr(644,root,root)
-%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-
 %files -n python2-avahi
 %{python2_sitelib}/avahi/
 
 %files -n python3-avahi
 %{python3_sitelib}/avahi/
 
-
-
 %files dnsconfd
 %{_sbindir}/avahi-dnsconfd
 %{_unitdir}/avahi-dnsconfd.service
 %config(noreplace) %{_sysconfdir}/avahi/avahi-dnsconfd.action
 
-
 %files tools
 %{_bindir}/*
 %exclude %{_bindir}/b*
@@ -411,7 +370,6 @@ fi
 %files ui
 %{_libdir}/libavahi-ui.so.*
 
-
 %files ui-tools
 %{_bindir}/b*
 %{_bindir}/avahi-discover
@@ -441,8 +399,17 @@ fi
 %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
 %{_libdir}/pkgconfig/libdns_sd.pc
 
+%files help
+%defattr(644,root,root)
+%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 
 %changelog
+* Tue Dec 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.7-19
+- rename docs subpackage as help subpackage
+
 * Wed Oct 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.7-18
 - Type:NA
 - ID:NA