diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 95b16f0..0ab393b 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1882b53540b5bcae8b8746b793a9db04b6767932c53e1145c8b9e4afdd397a06 -size 128899 +oid sha256:da36e31e01694b79a1489775403a2727161368a3ffdde422523d2b84963fcda3 +size 128908 diff --git a/samba.changes b/samba.changes index 13f8a90..13526e6 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 21 16:02:12 UTC 2014 - lmuelle@suse.com + +- Depend on %version-%release with all manual Provides and Requires; + (bnc#844307). + ------------------------------------------------------------------- Fri Feb 21 13:16:01 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index a1bde09..2adb855 100644 --- a/samba.spec +++ b/samba.spec @@ -141,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3184 +%define SOURCE_TIMESTAMP 3185 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -151,7 +151,7 @@ Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ Group: Productivity/Networking/Samba -Provides: samba-gplv3 = %{version} +Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 @@ -251,10 +251,10 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba -Provides: samba-gplv3-client = %{version} +Provides: samba-gplv3-client = %{version}-%{release} Provides: smbfs Obsoletes: samba-gplv3-client < %{version} -Provides: samba-client-gplv2 = %{version} +Provides: samba-client-gplv2 = %{version}-%{release} Obsoletes: samba-client-gplv2 < %{version} %if 0%{?suse_version} > 0 PreReq: %{?fillup_prereq} @@ -310,9 +310,9 @@ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils PreReq: findutils -Provides: samba-gplv3-doc = %{version} +Provides: samba-gplv3-doc = %{version}-%{release} Obsoletes: samba-gplv3-doc < %{version} -Provides: samba-doc-gplv2 = %{version} +Provides: samba-doc-gplv2 = %{version}-%{release} Obsoletes: samba-doc-gplv2 < %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -334,7 +334,7 @@ License: GPL-3.0+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba PreReq: coreutils -Provides: samba-gplv3-krb-printing = %{version} +Provides: samba-gplv3-krb-printing = %{version}-%{release} Obsoletes: samba-gplv3-krb-printing < %{version} %if 0%{?suse_version} > 1000 PreReq: permissions @@ -385,7 +385,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Python libraries Group: Applications/System -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: python-tevent Requires: python-tdb Requires: pyldb @@ -403,8 +403,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Testing tools for Samba servers and clients Group: Applications/System -Requires: samba = %{version} -Requires: samba-winbind = %{version} +Requires: samba = %{version}-%{release} +Requires: samba-winbind = %{version}-%{release} PreReq: /sbin/ldconfig %description test @@ -432,7 +432,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba -Provides: samba-gplv3-winbind = %{version} +Provides: samba-gplv3-winbind = %{version}-%{release} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd Requires: samba-client >= %{version} @@ -476,7 +476,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library Group: Development/Libraries/C and C++ -Requires: libdcerpc-atsvc0 = %{version} +Requires: libdcerpc-atsvc0 = %{version}-%{release} %description -n libdcerpc-atsvc-devel ATSVC is a DCE/RPC based protocol used by CIFS hosts to @@ -515,7 +515,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the SAMR protocol library Group: Development/Libraries/C and C++ -Requires: libdcerpc-samr0 = %{version} +Requires: libdcerpc-samr0 = %{version}-%{release} %description -n libdcerpc-samr-devel This subpackage contains libraries and header files for developing @@ -546,9 +546,9 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC library Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version} -Requires: libdcerpc-binding0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libdcerpc0 = %{version}-%{release} +Requires: libdcerpc-binding0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libdcerpc-devel DCE/RPC, short for "Distributed Computing Environment / Remote @@ -580,8 +580,8 @@ Branch: %{BRANCH} 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} +Requires: libgensec0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libgensec-devel This subpackage contains libraries and header files for developing @@ -606,8 +606,8 @@ Branch: %{BRANCH} 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} +Requires: libndr-krb5pac0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-krb5pac-devel This subpackage contains libraries and header files for developing @@ -632,8 +632,8 @@ Branch: %{BRANCH} 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} +Requires: libndr-nbt0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-nbt-devel This subpackage contains libraries and header files for developing @@ -658,8 +658,8 @@ Branch: %{BRANCH} 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} +Requires: libndr-standard0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-standard-devel This subpackage contains libraries and header files for developing @@ -686,8 +686,8 @@ Branch: %{BRANCH} 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} +Requires: libndr0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-devel Network Data Representation (NDR) is an implementation of the @@ -715,8 +715,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 password database library Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version} -Requires: libndr-standard-devel = %{version} +Requires: libpdb0 = %{version}-%{release} +Requires: libndr-standard-devel = %{version}-%{release} Requires: libtevent-devel %description -n libpdb-devel @@ -742,8 +742,8 @@ Branch: %{BRANCH} 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} +Requires: libregistry0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libregistry-devel This subpackage contains libraries and header files for developing @@ -768,7 +768,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba credential management library Group: Development/Libraries/C and C++ -Requires: libsamba-credentials0 = %{version} +Requires: libsamba-credentials0 = %{version}-%{release} %description -n libsamba-credentials-devel This subpackage contains libraries and header files for developing @@ -793,8 +793,8 @@ Branch: %{BRANCH} 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} +Requires: libsamba-hostconfig0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsamba-hostconfig-devel This subpackage contains libraries and header files for developing @@ -819,7 +819,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library Group: Development/Libraries/C and C++ -Requires: libsamba-policy0 = %{version} +Requires: libsamba-policy0 = %{version}-%{release} %description -n libsamba-policy-devel This subpackage contains libraries and header files for developing @@ -844,8 +844,8 @@ Branch: %{BRANCH} 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} +Requires: libsamba-util0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsamba-util-devel This subpackage contains libraries and header files for developing @@ -870,7 +870,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba's SAM database library Group: Development/Libraries/C and C++ -Requires: libsamdb0 = %{version} +Requires: libsamdb0 = %{version}-%{release} %description -n libsamdb-devel This subpackage contains libraries and header files for developing @@ -895,8 +895,8 @@ Branch: %{BRANCH} 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} +Requires: libsmbclient-raw0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsmbclient-raw-devel This subpackage contains libraries and header files for developing @@ -923,7 +923,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 configuration library Group: Development/Libraries/C and C++ -Requires: libsmbconf0 = %{version} +Requires: libsmbconf0 = %{version}-%{release} %description -n libsmbconf-devel libsmbconf is a library to read or, based on the backend, modify the @@ -952,7 +952,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the smbldap library Group: Development/Libraries/C and C++ -Requires: libsmbldap0 = %{version} +Requires: libsmbldap0 = %{version}-%{release} Requires: libtalloc-devel Requires: libtevent-devel Requires: openldap2-devel @@ -985,8 +985,8 @@ 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} -Requires: samba-core-devel = %{version} +Requires: libtevent-util0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libtevent-util-devel The libtevent-util library contains functions to convert tevent error @@ -1002,7 +1002,7 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbclient = %{version} +Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient %endif Summary: Samba Client Library @@ -1024,7 +1024,7 @@ Summary: Libraries and Header Files to Develop Programs with smbclient Su Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: krb5-devel -Requires: %{libsmbclient_name} = %{version} +Requires: %{libsmbclient_name} = %{version}-%{release} %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1052,7 +1052,7 @@ 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} +Requires: %{libnetapi_name} = %{version}-%{release} %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -1065,7 +1065,7 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbsharemodes = %{version} +Provides: libsmbsharemodes = %{version}-%{release} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library @@ -1084,7 +1084,7 @@ 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} +Requires: %{libsmbsharemodes_name} = %{version}-%{release} %description -n libsmbsharemodes-devel This package contains the static libraries and header files needed to @@ -1112,7 +1112,7 @@ 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} +Requires: %{libwbclient_name} = %{version}-%{release} %description -n libwbclient-devel This package contains the static libraries and header files needed to diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index f35fc8b..5cb441b 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:9d40cb312753d439c8a0506a1d27b820a619902086acd3a24181bcaf34784f73 -size 54143 +oid sha256:36a0897149207a54808f6f516277e8bc89d89a0ef24a9dd508d44dff43d7c33b +size 54227