Fix spec file warnings

Mark end of %endif with a comment in an extra line
This commit is contained in:
Andreas Schneider 2019-12-06 09:58:30 +01:00
parent 3a3842d182
commit bba9db24f9
1 changed files with 39 additions and 17 deletions

View File

@ -41,7 +41,9 @@
%if 0%{?fedora} %if 0%{?fedora}
%ifarch aarch64 ppc64le s390x x86_64 %ifarch aarch64 ppc64le s390x x86_64
%global with_vfs_cephfs 1 %global with_vfs_cephfs 1
#endifarch
%endif %endif
#endif fedora
%endif %endif
%global with_vfs_glusterfs 1 %global with_vfs_glusterfs 1
@ -50,7 +52,9 @@
# Only enable on x86_64 # Only enable on x86_64
%ifarch x86_64 %ifarch x86_64
%global with_vfs_glusterfs 1 %global with_vfs_glusterfs 1
#endif arch
%endif %endif
#endif rhel
%endif %endif
%global with_intel_aes_accel 0 %global with_intel_aes_accel 0
@ -222,7 +226,8 @@ BuildRequires: python3-crypto
BuildRequires: bind BuildRequires: bind
BuildRequires: krb5-server >= %{required_mit_krb5} BuildRequires: krb5-server >= %{required_mit_krb5}
%endif # with_dc #endif with_dc
%endif
# pidl requirements # pidl requirements
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
@ -412,7 +417,8 @@ Requires: bind
%description dc-bind-dlz %description dc-bind-dlz
The %{name}-dc-bind-dlz package contains the libraries for bind to manage all The %{name}-dc-bind-dlz package contains the libraries for bind to manage all
name server related details of Samba AD. name server related details of Samba AD.
%endif # with_dc #endif with_dc
%endif
### DEVEL ### DEVEL
%package devel %package devel
@ -437,6 +443,7 @@ Requires: %{name}-libs = %{samba_depver}
%description vfs-cephfs %description vfs-cephfs
Samba VFS module for Ceph distributed storage system integration. Samba VFS module for Ceph distributed storage system integration.
#endif with_vfs_cephfs
%endif %endif
### GLUSTER ### GLUSTER
@ -514,7 +521,8 @@ Requires: libsmbclient = %{samba_depver}
The libsmbclient-devel package contains the header files and libraries needed The libsmbclient-devel package contains the header files and libraries needed
to develop programs that link against the SMB client library in the Samba to develop programs that link against the SMB client library in the Samba
suite. suite.
%endif # with_libsmbclient #endif with_libsmbclient
%endif
### LIBWBCLIENT ### LIBWBCLIENT
%if %with_libwbclient %if %with_libwbclient
@ -536,7 +544,8 @@ Obsoletes: samba-winbind-devel < %{samba_depver}
%description -n libwbclient-devel %description -n libwbclient-devel
The libwbclient-devel package provides developer tools for the wbclient The libwbclient-devel package provides developer tools for the wbclient
library. library.
%endif # with_libwbclient #endif with_libwbclient
%endif
### PYTHON3 ### PYTHON3
%package -n python3-%{name} %package -n python3-%{name}
@ -780,7 +789,8 @@ CTDB is a cluster implementation of the TDB database used by Samba and other
projects to store temporary data. If an application is already using TDB for projects to store temporary data. If an application is already using TDB for
temporary data it is very easy to convert that application to be cluster aware temporary data it is very easy to convert that application to be cluster aware
and use CTDB instead. and use CTDB instead.
%endif # with_clustering_support #endif with_clustering_support
%endif
@ -1048,7 +1058,8 @@ for f in samba/libsamba-net-samba4.so \
pkgconfig/samba-policy.pc ; do pkgconfig/samba-policy.pc ; do
rm -f %{buildroot}%{_libdir}/$f rm -f %{buildroot}%{_libdir}/$f
done done
%endif # ! with_dc #endif ! with_dc
%endif
pushd pidl pushd pidl
make DESTDIR=%{buildroot} install_vendor make DESTDIR=%{buildroot} install_vendor
@ -1063,7 +1074,8 @@ popd
%if %{with testsuite} %if %{with testsuite}
%check %check
TDB_NO_FSYNC=1 make %{?_smp_mflags} test TDB_NO_FSYNC=1 make %{?_smp_mflags} test
%endif # with testsuite #endif with testsuite
%endif
%post %post
%systemd_post smb.service %systemd_post smb.service
@ -1115,7 +1127,8 @@ fi
%postun dc %postun dc
%systemd_postun_with_restart samba.service %systemd_postun_with_restart samba.service
%endif # with_dc #endif with_dc
%endif
%post krb5-printing %post krb5-printing
%{_sbindir}/update-alternatives --install %{_libexecdir}/samba/cups_backend_smb \ %{_sbindir}/update-alternatives --install %{_libexecdir}/samba/cups_backend_smb \
@ -1171,7 +1184,8 @@ else
%{_sbindir}/update-alternatives --remove libwbclient.so%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so %{_sbindir}/update-alternatives --remove libwbclient.so%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so
fi fi
%endif # with_libwbclient #endif with_libwbclient
%endif
%ldconfig_scriptlets test %ldconfig_scriptlets test
@ -1498,12 +1512,14 @@ fi
%if ! %with_libwbclient %if ! %with_libwbclient
%{_libdir}/samba/libwbclient.so.* %{_libdir}/samba/libwbclient.so.*
%{_libdir}/samba/libwinbind-client-samba4.so %{_libdir}/samba/libwinbind-client-samba4.so
%endif # ! with_libwbclient #endif ! with_libwbclient
%endif
%if ! %with_libsmbclient %if ! %with_libsmbclient
%{_libdir}/samba/libsmbclient.so.* %{_libdir}/samba/libsmbclient.so.*
%{_mandir}/man7/libsmbclient.7* %{_mandir}/man7/libsmbclient.7*
%endif # ! with_libsmbclient #endif ! with_libsmbclient
%endif
### COMMON ### COMMON
%files common %files common
@ -1673,7 +1689,8 @@ fi
%{_libdir}/samba/bind9/dlz_bind9_10.so %{_libdir}/samba/bind9/dlz_bind9_10.so
%{_libdir}/samba/bind9/dlz_bind9_11.so %{_libdir}/samba/bind9/dlz_bind9_11.so
%{_libdir}/samba/bind9/dlz_bind9_12.so %{_libdir}/samba/bind9/dlz_bind9_12.so
%endif # with_dc #endif with_dc
%endif
### DEVEL ### DEVEL
%files devel %files devel
@ -1796,11 +1813,13 @@ fi
%if ! %with_libsmbclient %if ! %with_libsmbclient
%{_includedir}/samba-4.0/libsmbclient.h %{_includedir}/samba-4.0/libsmbclient.h
%endif # ! with_libsmbclient #endif ! with_libsmbclient
%endif
%if ! %with_libwbclient %if ! %with_libwbclient
%{_includedir}/samba-4.0/wbclient.h %{_includedir}/samba-4.0/wbclient.h
%endif # ! with_libwbclient #endif ! with_libwbclient
%endif
### VFS-CEPHFS ### VFS-CEPHFS
%if %{with_vfs_cephfs} %if %{with_vfs_cephfs}
@ -1846,7 +1865,8 @@ fi
%{_libdir}/libsmbclient.so %{_libdir}/libsmbclient.so
%{_libdir}/pkgconfig/smbclient.pc %{_libdir}/pkgconfig/smbclient.pc
%{_mandir}/man7/libsmbclient.7* %{_mandir}/man7/libsmbclient.7*
%endif # with_libsmbclient #endif with_libsmbclient
%endif
### LIBWBCLIENT ### LIBWBCLIENT
%if %with_libwbclient %if %with_libwbclient
@ -1859,7 +1879,8 @@ fi
%{_includedir}/samba-4.0/wbclient.h %{_includedir}/samba-4.0/wbclient.h
%{_libdir}/samba/wbclient/libwbclient.so %{_libdir}/samba/wbclient/libwbclient.so
%{_libdir}/pkgconfig/wbclient.pc %{_libdir}/pkgconfig/wbclient.pc
%endif # with_libwbclient #endif with_libwbclient
%endif
### PIDL ### PIDL
%files pidl %files pidl
@ -3492,7 +3513,8 @@ fi
%dir %{_datadir}/ctdb/tests/tool/scripts %dir %{_datadir}/ctdb/tests/tool/scripts
%{_datadir}/ctdb/tests/tool/scripts/local.sh %{_datadir}/ctdb/tests/tool/scripts/local.sh
%endif # with_clustering_support #endif with_clustering_support
%endif
%changelog %changelog
* Thu Dec 05 2019 Andreas Schneider <asn@redhat.com> - 4.11.2-2 * Thu Dec 05 2019 Andreas Schneider <asn@redhat.com> - 4.11.2-2