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

Remove ldapsmb from the main spec file.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=319
This commit is contained in:
Lars Müller 2013-06-28 17:10:44 +00:00 committed by Git OBS Bridge
parent 75bbf329a6
commit 5f1ef52525
5 changed files with 11 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e822e6f9d6ddc1a8b0c3ea9ce851410d425d778bf7efb8c59a11883ef90981a6
size 37801
oid sha256:92de76e6d4e665c3983304ca2158577f72dfae275dbdd79b9505446615fa57b6
size 37272

9
samba-doc.spec
View File

@ -129,11 +129,10 @@ BuildRequires: libtevent-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3027
%define SOURCE_TIMESTAMP 3028
%define BRANCH %{version}
Version: 3.6.16
Release: 0
%define ldapsmb_ver 1.34b
Url: http://www.samba.org/
License: GPL-3.0+
Summary: Samba Documentation
@ -149,7 +148,6 @@ Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.t
Source1: vendor-files.tar.bz2
Source2: patches.tar.bz2
Source4: baselibs.conf
Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2
# Choose some features / extra packages here
############################################
%define make_devel 0
@ -160,7 +158,6 @@ BuildRequires: ccache
# requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent
%define make_doc 0
%define make_utils 0
%define make_ldapsmb 1
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
%define cifs_init_script cifs
%else
@ -210,10 +207,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# samba-doc nowadays is part the main samba spec file
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%setup -n samba-%{samba_ver_full} -q
# ldapsmb
%if %{make_ldapsmb}
%setup -T -D -a 11 -n samba-%{samba_ver_full} -q
%endif
# patches
%setup -T -D -a 2 -n samba-%{samba_ver_full} -q
for patch in $( patches/tools/guards %{guards_symbols} <patches/series); do

5
samba.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 28 16:49:31 UTC 2013 - lmuelle@suse.com
- Remove ldapsmb from the main spec file.
-------------------------------------------------------------------
Wed Jun 26 13:55:13 UTC 2013 - lmuelle@suse.com

48
samba.spec
View File

@ -129,11 +129,10 @@ BuildRequires: libtevent-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3027
%define SOURCE_TIMESTAMP 3028
%define BRANCH %{version}
Version: 3.6.16
Release: 0
%define ldapsmb_ver 1.34b
License: GPL-3.0+
Url: http://www.samba.org/
Group: Productivity/Networking/Samba
@ -152,7 +151,6 @@ Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.t
Source1: vendor-files.tar.bz2
Source2: patches.tar.bz2
Source4: baselibs.conf
Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2
PreReq: /usr/bin/getent
PreReq: /usr/sbin/groupadd
PreReq: coreutils
@ -167,7 +165,6 @@ BuildRequires: ccache
# requires: docbook-utils docbook-xsl-stylesheets docbook_4 freetype2 ghostscript-fonts-std ghostscript-library ghostscript-x11 libxslt sgml-skel te_etex te_latex te_pdf tetex xmlcharent
%define make_doc 0
%define make_utils 0
%define make_ldapsmb 1
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
%define cifs_init_script cifs
%else
@ -645,26 +642,6 @@ develop programs which make use of the tevent programming interface.
Source Timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%endif
%if %{make_ldapsmb}
%package -n ldapsmb
Version: 1.34b
Release: 0
License: GPL-2.0+
Summary: Tool to administer Samba's LDAP backend
Group: Productivity/Networking/Samba
Requires: perl-ldap
%description -n ldapsmb
This tool aims to simplify the administration of a Samba Domain
Controller that uses the ldapsam passdb backend.
Source Timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%endif
%prep
@ -680,10 +657,6 @@ grep "^VERSION = '%{libtdb_ver}'$" lib/tdb/wscript || \
grep "^VERSION = '%{libtevent_ver}'$" lib/tevent/wscript || \
exit 1
%endif
# ldapsmb
%if %{make_ldapsmb}
%setup -T -D -a 11 -n samba-%{samba_ver_full} -q
%endif
# patches
%setup -T -D -a 2 -n samba-%{samba_ver_full} -q
for patch in $( patches/tools/guards %{guards_symbols} <patches/series); do
@ -814,13 +787,6 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer"
make samba3-idl
make %{build_make_smp_mflags} \
all bin/smbfilter
%if %{make_ldapsmb}
pushd ../ldapsmb-%{ldapsmb_ver}
./autogen.sh
rm ldapsmb
make %{build_make_smp_mflags} all doc
popd
%endif
popd
%if 0%{?suse_version} && 0%{?suse_version} < 1211
@ -1112,10 +1078,6 @@ install -m 0755 source3/bin/locktest %{buildroot}/%{_bindir}/locktest
install -m 0755 source3/bin/nsstest %{buildroot}/%{_bindir}/nsstest
install -m 0755 source3/bin/vfstest %{buildroot}/%{_bindir}/vfstest
%endif
%if %{make_ldapsmb}
install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb %{buildroot}/%{_sbindir}/
cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 %{buildroot}/%{_mandir}/man5
%endif
# cups SMB support
mkdir -p %{buildroot}/%{cups_lib_dir}/backend/
touch %{buildroot}/%{cups_lib_dir}/backend/smb
@ -1718,12 +1680,4 @@ fi
%endif
%if %{make_ldapsmb}
%files -n ldapsmb
%defattr(-,root,root)
%{_sbindir}/ldapsmb
%{_mandir}/man5/ldapsmb.5.*
%endif
%changelog

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8c9f5ec0257aa3ef316b262cd33e8d4e2cf32dac57fcc007656322ea6e0e9a7
size 53643
oid sha256:7ec8ea0364a922a25d84ab4043e4bcd4c88b17657e78e86b94ce5db8c6890688
size 53566