From f423fdf030c6b42565c4385189a786969c67c9200a8dacb31bdd55b8f3920315 Mon Sep 17 00:00:00 2001 From: Howard Guo Date: Mon, 13 Jun 2016 12:41:05 +0000 Subject: [PATCH 1/3] ------------------------------------------------------------------ - Remove source file ccapi/common/win/OldCC/autolock.hxx that is not needed and does not carry an acceptable license. (bsc#968111) ------------------------------------------------------------------ - Remove source file ccapi/common/win/OldCC/autolock.hxx that is not needed and does not carry an acceptable license. (bsc#968111) OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=168 --- krb5-1.14.2.tar.gz | 4 ++-- krb5-1.14.2.tar.gz.asc | 14 -------------- krb5-mini.changes | 7 +++++++ krb5-mini.spec | 1 - krb5.changes | 7 +++++++ krb5.spec | 1 - 6 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 krb5-1.14.2.tar.gz.asc diff --git a/krb5-1.14.2.tar.gz b/krb5-1.14.2.tar.gz index 2adef80..1a1446b 100644 --- a/krb5-1.14.2.tar.gz +++ b/krb5-1.14.2.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bcad7e6778d1965e4ce4af21d2efdc15b274c5ce5c69031c58e4c954cda8b27 -size 12264762 +oid sha256:275e582261e80c464afd80afd0a880b9abcae011fc64be8b1abd7e4c8433c385 +size 12621899 diff --git a/krb5-1.14.2.tar.gz.asc b/krb5-1.14.2.tar.gz.asc deleted file mode 100644 index 53c2fc2..0000000 --- a/krb5-1.14.2.tar.gz.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQGcBAABAgAGBQJXFWhhAAoJEKMvF/0AVcMFHHYL/iogtD4Zyp/Zu7nFjaqAOu75 -iR3bfrb2HkEYfS1JzKEszqXTZrBurG7++58x13KxtYW5QhnKIIISUUTura4zilO2 -rQtf8/KAzIUf7/ETkRz6cUM3eReUPw1Ua/fy3zpe7ZoTNxcaE6z1p8JL2RcjsMhm -gFa0luSXpXgvHGKc1YSDUP+LVCFFCGTr1bnix03o3VoDnYmQCMYAdSG119ao9Mlf -I1g0h/sg3dVbvpfAXozdYAmkoS1RtHXxb6hyn4FVx7niJ91yxm9df8UtLDB/q0Ak -am07TxJ+XqFW6GxNc85nC7hPnURgQxwk8KvrBU5+CdIx0ZeI3GOsTGKjDYJZHrzY -GI4LMi1Tq2GyiWGWe0RBI6JR/b7wQsyjFpniZM4vcIuTV7DzWchYlcRXAh8STWeM -w9DnzYR6GdXIRet4twjH5+OV5F066iQmqCP0YALZEtS3R5Nl+HGnJ5BknDBgX/DX -wEuXeFERgriQeu2Ye4djkN2aoAkVMw+epmdO6+I/gA== -=o3Qw ------END PGP SIGNATURE----- diff --git a/krb5-mini.changes b/krb5-mini.changes index d8fb936..b56f077 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Tue May 10 12:41:14 UTC 2016 - hguo@suse.com + +- Remove source file ccapi/common/win/OldCC/autolock.hxx + that is not needed and does not carry an acceptable license. + (bsc#968111) + ------------------------------------------------------------------- Thu Apr 28 20:27:37 UTC 2016 - michael@stroeder.com diff --git a/krb5-mini.spec b/krb5-mini.spec index 435558e..9ec4873 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -49,7 +49,6 @@ Conflicts: krb5-plugin-preauth-pkinit Conflicts: krb5-plugin-preauth-otp # 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 -Source42: krb5-%version.tar.gz.asc Source43: krb5.keyring Source1: vendor-files.tar.bz2 Source2: baselibs.conf diff --git a/krb5.changes b/krb5.changes index fd78872..ca4628f 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Tue May 10 12:41:14 UTC 2016 - hguo@suse.com + +- Remove source file ccapi/common/win/OldCC/autolock.hxx + that is not needed and does not carry an acceptable license. + (bsc#968111) + ------------------------------------------------------------------- Thu Apr 28 20:27:37 UTC 2016 - michael@stroeder.com diff --git a/krb5.spec b/krb5.spec index b39590d..a2e3ebe 100644 --- a/krb5.spec +++ b/krb5.spec @@ -49,7 +49,6 @@ Obsoletes: krb5-64bit Conflicts: krb5-mini # 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 -Source42: krb5-%version.tar.gz.asc Source43: krb5.keyring Source1: vendor-files.tar.bz2 Source2: baselibs.conf From a0dc13d8eeaeafbd61709cff3009e925c24812ddfea9e8f97e08fec6471720d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 2 Jul 2016 07:38:07 +0000 Subject: [PATCH 2/3] Accepting request 405706 from home:fcrozat:branches:network - Do no use systemd_requires macros in main package, it adds unneeded dependencies which pulls systemd into minimal chroot. - Only call %insserv_prereq when building for pre-systemd distributions. - Optimise some %post/%postun when only /sbin/ldconfig is called. OBS-URL: https://build.opensuse.org/request/show/405706 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=169 --- krb5.changes | 9 +++++++++ krb5.spec | 13 +++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/krb5.changes b/krb5.changes index ca4628f..8843369 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 30 13:34:29 UTC 2016 - fcrozat@suse.com + +- Do no use systemd_requires macros in main package, it adds + unneeded dependencies which pulls systemd into minimal chroot. +- Only call %insserv_prereq when building for pre-systemd + distributions. +- Optimise some %post/%postun when only /sbin/ldconfig is called. + ------------------------------------------------------------------ Tue May 10 12:41:14 UTC 2016 - hguo@suse.com diff --git a/krb5.spec b/krb5.spec index a2e3ebe..04a3edb 100644 --- a/krb5.spec +++ b/krb5.spec @@ -41,7 +41,6 @@ BuildRequires: python-Sphinx BuildRequires: python-libxml2 BuildRequires: python-lxml BuildRequires: pkgconfig(systemd) -%{?systemd_requires} # bug437293 %ifarch ppc64 Obsoletes: krb5-64bit @@ -91,8 +90,12 @@ Requires: cron Requires: libverto-libev1 Requires: logrotate Requires: perl-Date-Calc +%if 0%{?suse_version} >= 1210 %{?systemd_requires} -PreReq: %insserv_prereq %fillup_prereq +%else +PreReq: %insserv_prereq +%endif +PreReq: %fillup_prereq %description server Kerberos V5 is a trusted-third-party network authentication system, @@ -324,8 +327,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig ##################################################### # krb5-server preun/postun/pre/post @@ -352,8 +354,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %post plugin-kdb-ldap -p /sbin/ldconfig -%postun plugin-kdb-ldap -/sbin/ldconfig +%postun plugin-kdb-ldap -p /sbin/ldconfig ######################################################## # files sections From ac8428f53d8bb5f78629c46451200bebf6bd1d16e9c7f4ef01516bae1d433263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 2 Jul 2016 11:39:29 +0000 Subject: [PATCH 3/3] - Remove comments breaking post scripts. OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=170 --- krb5.changes | 5 +++++ krb5.spec | 16 ---------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/krb5.changes b/krb5.changes index 8843369..2599987 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 2 11:38:54 UTC 2016 - idonmez@suse.com + +- Remove comments breaking post scripts. + ------------------------------------------------------------------- Thu Jun 30 13:34:29 UTC 2016 - fcrozat@suse.com diff --git a/krb5.spec b/krb5.spec index 04a3edb..ea0da4c 100644 --- a/krb5.spec +++ b/krb5.spec @@ -321,18 +321,10 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %find_lang mit-krb5 -##################################################### -# krb5 pre/post/postun -##################################################### - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -##################################################### -# krb5-server preun/postun/pre/post -##################################################### - %preun server %service_del_preun krb5kdc.service kadmind.service kpropd.service @@ -348,18 +340,10 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %pre server %service_add_pre krb5kdc.service kadmind.service kpropd.service -##################################################### -# krb5-plugin-kdb-ldap post/postun -##################################################### - %post plugin-kdb-ldap -p /sbin/ldconfig %postun plugin-kdb-ldap -p /sbin/ldconfig -######################################################## -# files sections -######################################################## - %files devel %defattr(-,root,root) %dir /usr/lib/mit