Remove dependency on gpg-offline as signature checking is implemented in the

source validator.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=440

.gitattributes

@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+samba-4.1.13.tar filter=lfs diff=lfs merge=lfs -text

patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41bb1cf5ba56dc5f1206657e136d6313da9bb96cd8efd5ef3765ea1eb61ed578
+oid sha256:616ca9b53e8784abbbaaf814103657cb14916cb051042763b9ec6836f2dbc4a8
-size 317995
+size 317506

samba-4.1.13.tar

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:115e08afab224ae1bb04148b49ba7ec712a02395d8d8d8a5f67d08a06bbc0a75
+size 95242240

samba-4.1.13.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:737907f4ed3a71f6ec12638387aff7cda4764f8c2eb18deeca16e2fb7ed66c9f
-size 19523732

samba.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 28 16:13:45 UTC 2014 - lmuelle@suse.com
+
+- Remove dependency on gpg-offline as signature checking is implemented in the
+  source validator.
+
 -------------------------------------------------------------------
 Sat Oct 25 13:47:41 UTC 2014 - lmuelle@suse.com
 

samba.spec

@@ -118,7 +118,6 @@ BuildRequires:  dbus-1-devel
 BuildRequires:  libxslt-tools
 %endif
 %if 0%{?suse_version} > 1220
-BuildRequires:  gpg-offline
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
@@ -146,7 +145,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3312
+%define SOURCE_TIMESTAMP 3313
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -163,9 +162,15 @@ Recommends:     logrotate
 Summary:        A SMB/CIFS File, Print, and Authentication Server
 License:        GPL-3.0+
 Group:          Productivity/Networking/Samba
-Source:         %{samba_source_location}
+# Unfortunately upstream is mindboggingly stupid here by gpg signing the
+# uncompressed tarball, but not publishing the uncompressed tarball but
+# only a compressed one. so we need to unpack it manually so that
+# gpg verification works, but then we can't have download verification
+
+# %{samba_source_location}
+Source:         samba-%{version}%{samba_ver_suffix}.tar
 Source5:        %{samba_source_signature_location}
-Source6:        http://www.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc
+Source6:        samba.keyring
 Source1:        vendor-files.tar.bz2
 Source2:        patches.tar.bz2
 Source4:        baselibs.conf
@@ -1105,11 +1110,6 @@ Branch:         %{BRANCH}
 
 
 %prep
-%if 0%{?suse_version} > 1220
-gzip -dc %{SOURCE0} >${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar
-%{?gpg_verify: %gpg_verify --keyring %{SOURCE6} %{SOURCE5}}
-rm ${RPM_SOURCE_DIR}/%{name}-%{samba_ver_full}.tar
-%endif
 %setup -n samba-%{samba_ver_full} -q
 # patches
 %setup -T -D -a 2 -n samba-%{samba_ver_full} -q

vendor-files.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5cbb66c5d09b5f8b6847343f953912d02eb1897926dd9888b2b71d86aacb5e9
+oid sha256:df26c4af2f42a9832ae421e909e92805844733876a433df462c4b4af1f8b41c9
-size 54442
+size 54359