Revert to accidently overwritten state.
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=238
This commit is contained in:
parent
5799e66cc1
commit
682bd9e573
@ -1,2 +1,2 @@
|
||||
2799M
|
||||
Branch : 3.6.5
|
||||
2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cd86be1a627f462a4c312f4dfc000b7e804e7e669affb6aa524a453879fe056a
|
||||
size 53537
|
||||
oid sha256:69e6748aecc26b93e4518843a20136491669ade44337ccb1e6059b7f193d334b
|
||||
size 53552
|
||||
|
@ -451,7 +451,7 @@ This package contains all the Samba documentation as it is not part of
|
||||
the man pages.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%changelog
|
||||
|
@ -1,8 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 14 09:37:57 UTC 2012 - lmuelle@suse.com
|
||||
|
||||
- Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 2 13:17:54 UTC 2012 - lmuelle@suse.com
|
||||
|
||||
|
145
samba.spec
145
samba.spec
@ -211,8 +211,8 @@ binary packages of the most current Samba version, and a bug reporting
|
||||
how to.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package client
|
||||
License: GPL-3.0+
|
||||
@ -252,8 +252,8 @@ binary packages of the most current Samba version, and a bug reporting
|
||||
how to.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
|
||||
|
||||
@ -272,8 +272,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of Samba.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%endif
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
|
||||
@ -297,8 +297,8 @@ This package contains all the Samba documentation as it is not part of
|
||||
the man pages.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%endif
|
||||
|
||||
@ -319,8 +319,8 @@ Requires: samba-client >= %{version}
|
||||
A wrapper binary to run smbspool with the original calling UID.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%if %{make_utils}
|
||||
|
||||
@ -335,8 +335,8 @@ Obsoletes: samba-gplv3-utils < %{version}
|
||||
Some of the debug-tools for developpers.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%endif
|
||||
|
||||
@ -368,8 +368,8 @@ PreReq: coreutils
|
||||
This is the winbind-daemon and the wbinfo-tool.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
@ -394,15 +394,15 @@ PreReq: /sbin/ldconfig
|
||||
|
||||
%description -n libsmbclient
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%else
|
||||
|
||||
%description -n libsmbclient0
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%endif
|
||||
This package includes the libsmbclient library.
|
||||
@ -440,8 +440,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the smbclient programming interface.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libnetapi0
|
||||
License: GPL-3.0+
|
||||
@ -453,8 +453,8 @@ PreReq: /sbin/ldconfig
|
||||
This package includes the netapi library.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libnetapi-devel
|
||||
License: GPL-3.0+
|
||||
@ -472,8 +472,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the netapi programming interface.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
@ -493,15 +493,15 @@ PreReq: /sbin/ldconfig
|
||||
|
||||
%description -n libsmbsharemodes
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%else
|
||||
|
||||
%description -n libsmbsharemodes0
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%endif
|
||||
This package includes the smbsharemodes library.
|
||||
@ -526,8 +526,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the smbsharemodes programming interface.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libwbclient0
|
||||
License: LGPL-3.0+
|
||||
@ -539,8 +539,8 @@ PreReq: /sbin/ldconfig
|
||||
This package includes the wbclient library.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libwbclient-devel
|
||||
License: LGPL-3.0+
|
||||
@ -558,10 +558,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the wbclient programming interface.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libtalloc2
|
||||
Version: %{libtalloc_ver}
|
||||
@ -575,8 +573,8 @@ PreReq: /sbin/ldconfig
|
||||
This package includes the talloc library.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libtalloc-devel
|
||||
Version: %{libtalloc_ver}
|
||||
@ -596,8 +594,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the talloc programming interface.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libtdb1
|
||||
Version: %{libtdb_ver}
|
||||
@ -611,8 +609,8 @@ PreReq: /sbin/ldconfig
|
||||
This package includes the tdb library.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libtdb-devel
|
||||
Version: %{libtdb_ver}
|
||||
@ -628,8 +626,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the tdb programming interface.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libtevent0
|
||||
Version: %{libtevent_ver}
|
||||
@ -643,8 +641,8 @@ PreReq: /sbin/ldconfig
|
||||
This package includes the tevent library.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libtevent-devel
|
||||
Version: %{libtevent_ver}
|
||||
@ -665,8 +663,8 @@ This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the tevent programming interface.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libldb1
|
||||
Version: %{libldb_ver}
|
||||
@ -681,8 +679,8 @@ PreReq: /sbin/ldconfig
|
||||
This package includes the ldb library.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%package -n libldb-devel
|
||||
Version: %{libldb_ver}
|
||||
@ -702,10 +700,9 @@ Requires: libtalloc-devel
|
||||
This package contains the static libraries and header files needed to
|
||||
develop programs which make use of the tevent programming interface.
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
|
||||
%endif
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%if %{make_ldapsmb}
|
||||
|
||||
@ -722,15 +719,15 @@ This tool aims to simplify the administration of a Samba Domain
|
||||
Controller that uses the ldapsam passdb backend.
|
||||
|
||||
|
||||
Source Timestamp: 2799M
|
||||
Branch : 3.6.5
|
||||
Source Timestamp: 2799
|
||||
Branch : 3.6.5.PTF
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -n samba-%{samba_ver_full} -q
|
||||
# check if our library versions from the spec are still current
|
||||
%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130
|
||||
grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \
|
||||
exit 1
|
||||
grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \
|
||||
@ -893,8 +890,6 @@ popd
|
||||
%endif
|
||||
popd
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
|
||||
for lib_dir in tdb talloc; do
|
||||
pushd lib/${lib_dir}
|
||||
./configure \
|
||||
@ -933,16 +928,12 @@ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include
|
||||
make
|
||||
popd
|
||||
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
for lib_dir in tdb talloc tevent; do
|
||||
pushd lib/${lib_dir}
|
||||
make test
|
||||
popd
|
||||
done
|
||||
%endif
|
||||
pushd source3
|
||||
make test_shlibs
|
||||
make test_nss_modules
|
||||
@ -986,9 +977,6 @@ install -d -m 0755 -p \
|
||||
%{buildroot}/%{DOCBOOKDIR} \
|
||||
%{buildroot}/%{SWATDIR}/help \
|
||||
%{buildroot}/%{_datadir}/susehelp/meta/Administration/System
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
|
||||
for lib_dir in tdb talloc tevent; do
|
||||
pushd lib/${lib_dir}
|
||||
make install \
|
||||
@ -1001,15 +989,9 @@ make -C source4/lib/ldb/ install \
|
||||
CONFIGDIR=%{CONFIGDIR}
|
||||
# we prefer the s3 binaries of the tdbtools
|
||||
rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool}
|
||||
|
||||
%endif
|
||||
|
||||
make -C source3/ install \
|
||||
DESTDIR=%{buildroot} \
|
||||
CONFIGDIR=%{CONFIGDIR}
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
|
||||
# libtalloc
|
||||
#rm %{buildroot}/%{_libdir}/*talloc*
|
||||
make -C lib/talloc/ install \
|
||||
@ -1022,9 +1004,6 @@ make -C lib/talloc/ install \
|
||||
rm -r %{buildroot}/%{python_sitearch} \
|
||||
%{buildroot}/%{_libdir}/ldb/lib{t*,p*} \
|
||||
%{buildroot}/%{_libdir}/tevent
|
||||
|
||||
%endif
|
||||
|
||||
for file in source3/pkgconfig/*.pc; do
|
||||
install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig
|
||||
done
|
||||
@ -1320,20 +1299,14 @@ fi
|
||||
|
||||
%postun -n libnetapi0 -p /sbin/ldconfig
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
|
||||
%post -n libtalloc2 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libtalloc2 -p /sbin/ldconfig
|
||||
|
||||
%endif
|
||||
|
||||
%post -n libwbclient0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libwbclient0 -p /sbin/ldconfig
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
|
||||
%post -n libtdb1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libtdb1 -p /sbin/ldconfig
|
||||
@ -1345,9 +1318,6 @@ fi
|
||||
%post -n libldb1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libldb1 -p /sbin/ldconfig
|
||||
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
|
||||
|
||||
%pre doc
|
||||
@ -1776,8 +1746,6 @@ fi
|
||||
%{_libdir}/libsmbsharemodes.so
|
||||
%{_libdir}/pkgconfig/smbsharemodes.pc
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
|
||||
%files -n libtalloc2
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libpytalloc-util.so.*
|
||||
@ -1808,8 +1776,6 @@ fi
|
||||
%{_libdir}/libtdb.so
|
||||
%{_libdir}/pkgconfig/tdb.pc
|
||||
|
||||
%endif
|
||||
|
||||
%files -n libwbclient0
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libwbclient.so.*
|
||||
@ -1822,8 +1788,6 @@ fi
|
||||
%{_libdir}/libwbclient.so
|
||||
%{_libdir}/pkgconfig/wbclient.pc
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1211
|
||||
|
||||
%files -n libtevent0
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libtevent.so.*
|
||||
@ -1849,9 +1813,6 @@ fi
|
||||
%{_libdir}/libpyldb-util.so
|
||||
%{_libdir}/pkgconfig/ldb.pc
|
||||
%{_libdir}/pkgconfig/pyldb-util.pc
|
||||
|
||||
%endif
|
||||
|
||||
%if %{make_ldapsmb}
|
||||
|
||||
%files -n ldapsmb
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:946e6efe5c37e29a29e4826e2d428896b2e42309695d7880d12c0d50cac37ff4
|
||||
size 52549
|
||||
oid sha256:f994a4bd2415e99d0199f8a2610477f2042753007345558a11fee71f4496dd2e
|
||||
size 52523
|
||||
|
Loading…
Reference in New Issue
Block a user