Accepting request 62653 from network:samba:STABLE
Accepted submit request 62653 from user lmuelle OBS-URL: https://build.opensuse.org/request/show/62653 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=88
This commit is contained in:
commit
ea0d7ae471
@ -1,2 +1,2 @@
|
||||
2497
|
||||
2501
|
||||
Branch : 3.5.6
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b2388df274054fed97b575968587fd8d6314701bbd816d56db3c45ada680698
|
||||
size 78765
|
||||
oid sha256:2581ece364e2c7faa799af88fbc7062e52621ad34e413a2a3a895fc0e776e6bc
|
||||
size 78819
|
||||
|
@ -77,7 +77,7 @@ BuildRequires: pkgconfig
|
||||
%endif
|
||||
Url: http://www.samba.org/
|
||||
Version: 3.5.6
|
||||
Release: 6
|
||||
Release: 7
|
||||
License: GPLv3+
|
||||
Summary: Samba Documentation
|
||||
Group: Documentation/Other
|
||||
@ -296,6 +296,8 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer"
|
||||
./script/mkversion.sh
|
||||
|
||||
%install
|
||||
# samba-doc nowadays is part the main samba spec file
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1111
|
||||
mkdir -p \
|
||||
${RPM_BUILD_ROOT}/%{DOCDIR} \
|
||||
${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \
|
||||
@ -372,6 +374,7 @@ rm -f \
|
||||
${RPM_BUILD_ROOT}/%{_mandir}/man1/log2pcap.1* \
|
||||
${RPM_BUILD_ROOT}/%{_mandir}/man1/vfstest.1*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%pre
|
||||
# Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html
|
||||
@ -389,6 +392,9 @@ fi
|
||||
%clean
|
||||
[ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}"
|
||||
|
||||
# samba-doc nowadays is part the main samba spec file
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1111
|
||||
|
||||
%files -f filelist-samba-doc
|
||||
%defattr(-,root,root)
|
||||
%dir %{DOCDIR}
|
||||
@ -396,6 +402,7 @@ fi
|
||||
%dir %{SWATDIR}
|
||||
%dir %{SWATDIR}/help
|
||||
%doc %{_datadir}/susehelp
|
||||
%endif
|
||||
|
||||
%description
|
||||
This package contains all the Samba documentation as it is not part of
|
||||
@ -407,7 +414,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%changelog
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 23 11:20:14 UTC 2011 - lmuelle@suse.de
|
||||
|
||||
- Disable separate build of samba-doc for post-11.1 systems.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 17 13:25:08 CET 2011 - ddiss@suse.de
|
||||
|
||||
|
72
samba.spec
72
samba.spec
@ -82,7 +82,7 @@ Group: Productivity/Networking/Samba
|
||||
Url: http://www.samba.org/
|
||||
AutoReqProv: on
|
||||
Version: 3.5.6
|
||||
Release: 6
|
||||
Release: 7
|
||||
Provides: samba-gplv3 = %{version}-%{release}
|
||||
Obsoletes: samba-gplv3 < %{version}
|
||||
%ifarch ppc64
|
||||
@ -184,7 +184,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package client
|
||||
@ -230,7 +230,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
|
||||
@ -257,7 +257,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%endif
|
||||
@ -287,7 +287,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%endif
|
||||
@ -314,14 +314,13 @@ Authors:
|
||||
--------
|
||||
Jeremy Allison <jra at samba dot org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%if %{make_utils}
|
||||
|
||||
%package utils
|
||||
|
||||
|
||||
Summary: debug tools
|
||||
Group: Productivity/Networking/Samba
|
||||
AutoReqProv: on
|
||||
@ -365,7 +364,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
@ -390,7 +389,8 @@ PreReq: /sbin/ldconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
%description -n libsmbclient
|
||||
Source Timestamp: 2497
|
||||
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%else
|
||||
@ -435,7 +435,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libnetapi0
|
||||
@ -454,7 +454,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libnetapi-devel
|
||||
@ -474,7 +474,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
@ -494,7 +494,8 @@ PreReq: /sbin/ldconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1031
|
||||
|
||||
%description -n libsmbsharemodes
|
||||
Source Timestamp: 2497
|
||||
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%else
|
||||
@ -530,7 +531,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtalloc2
|
||||
@ -539,7 +540,7 @@ Summary: Samba talloc Library
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
Version: %{libtalloc_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
PreReq: /sbin/ldconfig
|
||||
|
||||
%description -n libtalloc2
|
||||
@ -551,7 +552,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtalloc-devel
|
||||
@ -560,7 +561,7 @@ Summary: Libraries and Header Files to Develop Programs with talloc Suppo
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: on
|
||||
Version: %{libtalloc_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
Requires: libtalloc2
|
||||
|
||||
%description -n libtalloc-devel
|
||||
@ -573,7 +574,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtdb1
|
||||
@ -582,7 +583,7 @@ Summary: Samba tdb Library
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
Version: %{libtdb_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
PreReq: /sbin/ldconfig
|
||||
|
||||
%description -n libtdb1
|
||||
@ -594,7 +595,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtdb-devel
|
||||
@ -603,7 +604,7 @@ Summary: Libraries and Header Files to Develop Programs with tdb Support
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: on
|
||||
Version: %{libtdb_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
Requires: libtdb1
|
||||
|
||||
%description -n libtdb-devel
|
||||
@ -616,7 +617,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libwbclient0
|
||||
@ -635,7 +636,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libwbclient-devel
|
||||
@ -655,7 +656,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtevent0
|
||||
@ -664,7 +665,7 @@ Summary: Samba tevent Library
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
Version: %{libtevent_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
PreReq: /sbin/ldconfig
|
||||
|
||||
%description -n libtevent0
|
||||
@ -676,7 +677,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtevent-devel
|
||||
@ -685,7 +686,7 @@ Summary: Libraries and Header Files to Develop Programs with tevent Suppo
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: on
|
||||
Version: %{libtevent_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
Requires: libtevent0
|
||||
|
||||
%description -n libtevent-devel
|
||||
@ -699,7 +700,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libldb0
|
||||
@ -708,7 +709,7 @@ Summary: Samba ldb Library
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
Version: %{libldb_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
PreReq: /sbin/ldconfig
|
||||
|
||||
%description -n libldb0
|
||||
@ -721,7 +722,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libldb-devel
|
||||
@ -730,7 +731,7 @@ Summary: Libraries and Header Files to Develop Programs with ldb Support
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: on
|
||||
Version: %{libldb_ver}
|
||||
Release: 2
|
||||
Release: 3
|
||||
Requires: libldb0
|
||||
|
||||
%description -n libldb-devel
|
||||
@ -743,7 +744,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%if %{make_ldapsmb}
|
||||
@ -754,7 +755,7 @@ Summary: Tool to administer Samba's LDAP backend
|
||||
Group: Productivity/Networking/Samba
|
||||
AutoReqProv: on
|
||||
Version: 1.34b
|
||||
Release: 298
|
||||
Release: 299
|
||||
Requires: perl-ldap
|
||||
|
||||
%description -n ldapsmb
|
||||
@ -767,7 +768,7 @@ Authors:
|
||||
--------
|
||||
Guenther Deschner <guenther at deschner dot de>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%endif
|
||||
@ -790,7 +791,7 @@ Authors:
|
||||
--------
|
||||
Steve French <sfrench at Samba dot org>
|
||||
|
||||
Source Timestamp: 2497
|
||||
Source Timestamp: 2501
|
||||
Branch : 3.5.6
|
||||
|
||||
%endif
|
||||
@ -2001,5 +2002,4 @@ fi
|
||||
/lib/mkinitrd/scripts/boot-cifs.sh
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9c7fae38eee7c38c4b78bcd983cd52bcc492c08decc26727e27660c32686cff1
|
||||
size 24772
|
||||
oid sha256:cf282876059bd18cbfe4e9fa6020a04518faeeda9ebb0b4d25da18f6141a16d1
|
||||
size 24814
|
||||
|
Loading…
Reference in New Issue
Block a user