diff --git a/.gitattributes b/.gitattributes index 9b03811..45c3c92 100644 --- a/.gitattributes +++ b/.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 +ldb-1.1.17.tar filter=lfs diff=lfs merge=lfs -text diff --git a/ldb-1.1.17.tar b/ldb-1.1.17.tar new file mode 100644 index 0000000..85b6919 --- /dev/null +++ b/ldb-1.1.17.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2706e3df93dcaed10252d463e7d691fc3b8cf0d25478c186b07c633ca56a2aa3 +size 6010880 diff --git a/ldb-1.1.17.tar.gz b/ldb-1.1.17.tar.gz deleted file mode 100644 index 5669b89..0000000 --- a/ldb-1.1.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9a312aad19e9463716d257d8f2529fd7fc1a5ef24f6dcdc0c4a1930d7bdb6e6 -size 1177926 diff --git a/ldb.changes b/ldb.changes index 3f7e662..9cd8055 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 28 14:41:43 UTC 2014 - lmuelle@suse.com + +- Remove dependency on gpg-offline as signature checking is implemented in the + source validator. + ------------------------------------------------------------------- Tue Sep 23 18:10:04 UTC 2014 - lmuelle@suse.com diff --git a/samba-library-distribution-pubkey_13084025.asc b/ldb.keyring similarity index 100% rename from samba-library-distribution-pubkey_13084025.asc rename to ldb.keyring diff --git a/ldb.spec b/ldb.spec index 6f620a6..3a0a22e 100644 --- a/ldb.spec +++ b/ldb.spec @@ -24,9 +24,6 @@ Name: ldb BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} > 1220 -BuildRequires: gpg-offline -%endif #!BuildIgnore: libtalloc BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} @@ -48,9 +45,16 @@ Release: 0 Summary: An LDAP-like embedded database License: GPL-3.0+ Group: System/Libraries -Source: http://download.samba.org/pub/ldb/ldb-%{version}.tar.gz +# 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 + +# http://download.samba.org/pub/ldb/ldb-%{version}.tar.gz +Source: ldb-%{version}.tar Source1: http://download.samba.org/pub/ldb/ldb-%{version}.tar.asc -Source2: samba-library-distribution-pubkey_13084025.asc +Source2: ldb.keyring +#Source2: samba-library-distribution-pubkey_13084025.asc Source4: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -120,11 +124,6 @@ LDB library. %prep -%if 0%{?suse_version} > 1220 -gzip -dc %{SOURCE0} >${RPM_SOURCE_DIR}/%{name}-%{version}.tar -%{?gpg_verify: %gpg_verify --keyring %{SOURCE2} %{SOURCE1}} -rm ${RPM_SOURCE_DIR}/%{name}-%{version}.tar -%endif %setup -n ldb-%{version} -q %build