diff --git a/patches.tar.bz2 b/patches.tar.bz2 index c2a5669..83bfe12 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ef1bee7dded31a3c0683ed1b86faeb6a2cc7754176c89ca2cccbccde95e8c91 -size 278585 +oid sha256:40f370507ff6074cb26418e166e7972f0a67adabcd6d09e08f299e693e6e6b54 +size 278134 diff --git a/samba.spec b/samba.spec index 9a4a6ef..0f654fe 100644 --- a/samba.spec +++ b/samba.spec @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf %endif -BuildRequires: cups-devel -BuildRequires: cyrus-sasl-devel -BuildRequires: e2fsprogs-devel BuildRequires: gcc BuildRequires: make BuildRequires: patch +BuildRequires: cups-devel +BuildRequires: cyrus-sasl-devel +BuildRequires: e2fsprogs-devel %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -46,8 +45,8 @@ BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel -BuildRequires: libopenssl-devel BuildRequires: openldap2-devel +BuildRequires: libopenssl-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -99,8 +98,8 @@ BuildRequires: libtalloc-devel BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel -BuildRequires: libtevent-devel BuildRequires: python-tdb +BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets @@ -111,8 +110,8 @@ BuildRequires: libxslt BuildRequires: libxslt1 %endif %if 0%{?suse_version} > 1210 -BuildRequires: dbus-1-devel BuildRequires: libxslt-tools +BuildRequires: dbus-1-devel %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -145,13 +144,15 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3224 +%define SOURCE_TIMESTAMP 3225 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 Version: 4.1.6 Release: 0 +License: GPL-3.0+ Url: http://www.samba.org/ +Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} @@ -160,8 +161,6 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server -License: GPL-3.0+ -Group: Productivity/Networking/Samba Source: %{samba_source_location} Source5: %{samba_source_signature_location} Source6: http://www.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc @@ -251,8 +250,8 @@ Branch: %{BRANCH} %package client -Summary: Samba Client Utilities License: GPL-3.0+ +Summary: Samba Client Utilities Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} Provides: smbfs @@ -291,8 +290,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package core-devel -Summary: Development files shared by Samba subpackages License: GPL-3.0+ +Summary: Development files shared by Samba subpackages Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -308,8 +307,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -Summary: Samba Documentation License: GPL-3.0+ +Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils PreReq: findutils @@ -331,9 +330,10 @@ Branch: %{BRANCH} %endif + %package libs -Summary: Samba libraries License: GPL-3.0+ +Summary: Samba libraries Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig @@ -347,8 +347,8 @@ Branch: %{BRANCH} %package pidl -Summary: Perl IDL compiler License: GPL-3.0+ +Summary: Perl IDL compiler Group: Development/Tools %if 0%{?suse_version} > 0 Requires: perl-base @@ -364,14 +364,14 @@ Branch: %{BRANCH} %package python -Summary: Samba Python libraries License: GPL-3.0+ +Summary: Samba Python libraries Group: Applications/System Requires: %{name} = %{version} +Requires: python-tevent +Requires: python-tdb Requires: pyldb Requires: pytalloc -Requires: python-tdb -Requires: python-tevent %description python The samba-python package contains the Python libraries needed by programs @@ -382,8 +382,8 @@ Branch: %{BRANCH} %package test -Summary: Testing tools for Samba servers and clients License: GPL-3.0+ +Summary: Testing tools for Samba servers and clients Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} @@ -398,8 +398,8 @@ Branch: %{BRANCH} %package test-devel -Summary: Testing devel files for Samba servers and clients License: GPL-3.0+ +Summary: Testing devel files for Samba servers and clients Group: Development/Libraries/C and C++ %description test-devel @@ -411,8 +411,8 @@ Branch: %{BRANCH} %package winbind -Summary: Winbind Daemon and Tool License: GPL-3.0+ +Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} @@ -424,7 +424,6 @@ Requires: pam-config %if 0%{?suse_version} > 1030 Recommends: cron Recommends: logrotate -Recommends: samba-krb-printing Recommends: /usr/sbin/nscd %endif %if 0%{?suse_version} > 0 @@ -442,8 +441,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc0 -Summary: DCE/RPC AT scheduler service library License: GPL-3.0+ +Summary: DCE/RPC AT scheduler service library Group: System/Libraries %description -n libdcerpc-atsvc0 @@ -455,8 +454,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc-devel -Summary: Development files for the DCE/RPC ATSVC library License: GPL-3.0+ +Summary: Development files for the DCE/RPC ATSVC library Group: Development/Libraries/C and C++ Requires: libdcerpc-atsvc0 = %{version} @@ -472,8 +471,8 @@ Branch: %{BRANCH} %package -n libdcerpc-binding0 -Summary: Some samba library License: GPL-3.0+ +Summary: Some samba library Group: System/Libraries %description -n libdcerpc-binding0 @@ -483,8 +482,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr0 -Summary: Security Account Manager (SAM) Remote Protocol library License: GPL-3.0+ +Summary: Security Account Manager (SAM) Remote Protocol library Group: System/Libraries %description -n libdcerpc-samr0 @@ -494,8 +493,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr-devel -Summary: Development files for the SAMR protocol library License: GPL-3.0+ +Summary: Development files for the SAMR protocol library Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -508,8 +507,8 @@ Branch: %{BRANCH} %package -n libdcerpc0 -Summary: Distributed Computing Environment Remote Procedure Calls library License: GPL-3.0+ +Summary: Distributed Computing Environment Remote Procedure Calls library Group: System/Libraries %description -n libdcerpc0 @@ -525,11 +524,11 @@ Branch: %{BRANCH} %package -n libdcerpc-devel -Summary: Development files for the DCE/RPC library License: GPL-3.0+ +Summary: Development files for the DCE/RPC library Group: Development/Libraries/C and C++ -Requires: libdcerpc-binding0 = %{version} Requires: libdcerpc0 = %{version} +Requires: libdcerpc-binding0 = %{version} Requires: samba-core-devel = %{version} %description -n libdcerpc-devel @@ -548,8 +547,8 @@ Branch: %{BRANCH} %package -n libgensec0 -Summary: Samba generic security library License: GPL-3.0+ +Summary: Samba generic security library Group: System/Libraries %description -n libgensec0 @@ -559,8 +558,8 @@ Branch: %{BRANCH} %package -n libgensec-devel -Summary: Development files for Samba's generic security library License: GPL-3.0+ +Summary: Development files for Samba's generic security library Group: Development/Libraries/C and C++ Requires: libgensec0 = %{version} Requires: samba-core-devel = %{version} @@ -574,8 +573,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac0 -Summary: NDR marshallers for the KRB5 PAC formats License: GPL-3.0+ +Summary: NDR marshallers for the KRB5 PAC formats Group: System/Libraries %description -n libndr-krb5pac0 @@ -585,8 +584,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac-devel -Summary: Development files for the ndr-krb5pac library License: GPL-3.0+ +Summary: Development files for the ndr-krb5pac library Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -600,8 +599,8 @@ Branch: %{BRANCH} %package -n libndr-nbt0 -Summary: NDR marshallers for NBT formats License: GPL-3.0+ +Summary: NDR marshallers for NBT formats Group: System/Libraries %description -n libndr-nbt0 @@ -611,8 +610,8 @@ Branch: %{BRANCH} %package -n libndr-nbt-devel -Summary: Development files for the ndr-nbt library License: GPL-3.0+ +Summary: Development files for the ndr-nbt library Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -626,8 +625,8 @@ Branch: %{BRANCH} %package -n libndr-standard0 -Summary: NDR marshallers for the standard set of DCE/RPC interfaces License: GPL-3.0+ +Summary: NDR marshallers for the standard set of DCE/RPC interfaces Group: System/Libraries %description -n libndr-standard0 @@ -637,8 +636,8 @@ Branch: %{BRANCH} %package -n libndr-standard-devel -Summary: Development files for the libndr-standard library License: GPL-3.0+ +Summary: Development files for the libndr-standard library Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -652,8 +651,8 @@ Branch: %{BRANCH} %package -n libndr0 -Summary: Network Data Representation library License: GPL-3.0+ +Summary: Network Data Representation library Group: System/Libraries %description -n libndr0 @@ -665,8 +664,8 @@ Branch: %{BRANCH} %package -n libndr-devel -Summary: Development files for the Network Data Representation library License: GPL-3.0+ +Summary: Development files for the Network Data Representation library Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -683,8 +682,8 @@ Branch: %{BRANCH} %package -n libpdb0 -Summary: Samba3 password database library License: GPL-3.0+ +Summary: Samba3 password database library Group: System/Libraries %description -n libpdb0 @@ -694,11 +693,11 @@ Branch: %{BRANCH} %package -n libpdb-devel -Summary: Development files for the Samba3 password database library License: GPL-3.0+ +Summary: Development files for the Samba3 password database library Group: Development/Libraries/C and C++ -Requires: libndr-standard-devel = %{version} Requires: libpdb0 = %{version} +Requires: libndr-standard-devel = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -710,8 +709,8 @@ Branch: %{BRANCH} %package -n libregistry0 -Summary: Windows-style registry library License: GPL-3.0+ +Summary: Windows-style registry library Group: System/Libraries %description -n libregistry0 @@ -721,8 +720,8 @@ Branch: %{BRANCH} %package -n libregistry-devel -Summary: Development files for the Samba Windows-style registry library License: GPL-3.0+ +Summary: Development files for the Samba Windows-style registry library Group: Development/Libraries/C and C++ Requires: libregistry0 = %{version} Requires: samba-core-devel = %{version} @@ -736,8 +735,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials0 -Summary: Samba credential management library License: GPL-3.0+ +Summary: Samba credential management library Group: System/Libraries %description -n libsamba-credentials0 @@ -747,8 +746,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials-devel -Summary: Development files for the Samba credential management library License: GPL-3.0+ +Summary: Development files for the Samba credential management library Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -761,8 +760,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig0 -Summary: Host-wide Samba configuration library License: GPL-3.0+ +Summary: Host-wide Samba configuration library Group: System/Libraries %description -n libsamba-hostconfig0 @@ -772,8 +771,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig-devel -Summary: Development files for the host-wide Samba configuration library License: GPL-3.0+ +Summary: Development files for the host-wide Samba configuration library Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -787,8 +786,8 @@ Branch: %{BRANCH} %package -n libsamba-policy0 -Summary: Active Directory Group Policy library License: GPL-3.0+ +Summary: Active Directory Group Policy library Group: System/Libraries %description -n libsamba-policy0 @@ -798,8 +797,8 @@ Branch: %{BRANCH} %package -n libsamba-policy-devel -Summary: Development files for the Samba AD Group Policy library License: GPL-3.0+ +Summary: Development files for the Samba AD Group Policy library Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -812,8 +811,8 @@ Branch: %{BRANCH} %package -n libsamba-util0 -Summary: Samba utility function library License: GPL-3.0+ +Summary: Samba utility function library Group: System/Libraries %description -n libsamba-util0 @@ -823,8 +822,8 @@ Branch: %{BRANCH} %package -n libsamba-util-devel -Summary: Development files for the Samba utility function library License: GPL-3.0+ +Summary: Development files for the Samba utility function library Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -838,8 +837,8 @@ Branch: %{BRANCH} %package -n libsamdb0 -Summary: Samba's SAM database library License: GPL-3.0+ +Summary: Samba's SAM database library Group: System/Libraries %description -n libsamdb0 @@ -849,8 +848,8 @@ Branch: %{BRANCH} %package -n libsamdb-devel -Summary: Development files for Samba's SAM database library License: GPL-3.0+ +Summary: Development files for Samba's SAM database library Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -863,8 +862,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw0 -Summary: Samba4's raw SMB client library License: GPL-3.0+ +Summary: Samba4's raw SMB client library Group: System/Libraries %description -n libsmbclient-raw0 @@ -874,8 +873,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw-devel -Summary: Development files for Samba4's raw SMB client library License: GPL-3.0+ +Summary: Development files for Samba4's raw SMB client library Group: Development/Libraries/C and C++ Requires: libsmbclient-raw0 = %{version} Requires: samba-core-devel = %{version} @@ -889,8 +888,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -Summary: Samba3 configuration library License: GPL-3.0+ +Summary: Samba3 configuration library Group: System/Libraries %description -n libsmbconf0 @@ -902,8 +901,8 @@ Branch: %{BRANCH} %package -n libsmbconf-devel -Summary: Development files for the Samba3 configuration library License: GPL-3.0+ +Summary: Development files for the Samba3 configuration library Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -919,8 +918,8 @@ Branch: %{BRANCH} %package -n libsmbldap0 -Summary: Samba LDAP protocol helper function library License: GPL-3.0+ +Summary: Samba LDAP protocol helper function library Group: System/Libraries %description -n libsmbldap0 @@ -931,8 +930,8 @@ Branch: %{BRANCH} %package -n libsmbldap-devel -Summary: Development files for the smbldap library License: GPL-3.0+ +Summary: Development files for the smbldap library Group: Development/Libraries/C and C++ Requires: libsmbldap0 = %{version} Requires: libtalloc-devel @@ -950,8 +949,8 @@ Branch: %{BRANCH} %package -n libtevent-util0 -Summary: tevent <-> system status code conversion utility library License: GPL-3.0+ +Summary: tevent <-> system status code conversion utility library Group: System/Libraries %description -n libtevent-util0 @@ -963,8 +962,8 @@ Branch: %{BRANCH} %package -n libtevent-util-devel -Summary: Development files for the Samba tevent utility library License: GPL-3.0+ +Summary: Development files for the Samba tevent utility library Group: Development/Libraries/C and C++ Requires: libtevent-devel Requires: libtevent-util0 = %{version} @@ -982,12 +981,12 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} +License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif Summary: Samba Client Library -License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1001,12 +1000,12 @@ Branch: %{BRANCH} %package -n libsmbclient-devel -Summary: Libraries and Header Files to Develop Programs with smbclient Support License: GPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libsmbclient_name} = %{version} Requires: krb5-devel +Requires: %{libsmbclient_name} = %{version} %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1017,8 +1016,8 @@ Branch: %{BRANCH} %package -n %{libnetapi_name} -Summary: Samba netapi Library License: GPL-3.0+ +Summary: Samba netapi Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -1030,8 +1029,8 @@ Branch: %{BRANCH} %package -n libnetapi-devel -Summary: Libraries and Header Files to Develop Programs with netapi Support License: GPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} @@ -1045,12 +1044,12 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} +License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbsharemodes = %{version} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library -License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1062,8 +1061,8 @@ Branch: %{BRANCH} %package -n libsmbsharemodes-devel -Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support License: GPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} @@ -1077,8 +1076,8 @@ Branch: %{BRANCH} %package -n %{libwbclient_name} -Summary: Samba libwbclient Library License: LGPL-3.0+ +Summary: Samba libwbclient Library Group: System/Libraries PreReq: /sbin/ldconfig @@ -1090,8 +1089,8 @@ Branch: %{BRANCH} %package -n libwbclient-devel -Summary: Libraries and Header Files to Develop Programs with wbclient Support License: LGPL-3.0+ +Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c4f51bd..604498c 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9df31153a6a3447e0e472b23da9c3d257e97f9eef709cb87c10c4a08eaa623b7 -size 54798 +oid sha256:a0cc11e51907c5299d7ae1cefd6768289fffa941247dfa6d9e170386d49219e4 +size 54670