diff --git a/krb5-1.13.2.tar.sig b/krb5-1.13.2.tar.gz.asc similarity index 100% rename from krb5-1.13.2.tar.sig rename to krb5-1.13.2.tar.gz.asc diff --git a/krb5-mini.changes b/krb5-mini.changes index ad77a25..6a25f45 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 22 09:27:11 UTC 2015 - meissner@suse.com + +- pre_checkin.sh aligned changes between krb5/krb5-mini +- added krb5.keyring + ------------------------------------------------------------------- Tue May 12 07:48:18 UTC 2015 - michael@stroeder.com diff --git a/krb5-mini.spec b/krb5-mini.spec index a422281..02e0e24 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -65,10 +65,10 @@ Conflicts: krb5-plugin-kdb-ldap Conflicts: krb5-plugin-preauth-pkinit Conflicts: krb5-plugin-preauth-otp %endif +# both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar Source: krb5-%{version}.tar.gz -# URL is actually http://web.mit.edu/kerberos/krb5-1.13/krb5-%version.sig -# but it is the signature of the tarball -Source42: krb5-%version.tar.sig +Source42: krb5-%version.tar.gz.asc +Source43: krb5.keyring Source1: vendor-files.tar.bz2 Source2: baselibs.conf Source5: krb5-rpmlintrc diff --git a/krb5.changes b/krb5.changes index ad77a25..6a25f45 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 22 09:27:11 UTC 2015 - meissner@suse.com + +- pre_checkin.sh aligned changes between krb5/krb5-mini +- added krb5.keyring + ------------------------------------------------------------------- Tue May 12 07:48:18 UTC 2015 - michael@stroeder.com diff --git a/krb5.keyring b/krb5.keyring new file mode 100644 index 0000000..f13592c --- /dev/null +++ b/krb5.keyring @@ -0,0 +1,72 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +p3N1KgXx6tnA7P65PC0REQ== +=sIgi +-----END PGP PUBLIC KEY BLOCK----- diff --git a/krb5.spec b/krb5.spec index b6c2248..80c6884 100644 --- a/krb5.spec +++ b/krb5.spec @@ -65,10 +65,10 @@ Conflicts: krb5-plugin-kdb-ldap Conflicts: krb5-plugin-preauth-pkinit Conflicts: krb5-plugin-preauth-otp %endif +# both tar.gz and .tar.gz.asc extracted from the http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar Source: krb5-%{version}.tar.gz -# URL is actually http://web.mit.edu/kerberos/krb5-1.13/krb5-%version.sig -# but it is the signature of the tarball -Source42: krb5-%version.tar.sig +Source42: krb5-%version.tar.gz.asc +Source43: krb5.keyring Source1: vendor-files.tar.bz2 Source2: baselibs.conf Source5: krb5-rpmlintrc