Obsolete samba-swat, spec cleanup

This commit is contained in:
Denis Silakov 2014-06-17 12:03:53 +04:00
parent 7dfe4e93e2
commit 71e3def58d

View file

@ -49,7 +49,7 @@
%{?_with_pgsql: %global build_pgsql 1}
%global vfsdir examples.bin/VFS
%bcond_with gtk
%bcond_without gtk
%define libname %mklibname smbclient %libsmbmajor
%define libnetapi %mklibname netapi %netapimajor
@ -101,25 +101,23 @@
Summary: Samba SMB server
Name: samba
Version: 4.1.8
Release: 1
Release: 2
Epoch: 1
License: GPLv3
Group: System/Servers
URL: http://www.samba.org
Source0: http://ftp.samba.org/pub/samba/stable/samba-%version.tar.gz
Source99: http://ftp.samba.org/pub/samba/stable/samba-%version.tar.asc
Source0: http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
Source99: http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.asc
Source98: http://ftp.samba.org/pub/samba/samba-pubkey.asc
Source1: samba.log
Source3: samba.xinetd
#Source7: README.%{name}-mandrake-rpm
BuildRequires: magic-devel
# For -fuse-ld
BuildRequires: gcc >= 4.6
BuildRequires: gcc
Source10: samba-print-pdf.sh
Source100: %name.rpmlintrc
Source100: %{name}.rpmlintrc
#Sources that used to be in packaging patch:
Source20: smbusers
@ -134,10 +132,10 @@ Patch1: samba-4.0.0a20-compile.patch
# xdr_* functions have moved from glibc into libtirpc
Patch2: samba-4.0.0-tirpc.patch
BuildRequires: pkgconfig(libtirpc)
# Limbo patches (applied to prereleases, but not preleases, ie destined for
# samba CVS)
Requires: pam >= 0.64, samba-common = %{EVRD}
Requires: pam >= 0.64
Requires: samba-common = %{EVRD}
BuildRequires: pam-devel readline-devel ncurses-devel popt-devel
BuildRequires: libxml2-devel
# Samba 3.2 and later should be built with capabilities support:
@ -145,7 +143,8 @@ BuildRequires: libxml2-devel
BuildRequires: libcap-devel
BuildRequires: gnupg
# Required for ldb docs
BuildRequires: xsltproc docbook-style-xsl
BuildRequires: xsltproc
BuildRequires: docbook-style-xsl
%if %build_pgsql
BuildRequires: postgresql-devel
%endif
@ -155,23 +154,23 @@ BuildRequires: mysql-devel
BuildRequires: acl-devel
BuildRequires: openldap-devel
%if %{with ads}
BuildRequires: openldap-devel krb5-devel
BuildRequires: openldap-devel
BuildRequires: krb5-devel
%endif
BuildRequires: keyutils-devel
BuildRequires: pkgconfig(tdb) >= 1.2.1 python-tdb
BuildRequires: ldb-devel >= 1:1.1.15 pyldb-util-devel >= 1:1.1.15
BuildRequires: pkgconfig(tevent) python-tevent
BuildRequires: pkgconfig(talloc) pkgconfig(pytalloc-util)
BuildRequires: pkgconfig(tdb) >= 1.2.1
BuildRequires: python-tdb
BuildRequires: ldb-devel >= 1:1.1.15
BuildRequires: pyldb-util-devel >= 1:1.1.15
BuildRequires: pkgconfig(tevent)
BuildRequires: python-tevent
BuildRequires: pkgconfig(talloc)
BuildRequires: pkgconfig(pytalloc-util)
BuildRequires: pkgconfig(ctdb) >= 2.0
BuildRequires: pkgconfig(gnutls)
Requires(pre): chkconfig mktemp psmisc
Requires(pre): coreutils sed grep
# SWAT is no longer included in 4.1.x. For now it has been removed
# without replacement, maybe it will come back later
Obsoletes: %{name}-swat < %{EVRD}
%define __noautoreq 'devel.*'
%description
@ -205,10 +204,11 @@ Requires: %{name}-common = %{EVRD}
Requires: %{name}-python = %{EVRD}
Requires(pre): rpm-helper
Group: Networking/Other
Provides: samba = %EVRD
Obsoletes: samba < %EVRD
Provides: samba-server-ldap = %EVRD
Obsoletes: samba-server-ldap < %EVRD
%rename samba
%rename samba-server-ldap
# SWAT is no longer included in 4.1.x. For now it has been removed
# without replacement, maybe it will come back later
Obsoletes: %{name}-swat < 4.1.6
%description server
Samba-server provides a SMB server which can be used to provide
@ -234,11 +234,10 @@ Requires: mount-cifs
%rename samba3-client
Obsoletes: smbfs
# For samba-tool
Requires: python-talloc python-ldb python-tdb
Requires: python-talloc
Requires: python-ldb
Requires: python-tdb
Requires: ldb-utils
%ifarch x86_64
Conflicts: cups < 1.2.0-0.5361.0mdk
%endif
%description client
Samba-client provides some SMB clients, which complement the built-in
@ -355,7 +354,7 @@ allowing the development of other software to access SMB shares.
%package devel
Summary: Samba 4 development package
Group: Development/C
Requires: %{libname}-devel = %EVRD
Requires: %{libname}-devel = %{EVRD}
%description devel
Samba 4 development libraries
@ -378,7 +377,7 @@ Samba library for accessing functions in 'net' binary
Group: Development/C
Summary: Samba library for accessing functions in 'net' binary
Provides: netapi-devel = %{EVRD}
Requires: %libnetapi = %{EVRD}
Requires: %{libnetapi} = %{EVRD}
%description -n %netapidevel
Samba library for accessing functions in 'net' binary
@ -394,7 +393,7 @@ Samba Library for accessing smb share modes (locks etc.)
Group: Development/C
Summary: Samba Library for accessing smb share modes (locks etc.)
Provides: smbsharemodes-devel = %{EVRD}
Requires: %libsmbsharemodes = %{EVRD}
Requires: %{libsmbsharemodes} = %{EVRD}
%description -n %smbsharemodesdevel
Samba Library for accessing smb share modes (locks etc.)
@ -410,7 +409,7 @@ Library implementing DCE/RPC for Samba4
Group: Development/C
Summary: Library implementing Samba's memory allocator
Provides: dcerpc-devel = %{EVRD}
Requires: %libdcerpc = %{EVRD}
Requires: %{libdcerpc} = %{EVRD}
%description -n %dcerpcdevel
Library implementing Samba's memory allocator
@ -426,7 +425,7 @@ Network Data Representation library from Samba4
Group: Development/C
Summary: Development files for Network Data Representation library from Samba4
Provides: ndr-devel = %{EVRD}
Requires: %libndr = %{EVRD}
Requires: %{libndr} = %{EVRD}
%description -n %ndrdevel
Development files for Network Data Representation library from Samba4
@ -442,7 +441,7 @@ Samba4's host configuration library
Group: Development/C
Summary: Samba4's host configuration library
Provides: samba-hostconfig-devel = %{EVRD}
Requires: %libsambahostconfig = %{EVRD}
Requires: %{libsambahostconfig} = %{EVRD}
%description -n %sambahostconfigdevel
Samba4's host configuration library
@ -473,7 +472,7 @@ Samba4 utility library
Group: Development/C
Summary: Development files for Samba4 utility library
Provides: samba-util-devel = %{EVRD}
Requires: %libsambautil = %{EVRD}
Requires: %{libsambautil} = %{EVRD}
%description -n %sambautildevel
Development files for Samba4 utility library
@ -489,7 +488,7 @@ Samba4 registry library
Group: Development/C
Summary: Development files for Samba4 registry library
Provides: registry-devel = %{EVRD}
Requires: %libregistry = %{EVRD}
Requires: %{libregistry} = %{EVRD}
%description -n %registrydevel
Development files for Samba4 registry library
@ -505,7 +504,7 @@ Samba4 generic security library
Group: Development/C
Summary: Development files for Samba4 generic security library
Provides: gensecdevel = %{EVRD}
Requires: %libgensec = %{EVRD}
Requires: %{libgensec} = %{EVRD}
%description -n %gensecdevel
Development files for Samba4 generic security library
@ -521,7 +520,7 @@ Samba4 policy library
Group: Development/C
Summary: Development files for Samba4 policy library
Provides: policydevel = %{EVRD}
Requires: %libpolicy = %{EVRD}
Requires: %{libpolicy} = %{EVRD}
%description -n %libpolicydevel
Development files for Samba4 policy library
@ -537,7 +536,7 @@ Samba4 samdb library
Group: Development/C
Summary: Development files for Samba4 samdb library
Provides: samdbdevel = %{EVRD}
Requires: %libsamdb = %{EVRD}
Requires: %{libsamdb} = %{EVRD}
%description -n %libsamdbdevel
Development files for Samba4 samdb library
@ -772,12 +771,12 @@ buildtools/bin/waf configure --enable-fhs \
--enable-socket-wrapper \
--enable-uid-wrapper \
--with-piddir=/run \
--prefix=%_prefix \
--libdir=%_libdir \
--sysconfdir=%_sysconfdir \
--datadir=%_datadir \
--localstatedir=%_localstatedir \
--with-modulesdir=%_libdir/%name \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--localstatedir=%{_localstatedir} \
--with-modulesdir=%{_libdir}/%{name} \
-v -v -p \
%?_smp_mflags
@ -790,16 +789,15 @@ buildtools/bin/waf build -v -v %?_smp_mflags
%if %{with gtk}
cd source3/lib/netapi/examples/netdomjoin-gui
%__cc %optflags `pkg-config --cflags gtk+-2.0` -I../../../../../bin/default/include/public -o netdomjoin-gui netdomjoin-gui.c -L../../../../../bin/default/source3/ -lnetapi `pkg-config --libs gtk+-2.0`
%__cc %{optflags} `pkg-config --cflags gtk+-2.0` -I../../../../../bin/default/include/public -o netdomjoin-gui netdomjoin-gui.c -L../../../../../bin/default/source3/ -lnetapi `pkg-config --libs gtk+-2.0`
%endif
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
# Put stuff where it should go.
mkdir -p %buildroot/%{_libdir}/samba/
mkdir -p %buildroot/%{_datadir}/man/man8/
mkdir -p %{buildroot}/%{_libdir}/samba/
mkdir -p %{buildroot}/%{_datadir}/man/man8/
# Any entries here mean samba makefile is *really* broken:
@ -809,9 +807,9 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/vfs
%makeinstall_std
# PAM modules don't go to /usr...
if [ -e %buildroot%_libdir/security ]; then
if [ -e %{buildroot}%{_libdir}/security ]; then
mkdir -p %{buildroot}/%_lib
mv %buildroot%_libdir/security %buildroot/%_lib
mv %{buildroot}%{_libdir}/security %{buildroot}/%_lib
fi
#Even though we tell waf above where to put perl it gets it wrong
@ -838,7 +836,7 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/vfs
mkdir -p %{buildroot}%{_datadir}/%{name}/scripts
# Fix some paths so provision works:
perl -pi -e 's,default_ldb_modules_dir = None,default_ldb_modules_dir = \"%{_libdir}/%{name}/ldb\",g' %{buildroot}/%{python_sitearch}/samba/__init__.py
perl -pi -e 's,default_ldb_modules_dir = None,default_ldb_modules_dir = \"%{_libdir}/%{name}/ldb\",g' %{buildroot}/%{py_platsitedir}/samba/__init__.py
#perl -pi -e 's,share/samba/setup,share/%{name}/setup,g' %{buildroot}/%{python_sitearch}/samba/provision.py
%if %{with gtk}
@ -895,22 +893,22 @@ touch %{buildroot}/%{_sysconfdir}/%{name}/smb.conf
echo 127.0.0.1 localhost > %{buildroot}/%{_sysconfdir}/%{name}/lmhosts
install -c -m 755 %{SOURCE10} %{buildroot}%{_datadir}/%name/scripts/print-pdf
install -c -m 755 %{SOURCE10} %{buildroot}%{_datadir}/%{name}/scripts/print-pdf
# Move some stuff where it belongs...
mkdir -p %buildroot%_lib
mv %buildroot%_libdir/libnss* %buildroot/%_lib/
mkdir -p %{buildroot}%_lib
mv %{buildroot}%{_libdir}/libnss* %{buildroot}/%_lib/
rm -f %{buildroot}/%{_mandir}/man1/testprns*
mkdir -p %buildroot%_sysconfdir/ld.so.conf.d
cat >%buildroot%_sysconfdir/ld.so.conf.d/samba.conf <<EOF
%_libdir/samba
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
cat >%{buildroot}%{_sysconfdir}/ld.so.conf.d/samba.conf <<EOF
%{_libdir}/samba
EOF
mkdir -p %buildroot%_unitdir %buildroot%_sysconfdir/sysconfig
cp -a packaging/systemd/*.service %buildroot%_unitdir/
cp -a packaging/systemd/samba.sysconfig %buildroot%_sysconfdir/sysconfig/samba
mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
cp -a packaging/systemd/*.service %{buildroot}%{_unitdir}/
cp -a packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
%post server
@ -992,7 +990,7 @@ fi
#%{_libdir}/%{name}/vfs
%{_libdir}/%{name}/vfs/*.so
#dir %{_libdir}/samba/pdb
%dir %_libdir/samba
%dir %{_libdir}/samba
%{_libdir}/samba/ldb
%{_libdir}/samba/service
%{_libdir}/samba/process_model
@ -1113,12 +1111,12 @@ fi
%{_libdir}/samba/libwind-samba4.so.0
%{_libdir}/samba/libwind-samba4.so.0.0.0
%{_libdir}/samba/libxattr_tdb.so
%dir %_libdir/samba/vfs
%dir %{_libdir}/samba/vfs
%{_libdir}/mit_samba.so
%{_libdir}/%{name}/nss_info
%_sbindir/smbd
%_sbindir/nmbd
%_sbindir/samba_upgradedns
%{_sbindir}/smbd
%{_sbindir}/nmbd
%{_sbindir}/samba_upgradedns
#attr(-,root,root) %config(noreplace) %{_sysconfdir}/%{name}/smbusers
#%attr(-,root,root) %config(noreplace) %{_initrddir}/wrepld
%attr(-,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@ -1133,16 +1131,16 @@ fi
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/scripts
%{_datadir}/samba/setup
%attr(0755,root,root) %{_datadir}/%name/scripts/print-pdf
%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
#attr(0755,root,root) %{_datadir}/samba/scripts/convertSambaAccount
%{_mandir}/man8/idmap_*.8*
#{_mandir}/man8/vfs_*.8*
%{_mandir}/man8/samba.8*
%_sysconfdir/ld.so.conf.d
%_unitdir/samba.service
%_unitdir/smb.service
%_unitdir/nmb.service
%config(noreplace) %_sysconfdir/sysconfig/samba
%{_sysconfdir}/ld.so.conf.d
%{_unitdir}/samba.service
%{_unitdir}/smb.service
%{_unitdir}/nmb.service
%config(noreplace) %{_sysconfdir}/sysconfig/samba
%if %{with doc}
%files doc
@ -1164,7 +1162,7 @@ fi
#{_bindir}/masktest3
#{_bindir}/msgtest
%{_bindir}/net
%_bindir/nmblookup4
%{_bindir}/nmblookup4
%{_bindir}/pdbedit
#{_bindir}/pdbtest
%{_bindir}/profiles
@ -1175,7 +1173,7 @@ fi
%{_sbindir}/samba_kcc
%{_bindir}/sharesec
%{_bindir}/smbcacls
%_bindir/smbclient4
%{_bindir}/smbclient4
#{_bindir}/smbconftort
%{_bindir}/smbcontrol
%{_bindir}/smbcquotas
@ -1205,16 +1203,16 @@ fi
# %{_mandir}/man1/nmblookup
# %(for i in %{_mandir}/%{client_man}.[0-9]%{_extension};do echo $i;done)
%_mandir/man1/dbwrap_tool.1*
%_mandir/man8/samba-tool.8*
%_mandir/man8/ntdbbackup.8*
%_mandir/man8/ntdbdump.8*
%_mandir/man8/ntdbrestore.8*
%_mandir/man8/ntdbtool.8*
%_mandir/man8/samba-regedit.8*
%_mandir/man8/vfs_btrfs.8*
%_mandir/man8/vfs_linux_xfs_sgid.8*
%_mandir/man8/vfs_syncops.8*
%{_mandir}/man1/dbwrap_tool.1*
%{_mandir}/man8/samba-tool.8*
%{_mandir}/man8/ntdbbackup.8*
%{_mandir}/man8/ntdbdump.8*
%{_mandir}/man8/ntdbrestore.8*
%{_mandir}/man8/ntdbtool.8*
%{_mandir}/man8/samba-regedit.8*
%{_mandir}/man8/vfs_btrfs.8*
%{_mandir}/man8/vfs_linux_xfs_sgid.8*
%{_mandir}/man8/vfs_syncops.8*
#xclude %{_mandir}/man?/smbget*
#{_mandir}/man5/smbgetrc.5*
@ -1322,19 +1320,19 @@ fi
%{_mandir}/man8/winbindd.8*
%files -n %libpdb
%_libdir/libpdb.so.*
%{_libdir}/libpdb.so.*
%files -n %libcredentials
%_libdir/libsamba-credentials.so.*
%{_libdir}/libsamba-credentials.so.*
%files -n %libsmbconf
%_libdir/libsmbconf.so.*
%{_libdir}/libsmbconf.so.*
%files -n %libsmbldap
%_libdir/libsmbldap.so.*
%{_libdir}/libsmbldap.so.*
%files -n %libtevent_util
%_libdir/libtevent-util.so.*
%{_libdir}/libtevent-util.so.*
%files winbind
# %config(noreplace) %{_sysconfdir}/security/pam_winbind.conf
@ -1350,13 +1348,13 @@ fi
# %{_mandir}/man7/pam_winbind.7*
# %{_mandir}/man7/winbind_krb5_locator.7.*
# %{_mandir}/man1/wbinfo*.1*
%_unitdir/winbind.service
%{_unitdir}/winbind.service
%files -n nss_wins
%attr(755,root,root) /%{_lib}/libnss_wins.so*
%files python
%{python_sitearch}/samba
%{py_platsitedir}/samba
#exclude %py_platsitedir/subunit
%{_libdir}/python2.7/site-packages/ntdb.so
@ -1373,7 +1371,7 @@ fi
%files -n %{libname}
%{_libdir}/libsmbclient.so.%{libsmbmajor}*
%_libdir/libsmbclient-raw.so.*
%{_libdir}/libsmbclient-raw.so.*
%files -n %{libname}-devel
%{_includedir}/samba-4.0/libsmbclient.h
@ -1411,13 +1409,13 @@ fi
%{_includedir}/samba-4.0/ldb_wrap.h
%{_libdir}/pkgconfig/torture.pc
%{_libdir}/pkgconfig/samba-util.pc
%_libdir/libtorture.so
%_libdir/libpdb.so
%_libdir/libsamba-credentials.so
%_libdir/libsmbclient-raw.so
%_libdir/libsmbconf.so
%_libdir/libsmbldap.so
%_libdir/libtevent-util.so
%{_libdir}/libtorture.so
%{_libdir}/libpdb.so
%{_libdir}/libsamba-credentials.so
%{_libdir}/libsmbclient-raw.so
%{_libdir}/libsmbconf.so
%{_libdir}/libsmbldap.so
%{_libdir}/libtevent-util.so
%{_includedir}/samba-4.0/lookup_sid.h
%{_includedir}/samba-4.0/machine_sid.h
%{_includedir}/samba-4.0/passdb.h
@ -1463,7 +1461,7 @@ fi
%files -n %netapidevel
%{_libdir}/libnetapi*.so
%{_includedir}/samba-4.0/netapi.h
%_libdir/pkgconfig/netapi.pc
%{_libdir}/pkgconfig/netapi.pc
%files -n %libsmbsharemodes
%{_libdir}/libsmbsharemodes.so.%{smbsharemodesmajor}*
@ -1477,7 +1475,7 @@ fi
%{_libdir}/libdcerpc.so.*
%{_libdir}/libdcerpc-samr.so.*
%{_libdir}/libdcerpc-atsvc.so.*
%_libdir/libdcerpc-binding.so.*
%{_libdir}/libdcerpc-binding.so.*
%{_libdir}/libdcerpc-server.so.*
%files -n %dcerpcdevel
@ -1488,7 +1486,7 @@ fi
%{_libdir}/libdcerpc.so
%{_libdir}/libdcerpc-samr.so
%{_libdir}/libdcerpc-atsvc.so
%_libdir/libdcerpc-binding.so
%{_libdir}/libdcerpc-binding.so
%{_libdir}/libdcerpc-server.so
%files -n %libndr
@ -1569,11 +1567,10 @@ fi
#%exclude %{_mandir}/man1/editreg*
%files -n %libtorture
%_libdir/libtorture.so.0*
%{_libdir}/libtorture.so.0*
%if %{with gtk}
%files domainjoin-gui
%defattr(-,root,root)
%{_sbindir}/netdomjoin-gui
%dir %{_datadir}/pixmaps/samba
%{_datadir}/pixmaps/samba/samba.ico