Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2012-10-25 12:11:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openldap2", Maintainer is "rhafer@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2-client.changes 2012-05-16 21:35:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2-client.changes 2012-10-25 12:11:44.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 16 07:38:01 UTC 2012 - coolo@suse.com + +- buildrequire krb5-mini in openldap2-client to avoid cycle +- move Summary out of the %if as prepare_spec is confused about + the license otherwise + +------------------------------------------------------------------- openldap2.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.qru4QC/_old 2012-10-25 12:11:48.000000000 +0200 +++ /var/tmp/diff_new_pack.qru4QC/_new 2012-10-25 12:11:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openldap2 +# spec file for package openldap2-client # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,9 @@ %define run_test_suite 0 Name: openldap2-client +Summary: The OpenLDAP commandline client tools License: OLDAP-2.8 +Group: Productivity/Networking/LDAP/Clients BuildRequires: cyrus-sasl-devel BuildRequires: libopenssl-devel BuildRequires: libtool @@ -43,13 +45,11 @@ Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: The OpenLDAP Server -Group: Productivity/Networking/LDAP/Clients %else +# avoid cycle with krb5 +BuildRequires: krb5-mini Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} -Summary: The OpenLDAP commandline client tools -Group: Productivity/Networking/LDAP/Clients %endif Source: openldap-%{version}.tgz Source1: openldap-rc.tgz ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.qru4QC/_old 2012-10-25 12:11:48.000000000 +0200 +++ /var/tmp/diff_new_pack.qru4QC/_new 2012-10-25 12:11:48.000000000 +0200 @@ -19,7 +19,9 @@ %define run_test_suite 0 Name: openldap2 +Summary: The OpenLDAP Server License: OLDAP-2.8 +Group: Productivity/Networking/LDAP/Clients BuildRequires: cyrus-sasl-devel BuildRequires: libopenssl-devel BuildRequires: libtool @@ -43,13 +45,11 @@ Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: The OpenLDAP Server -Group: Productivity/Networking/LDAP/Clients %else +# avoid cycle with krb5 +BuildRequires: krb5-mini Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} -Summary: The OpenLDAP commandline client tools -Group: Productivity/Networking/LDAP/Clients %endif Source: openldap-%{version}.tgz Source1: openldap-rc.tgz ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.qru4QC/_old 2012-10-25 12:11:48.000000000 +0200 +++ /var/tmp/diff_new_pack.qru4QC/_new 2012-10-25 12:11:48.000000000 +0200 @@ -6,6 +6,9 @@ cp openldap2.spec openldap2-client.spec perl -pi -e "s/^Name:.*openldap2$/Name: openldap2-client/g" openldap2-client.spec +perl -pi -e "s/^Summary:.*Server$/Summary: The OpenLDAP commandline client tools/" openldap2-client.spec + +osc service localrun format_spec_file echo "Done." -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org