Accepting request 406062 from network

------------------------------------------------------------------
- Remove source file ccapi/common/win/OldCC/autolock.hxx
  that is not needed and does not carry an acceptable license.
  (bsc#968111)
- Remove comments breaking post scripts. 

- 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.
------------------------------------------------------------------
- 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/request/show/406062
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krb5?expand=0&rev=120
This commit is contained in:
Dominique Leuenberger 2016-07-12 21:44:09 +00:00 committed by Git OBS Bridge
commit 3c44b32878
6 changed files with 37 additions and 40 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6bcad7e6778d1965e4ce4af21d2efdc15b274c5ce5c69031c58e4c954cda8b27
size 12264762
oid sha256:275e582261e80c464afd80afd0a880b9abcae011fc64be8b1abd7e4c8433c385
size 12621899

View File

@ -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-----

View File

@ -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

View File

@ -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

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
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
- 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
- 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

View File

@ -41,7 +41,6 @@ BuildRequires: python-Sphinx
BuildRequires: python-libxml2
BuildRequires: python-lxml
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
# bug437293
%ifarch ppc64
Obsoletes: krb5-64bit
@ -49,7 +48,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
@ -92,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,
@ -319,18 +321,9 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
%find_lang mit-krb5
#####################################################
# krb5 pre/post/postun
#####################################################
%post -p /sbin/ldconfig
%postun
/sbin/ldconfig
#####################################################
# krb5-server preun/postun/pre/post
#####################################################
%postun -p /sbin/ldconfig
%preun server
%service_del_preun krb5kdc.service kadmind.service kpropd.service
@ -347,18 +340,9 @@ 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
/sbin/ldconfig
########################################################
# files sections
########################################################
%postun plugin-kdb-ldap -p /sbin/ldconfig
%files devel
%defattr(-,root,root)