Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2014-02-19 11:39:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krb5" Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2014-01-29 07:15:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-mini.changes 2014-02-19 11:39:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 18 15:27:15 UTC 2014 - [email protected] + +- don't deliver SysV init files to systemd distributions + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/krb5/krb5.changes 2014-01-29 07:15:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5.changes 2014-02-19 11:39:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 18 15:25:57 UTC 2014 - [email protected] + +- don't deliver SysV init files to systemd distributions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.5p67U2/_old 2014-02-19 11:39:18.000000000 +0100 +++ /var/tmp/diff_new_pack.5p67U2/_new 2014-02-19 11:39:18.000000000 +0100 @@ -46,6 +46,7 @@ BuildRequires: python-lxml %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(systemd) +%{?systemd_requires} %endif # bug437293 %ifarch ppc64 @@ -287,17 +288,18 @@ done # and binaries too chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu -# install init scripts -mkdir -p %{buildroot}%{_sysconfdir}/init.d -install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind -install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc -install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd # install systemd files %if 0%{?suse_version} >= 1210 mkdir -p %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir} +%else +# install init scripts +mkdir -p %{buildroot}%{_sysconfdir}/init.d +install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind +install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc +install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd %endif # install sysconfig templates mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates @@ -310,9 +312,21 @@ # create rc* links mkdir -p %{buildroot}/usr/bin/ mkdir -p %{buildroot}/usr/sbin/ +%if 0%{?suse_version} >= 1210 +%if 0%{?suse_version} > 1220 +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckadmind +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckrb5kdc +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckpropd +%else +ln -s /sbin/service %{buildroot}%{_sbindir}/rckadmind +ln -s /sbin/service %{buildroot}%{_sbindir}/rckrb5kdc +ln -s /sbin/service %{buildroot}%{_sbindir}/rcpropd +%endif +%else ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd +%endif # create links for kinit and klist, because of the java ones ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist @@ -487,11 +501,12 @@ %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_var}/adm/fillup-templates/sysconfig.* -%{_sysconfdir}/init.d/* %if 0%{?suse_version} >= 1210 %{_unitdir}/kadmind.service %{_unitdir}/krb5kdc.service %{_unitdir}/kpropd.service +%else +%{_sysconfdir}/init.d/* %endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* @@ -580,13 +595,14 @@ %defattr(-,root,root) %attr(0700,root,root) %dir /var/log/krb5 %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server -%{_sysconfdir}/init.d/kadmind -%{_sysconfdir}/init.d/krb5kdc -%{_sysconfdir}/init.d/kpropd %if 0%{?suse_version} >= 1210 %{_unitdir}/kadmind.service %{_unitdir}/krb5kdc.service %{_unitdir}/kpropd.service +%else +%{_sysconfdir}/init.d/kadmind +%{_sysconfdir}/init.d/krb5kdc +%{_sysconfdir}/init.d/kpropd %endif %dir %{krb5docdir} %dir /usr/lib/mit ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.5p67U2/_old 2014-02-19 11:39:18.000000000 +0100 +++ /var/tmp/diff_new_pack.5p67U2/_new 2014-02-19 11:39:18.000000000 +0100 @@ -46,6 +46,7 @@ BuildRequires: python-lxml %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(systemd) +%{?systemd_requires} %endif # bug437293 %ifarch ppc64 @@ -287,17 +288,18 @@ done # and binaries too chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu -# install init scripts -mkdir -p %{buildroot}%{_sysconfdir}/init.d -install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind -install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc -install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd # install systemd files %if 0%{?suse_version} >= 1210 mkdir -p %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir} +%else +# install init scripts +mkdir -p %{buildroot}%{_sysconfdir}/init.d +install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind +install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc +install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd %endif # install sysconfig templates mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates @@ -310,9 +312,21 @@ # create rc* links mkdir -p %{buildroot}/usr/bin/ mkdir -p %{buildroot}/usr/sbin/ +%if 0%{?suse_version} >= 1210 +%if 0%{?suse_version} > 1220 +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckadmind +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckrb5kdc +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckpropd +%else +ln -s /sbin/service %{buildroot}%{_sbindir}/rckadmind +ln -s /sbin/service %{buildroot}%{_sbindir}/rckrb5kdc +ln -s /sbin/service %{buildroot}%{_sbindir}/rcpropd +%endif +%else ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd +%endif # create links for kinit and klist, because of the java ones ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist @@ -487,11 +501,12 @@ %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_var}/adm/fillup-templates/sysconfig.* -%{_sysconfdir}/init.d/* %if 0%{?suse_version} >= 1210 %{_unitdir}/kadmind.service %{_unitdir}/krb5kdc.service %{_unitdir}/kpropd.service +%else +%{_sysconfdir}/init.d/* %endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* @@ -580,13 +595,14 @@ %defattr(-,root,root) %attr(0700,root,root) %dir /var/log/krb5 %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server -%{_sysconfdir}/init.d/kadmind -%{_sysconfdir}/init.d/krb5kdc -%{_sysconfdir}/init.d/kpropd %if 0%{?suse_version} >= 1210 %{_unitdir}/kadmind.service %{_unitdir}/krb5kdc.service %{_unitdir}/kpropd.service +%else +%{_sysconfdir}/init.d/kadmind +%{_sysconfdir}/init.d/krb5kdc +%{_sysconfdir}/init.d/kpropd %endif %dir %{krb5docdir} %dir /usr/lib/mit -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
