More fixes for rpmlint

This commit is contained in:
Andreas Schneider 2016-02-11 12:36:09 +01:00
parent a26e3776db
commit a4ae61dc8d
1 changed files with 44 additions and 30 deletions

View File

@ -6,7 +6,7 @@
# ctdb is enabled by default, you can disable it with: --without clustering # ctdb is enabled by default, you can disable it with: --without clustering
%bcond_without clustering %bcond_without clustering
%define main_release 1 %define main_release 2
%define samba_version 4.4.0 %define samba_version 4.4.0
%define talloc_version 2.1.5 %define talloc_version 2.1.5
@ -128,11 +128,18 @@ Provides: samba4 = %{samba_depver}
Obsoletes: samba4 < %{samba_depver} Obsoletes: samba4 < %{samba_depver}
# We don't build it outdated docs anymore # We don't build it outdated docs anymore
Provides: samba-doc = %{samba_depver}
Obsoletes: samba-doc < %{samba_depver} Obsoletes: samba-doc < %{samba_depver}
# Is not supported yet # Is not supported yet
Provides: samba-domainjoin-gui = %{samba_depver}
Obsoletes: samba-domainjoin-gui < %{samba_depver} Obsoletes: samba-domainjoin-gui < %{samba_depver}
# SWAT been deprecated and removed from samba # SWAT been deprecated and removed from samba
Provides: samba-swat = %{samba_depver}
Obsoletes: samba-swat < %{samba_depver} Obsoletes: samba-swat < %{samba_depver}
Provides: samba4-swat = %{samba_depver}
Obsoletes: samba4-swat < %{samba_depver} Obsoletes: samba4-swat < %{samba_depver}
BuildRequires: cups-devel BuildRequires: cups-devel
@ -369,7 +376,7 @@ Requires: %{name} = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver}
Requires: %{name}-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver}
Obsoletes: samba-glusterfs Obsoletes: samba-glusterfs < %{samba_depver}
Provides: samba-glusterfs Provides: samba-glusterfs
%description vfs-glusterfs %description vfs-glusterfs
@ -442,8 +449,9 @@ The libwbclient package contains the winbind client library from the Samba suite
Summary: Developer tools for the winbind library Summary: Developer tools for the winbind library
Group: Development/Libraries Group: Development/Libraries
Requires: libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver}
Provides: samba-winbind-devel = %{samba_depver}
Obsoletes: samba-winbind-devel < %{samba_depver} Obsoletes: samba-winbind-devel < %{samba_depver}
Provides: samba-winbind-devel
%description -n libwbclient-devel %description -n libwbclient-devel
The libwbclient-devel package provides developer tools for the wbclient library. The libwbclient-devel package provides developer tools for the wbclient library.
@ -518,6 +526,8 @@ Summary: Libraries need by the testing tools for Samba servers and clients
Group: Applications/System Group: Applications/System
Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver}
Requires: %{name}-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver}
Provides: %{name}-test-devel = %{samba_depver}
Obsoletes: %{name}-test-devel < %{samba_depver} Obsoletes: %{name}-test-devel < %{samba_depver}
%description test-libs %description test-libs
@ -649,6 +659,8 @@ Requires: samba-client-libs = %{samba_depver}
Requires: ctdb = %{samba_depver} Requires: ctdb = %{samba_depver}
Requires: nc Requires: nc
Provides: ctdb-devel = %{samba_depver}
Obsoletes: ctdb-devel < %{samba_depver} Obsoletes: ctdb-devel < %{samba_depver}
%description -n ctdb-tests %description -n ctdb-tests
@ -888,10 +900,12 @@ fi
%postun client-libs -p /sbin/ldconfig %postun client-libs -p /sbin/ldconfig
### COMMON ### COMMON-LIBS
%post common-libs -p /sbin/ldconfig
%postun common -p /sbin/ldconfig %postun common-libs -p /sbin/ldconfig
### DC-LIBS
%if %with_dc %if %with_dc
%post dc-libs -p /sbin/ldconfig %post dc-libs -p /sbin/ldconfig
@ -1847,34 +1861,34 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/ctdb %dir %{_sysconfdir}/ctdb
%{_sysconfdir}/ctdb/statd-callout %{_sysconfdir}/ctdb/statd-callout
%dir %{_sysconfdir}/ctdb/nfs-checks.d %dir %{_sysconfdir}/ctdb/nfs-checks.d
%{_sysconfdir}/ctdb/nfs-checks.d/00.portmapper.check %config %{_sysconfdir}/ctdb/nfs-checks.d/00.portmapper.check
%{_sysconfdir}/ctdb/nfs-checks.d/10.status.check %config %{_sysconfdir}/ctdb/nfs-checks.d/10.status.check
%{_sysconfdir}/ctdb/nfs-checks.d/20.nfs.check %config %{_sysconfdir}/ctdb/nfs-checks.d/20.nfs.check
%{_sysconfdir}/ctdb/nfs-checks.d/30.nlockmgr.check %config %{_sysconfdir}/ctdb/nfs-checks.d/30.nlockmgr.check
%{_sysconfdir}/ctdb/nfs-checks.d/40.mountd.check %config %{_sysconfdir}/ctdb/nfs-checks.d/40.mountd.check
%{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check %config %{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check
%{_sysconfdir}/ctdb/nfs-checks.d/README %{_sysconfdir}/ctdb/nfs-checks.d/README
%{_sysconfdir}/ctdb/nfs-linux-kernel-callout %{_sysconfdir}/ctdb/nfs-linux-kernel-callout
%{_sysconfdir}/sudoers.d/ctdb %config %{_sysconfdir}/sudoers.d/ctdb
%dir %{_sysconfdir}/ctdb/events.d %dir %{_sysconfdir}/ctdb/events.d
%{_sysconfdir}/ctdb/events.d/00.ctdb %config %{_sysconfdir}/ctdb/events.d/00.ctdb
%{_sysconfdir}/ctdb/events.d/01.reclock %config %{_sysconfdir}/ctdb/events.d/01.reclock
%{_sysconfdir}/ctdb/events.d/05.system %config %{_sysconfdir}/ctdb/events.d/05.system
%{_sysconfdir}/ctdb/events.d/10.external %config %{_sysconfdir}/ctdb/events.d/10.external
%{_sysconfdir}/ctdb/events.d/10.interface %config %{_sysconfdir}/ctdb/events.d/10.interface
%{_sysconfdir}/ctdb/events.d/11.natgw %config %{_sysconfdir}/ctdb/events.d/11.natgw
%{_sysconfdir}/ctdb/events.d/11.routing %config %{_sysconfdir}/ctdb/events.d/11.routing
%{_sysconfdir}/ctdb/events.d/13.per_ip_routing %config %{_sysconfdir}/ctdb/events.d/13.per_ip_routing
%{_sysconfdir}/ctdb/events.d/20.multipathd %config %{_sysconfdir}/ctdb/events.d/20.multipathd
%{_sysconfdir}/ctdb/events.d/31.clamd %config %{_sysconfdir}/ctdb/events.d/31.clamd
%{_sysconfdir}/ctdb/events.d/40.vsftpd %config %{_sysconfdir}/ctdb/events.d/40.vsftpd
%{_sysconfdir}/ctdb/events.d/41.httpd %config %{_sysconfdir}/ctdb/events.d/41.httpd
%{_sysconfdir}/ctdb/events.d/49.winbind %config %{_sysconfdir}/ctdb/events.d/49.winbind
%{_sysconfdir}/ctdb/events.d/50.samba %config %{_sysconfdir}/ctdb/events.d/50.samba
%{_sysconfdir}/ctdb/events.d/60.nfs %config %{_sysconfdir}/ctdb/events.d/60.nfs
%{_sysconfdir}/ctdb/events.d/70.iscsi %config %{_sysconfdir}/ctdb/events.d/70.iscsi
%{_sysconfdir}/ctdb/events.d/91.lvs %config %{_sysconfdir}/ctdb/events.d/91.lvs
%{_sysconfdir}/ctdb/events.d/99.timeout %config %{_sysconfdir}/ctdb/events.d/99.timeout
%{_sysconfdir}/ctdb/events.d/README %{_sysconfdir}/ctdb/events.d/README
%dir %{_sysconfdir}/ctdb/notify.d %dir %{_sysconfdir}/ctdb/notify.d
%{_sysconfdir}/ctdb/notify.d/README %{_sysconfdir}/ctdb/notify.d/README