From 21f8aa12bf1b8eb3cfaa74ebb4bfe48a79fa85e32890861172b63a9ca995eb64 Mon Sep 17 00:00:00 2001 From: Aurelien Aptel Date: Wed, 28 Mar 2018 10:10:05 +0000 Subject: [PATCH] Accepting request 591871 from home:jengelh:branches:network:samba:STABLE - Remove %if..%endif guards which have absolutely no effect on the build. Remove redundant %clean section. Replace old $RPM_* shell vars by macros. OBS-URL: https://build.opensuse.org/request/show/591871 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=592 --- samba.changes | 7 +++++++ samba.spec | 48 ++++++++++++------------------------------------ 2 files changed, 19 insertions(+), 36 deletions(-) diff --git a/samba.changes b/samba.changes index f983ace..e4c3d4e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 26 22:37:15 UTC 2018 - jengelh@inai.de + +- Remove %if..%endif guards which have absolutely no effect on + the build. Remove redundant %clean section. Replace old $RPM_* + shell vars by macros. + ------------------------------------------------------------------- Thu Mar 22 14:20:44 UTC 2018 - dmulder@suse.com diff --git a/samba.spec b/samba.spec index 32bd030..8bcfef2 100644 --- a/samba.spec +++ b/samba.spec @@ -301,9 +301,6 @@ Conflicts: samba-devel This package contains the libraries and header files needed to develop programs which make use of Samba. - -%if 0%{?suse_version} > 1110 - %package doc Summary: Samba Documentation License: GPL-3.0+ @@ -320,10 +317,6 @@ BuildArch: noarch This package contains all the Samba documentation as it is not part of the man pages. - - -%endif - %package libs Summary: Samba libraries License: GPL-3.0+ @@ -338,21 +331,17 @@ Requires: libfam0-gamin The samba-libs package contains the libraries needed by programs that link against the SMB, RPC and other protocols provided by the Samba suite. - -%if %{with_pidl} %package pidl Summary: Perl IDL compiler License: GPL-3.0+ Group: Development/Tools Requires: perl-base Requires: perl-Parse-Yapp -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description pidl The samba-pidl package contains the Perl IDL compiler used by Samba and Wireshark to parse IDL and similar protocols -%endif - %package python Summary: Samba Python libraries @@ -443,9 +432,6 @@ Requires(pre): sed %description -n ctdb ctdb is the clustered database used by Samba - - -%if 0%{?build_ctdb_pmda} %package -n ctdb-pcp-pmda Summary: Performance Co-Pilot (PCP) monitoring agent License: GPL-3.0+ @@ -455,7 +441,6 @@ Group: System/Monitoring The CTDB Performance Co-Pilot (PCP) monitoring agent allows remote PCP clients to view and capture detailed real-time performance metrics for one or more cluster nodes. -%endif %package -n ctdb-tests Summary: CTDB clustered database test suite @@ -932,8 +917,6 @@ Requires: %{libwbclient_name} = %{version} This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. - -%if 0%{?build_ceph} %package ceph Summary: Ceph specific add-ons for Samba License: GPL-3.0+ @@ -944,7 +927,6 @@ Requires: samba = %{version} The Ceph VFS module for Samba allows shares to be backed by the Ceph distributed file system. A Ceph CTDB lock helper binary is included so that RADOS locks can be used for CTDB split-brain avoidance. -%endif %package kdc Summary: Samba MIT KDC @@ -977,7 +959,7 @@ LDB library. install -m 0644 -p vendor-files-%{vendor_files_git_vers}/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix if test "%{_project}" != "openSUSE:Factory"; then - vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \ + vendor_tag_release=$( grep -m 1 ^Release: %{_sourcedir}/samba.spec | \ while read tag release; do \ echo -n "${release:+${release}-}"; \ done) @@ -1084,7 +1066,7 @@ XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make popd pushd pidl -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor popd %install @@ -1146,7 +1128,7 @@ ln -s service %{buildroot}/%{_sbindir}/rcctdb install -d -m 0755 %{buildroot}/%{_tmpfilesdir} echo "d /run/ctdbd 0755 root root" >%{buildroot}/%{_tmpfilesdir}/ctdb.conf %else -install -m 0755 ctdb/config/ctdb.init ${RPM_BUILD_ROOT}/%{INITDIR}/ctdb +install -m 0755 ctdb/config/ctdb.init %{buildroot}/%{INITDIR}/ctdb ln -s %{_sysconfdir}/init.d/ctdb %{buildroot}/%{_sbindir}/rcctdb %endif mkdir %{buildroot}/%{_defaultdocdir}/ctdb @@ -1155,7 +1137,7 @@ for file in README COPYING doc/examples doc/*.html doc/readonlyrecords.txt doc/r done touch %{buildroot}/%{_sysconfdir}/ctdb/nodes # sudo can be used by statd-callout, but is not needed -rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/sudoers.d/ctdb +rm %{buildroot}/%{_sysconfdir}/sudoers.d/ctdb # utility scripts scripts="creategroup mksmbpasswd.sh" @@ -1269,9 +1251,9 @@ install -m 0644 config/sysconfig.firewall.samba-client \ LOGROTATE_FILES="samba samba-winbind" for file in ${LOGROTATE_FILES}; do install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file} - rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" - touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" - echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-${file} + rm -f "%{_builddir}/samba-%{version}/filelist-${file}" + touch "%{_builddir}/samba-%{version}/filelist-${file}" + echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>%{_builddir}/samba-%{version}/filelist-${file} done install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/ # SUSEhelp files @@ -1305,14 +1287,14 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do case "${file#%{buildroot}}" in %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; esac - echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc" + echo "%doc ${file#%{buildroot}}" >>"%{_builddir}/samba-%{version}/filelist-samba-doc" done for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do # if built we don't want vfs_ceph in the base package case "${file#%{buildroot}}" in %{_libdir}/samba/vfs/ceph.so) continue ;; esac - echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba + echo "${file#%{buildroot}}" >>%{_builddir}/samba-%{version}/filelist-samba done # only package Man pages for VFS modules that we ship for file in %{buildroot}%{_mandir}/man8/vfs_*; do @@ -1337,7 +1319,7 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do ;; esac # wildcard suffix to account for subsequent gzip - echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba + echo "${file#%{buildroot}}*" >>%{_builddir}/samba-%{version}/filelist-samba done # copy the schema install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema @@ -1346,7 +1328,7 @@ install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LD %if 0%{?suse_version} < 1120 while read file; do rm -r "%{buildroot}/${file#%* }" -done <"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc" +done <"%{_builddir}/samba-%{version}/filelist-samba-doc" for file in %{_datadir}/susehelp; do rm -r "%{buildroot}/${file}" done @@ -1623,12 +1605,6 @@ exit 0 %post -n %{libsmbclient_name} -p /sbin/ldconfig %postun -n %{libsmbclient_name} -p /sbin/ldconfig -%clean -[ x"%{buildroot}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "%{buildroot}" -if [ -e ${RPM_SOURCE_DIR}/baselibs.conf -a 0%{?suse_version} -gt 0 -a 0%{?suse_version} -lt 1110 ]; then -sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf -fi - %files -f filelist-samba %defattr(-,root,root) %if 0%{?suse_version} < 1221