pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 591871 from home:jengelh:branches:network:samba:STABLE

Browse Source 
- 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
This commit is contained in:
Aurelien Aptel 2018-03-28 10:10:05 +00:00 committed by Git OBS Bridge
parent 9217577d0b
commit 21f8aa12bf
2 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samba.changes
View File

@ -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 Thu Mar 22 14:20:44 UTC 2018 - dmulder@suse.com

48
samba.spec
View File

@ -301,9 +301,6 @@ Conflicts: samba-devel
This package contains the libraries and header files needed to This package contains the libraries and header files needed to
develop programs which make use of Samba. develop programs which make use of Samba.
%if 0%{?suse_version} > 1110
%package doc %package doc
Summary: Samba Documentation Summary: Samba Documentation
License: GPL-3.0+ License: GPL-3.0+
@ -320,10 +317,6 @@ BuildArch: noarch
This package contains all the Samba documentation as it is not part of This package contains all the Samba documentation as it is not part of
the man pages. the man pages.
%endif
%package libs %package libs
Summary: Samba libraries Summary: Samba libraries
License: GPL-3.0+ License: GPL-3.0+
@ -338,21 +331,17 @@ Requires: libfam0-gamin
The samba-libs package contains the libraries needed by programs that The samba-libs package contains the libraries needed by programs that
link against the SMB, RPC and other protocols provided by the Samba suite. link against the SMB, RPC and other protocols provided by the Samba suite.
%if %{with_pidl}
%package pidl %package pidl
Summary: Perl IDL compiler Summary: Perl IDL compiler
License: GPL-3.0+ License: GPL-3.0+
Group: Development/Tools Group: Development/Tools
Requires: perl-base Requires: perl-base
Requires: perl-Parse-Yapp 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 %description pidl
The samba-pidl package contains the Perl IDL compiler used by Samba The samba-pidl package contains the Perl IDL compiler used by Samba
and Wireshark to parse IDL and similar protocols and Wireshark to parse IDL and similar protocols
%endif
%package python %package python
Summary: Samba Python libraries Summary: Samba Python libraries
@ -443,9 +432,6 @@ Requires(pre): sed
%description -n ctdb %description -n ctdb
ctdb is the clustered database used by Samba ctdb is the clustered database used by Samba
%if 0%{?build_ctdb_pmda}
%package -n ctdb-pcp-pmda %package -n ctdb-pcp-pmda
Summary: Performance Co-Pilot (PCP) monitoring agent Summary: Performance Co-Pilot (PCP) monitoring agent
License: GPL-3.0+ License: GPL-3.0+
@ -455,7 +441,6 @@ Group: System/Monitoring
The CTDB Performance Co-Pilot (PCP) monitoring agent allows remote PCP The CTDB Performance Co-Pilot (PCP) monitoring agent allows remote PCP
clients to view and capture detailed real-time performance metrics for clients to view and capture detailed real-time performance metrics for
one or more cluster nodes. one or more cluster nodes.
%endif
%package -n ctdb-tests %package -n ctdb-tests
Summary: CTDB clustered database test suite 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 This package contains the static libraries and header files needed to
develop programs which make use of the wbclient programming interface. develop programs which make use of the wbclient programming interface.
%if 0%{?build_ceph}
%package ceph %package ceph
Summary: Ceph specific add-ons for Samba Summary: Ceph specific add-ons for Samba
License: GPL-3.0+ 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 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 distributed file system. A Ceph CTDB lock helper binary is included so
that RADOS locks can be used for CTDB split-brain avoidance. that RADOS locks can be used for CTDB split-brain avoidance.
%endif
%package kdc %package kdc
Summary: Samba MIT 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/ install -m 0644 -p vendor-files-%{vendor_files_git_vers}/docu/rfc3454.txt source4/heimdal/lib/wind/
# Create and add vendor suffix # Create and add vendor suffix
if test "%{_project}" != "openSUSE:Factory"; then 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 \ while read tag release; do \
echo -n "${release:+${release}-}"; \ echo -n "${release:+${release}-}"; \
done) done)
@ -1084,7 +1066,7 @@ XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make
popd popd
pushd pidl pushd pidl
%{__perl} Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor
popd popd
%install %install
@ -1146,7 +1128,7 @@ ln -s service %{buildroot}/%{_sbindir}/rcctdb
install -d -m 0755 %{buildroot}/%{_tmpfilesdir} install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
echo "d /run/ctdbd 0755 root root" >%{buildroot}/%{_tmpfilesdir}/ctdb.conf echo "d /run/ctdbd 0755 root root" >%{buildroot}/%{_tmpfilesdir}/ctdb.conf
%else %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 ln -s %{_sysconfdir}/init.d/ctdb %{buildroot}/%{_sbindir}/rcctdb
%endif %endif
mkdir %{buildroot}/%{_defaultdocdir}/ctdb mkdir %{buildroot}/%{_defaultdocdir}/ctdb
@ -1155,7 +1137,7 @@ for file in README COPYING doc/examples doc/*.html doc/readonlyrecords.txt doc/r
done done
touch %{buildroot}/%{_sysconfdir}/ctdb/nodes touch %{buildroot}/%{_sysconfdir}/ctdb/nodes
# sudo can be used by statd-callout, but is not needed # 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 # utility scripts
scripts="creategroup mksmbpasswd.sh" scripts="creategroup mksmbpasswd.sh"
@ -1269,9 +1251,9 @@ install -m 0644 config/sysconfig.firewall.samba-client \
LOGROTATE_FILES="samba samba-winbind" LOGROTATE_FILES="samba samba-winbind"
for file in ${LOGROTATE_FILES}; do for file in ${LOGROTATE_FILES}; do
install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file} install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file}
rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" rm -f "%{_builddir}/samba-%{version}/filelist-${file}"
touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}" touch "%{_builddir}/samba-%{version}/filelist-${file}"
echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-${file} echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>%{_builddir}/samba-%{version}/filelist-${file}
done done
install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/ install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
# SUSEhelp files # SUSEhelp files
@ -1305,14 +1287,14 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
case "${file#%{buildroot}}" in case "${file#%{buildroot}}" in
%{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;;
esac esac
echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc" echo "%doc ${file#%{buildroot}}" >>"%{_builddir}/samba-%{version}/filelist-samba-doc"
done done
for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do
# if built we don't want vfs_ceph in the base package # if built we don't want vfs_ceph in the base package
case "${file#%{buildroot}}" in case "${file#%{buildroot}}" in
%{_libdir}/samba/vfs/ceph.so) continue ;; %{_libdir}/samba/vfs/ceph.so) continue ;;
esac esac
echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba echo "${file#%{buildroot}}" >>%{_builddir}/samba-%{version}/filelist-samba
done done
# only package Man pages for VFS modules that we ship # only package Man pages for VFS modules that we ship
for file in %{buildroot}%{_mandir}/man8/vfs_*; do for file in %{buildroot}%{_mandir}/man8/vfs_*; do
@ -1337,7 +1319,7 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do
;; ;;
esac esac
# wildcard suffix to account for subsequent gzip # 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 done
# copy the schema # copy the schema
install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.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 %if 0%{?suse_version} < 1120
while read file; do while read file; do
rm -r "%{buildroot}/${file#%* }" 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 for file in %{_datadir}/susehelp; do
rm -r "%{buildroot}/${file}" rm -r "%{buildroot}/${file}"
done done
@ -1623,12 +1605,6 @@ exit 0
%post -n %{libsmbclient_name} -p /sbin/ldconfig %post -n %{libsmbclient_name} -p /sbin/ldconfig
%postun -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 %files -f filelist-samba
%defattr(-,root,root) %defattr(-,root,root)
%if 0%{?suse_version} < 1221 %if 0%{?suse_version} < 1221