diff --git a/krb5-doc.spec b/krb5-doc.spec index ff17cdc..b8ff310 100644 --- a/krb5-doc.spec +++ b/krb5-doc.spec @@ -15,18 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: krb5-doc -BuildRequires: ghostscript-library latex2html texlive +BuildRequires: ghostscript-library +BuildRequires: latex2html +BuildRequires: texlive Version: 1.9.1 -Release: 2 +Release: 0 %define srcRoot krb5-1.9.1 Summary: MIT Kerberos5 Implementation--Documentation -License: MIT License (or similar) -Url: http://web.mit.edu/kerberos/www/ +License: MIT Group: Documentation/Other +Url: http://web.mit.edu/kerberos/www/ Source: krb5-%{version}.tar.bz2 Source3: %{name}-rpmlintrc Patch0: krb5-1.3.5-perlfix.dif diff --git a/krb5-mini.changes b/krb5-mini.changes index 2fa37a8..759ead3 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 20 11:01:39 UTC 2011 - coolo@suse.com + +- remove call to suse_update_config, very old work around + ------------------------------------------------------------------- Mon Nov 21 11:24:12 CET 2011 - mc@suse.de @@ -9,7 +14,7 @@ Mon Nov 21 11:24:12 CET 2011 - mc@suse.de Mon Nov 21 11:11:54 CET 2011 - mc@suse.de - fix KDC HA feature introduced with implementing KDC poll - (RT#6951) + (RT#6951, bnc#731648) ------------------------------------------------------------------- Fri Nov 18 08:35:52 UTC 2011 - rhafer@suse.de diff --git a/krb5-mini.spec b/krb5-mini.spec index bb4eed3..6197aad 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_mini 1 %define srcRoot krb5-1.9.1 @@ -23,15 +22,19 @@ %define krb5docdir %{_defaultdocdir}/krb5 Name: krb5-mini -License: MIT License (or similar) Url: http://web.mit.edu/kerberos/www/ -BuildRequires: bison libcom_err-devel ncurses-devel -BuildRequires: keyutils keyutils-devel +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: keyutils +BuildRequires: keyutils-devel +BuildRequires: libcom_err-devel BuildRequires: libselinux-devel +BuildRequires: ncurses-devel Version: 1.9.1 -Release: 21 +Release: 0 %if ! 0%{?build_mini} -BuildRequires: libopenssl-devel openldap2-devel +BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel BuildRequires: pam-devel # bug437293 %ifarch ppc64 @@ -39,6 +42,7 @@ Obsoletes: krb5-64bit %endif # Summary: MIT Kerberos5 Implementation--Libraries +License: MIT Group: Productivity/Networking/Security %else Summary: MIT Kerberos5 Implementation--Libraries @@ -97,7 +101,6 @@ Authors: %if ! %{build_mini} %package client -License: MIT License (or similar) Summary: MIT Kerberos5 implementation - client programs Group: Productivity/Networking/Security @@ -117,7 +120,6 @@ Authors: Tom Yu %package server -License: MIT License (or similar) Summary: MIT Kerberos5 implementation - server Group: Productivity/Networking/Security Requires: perl-Date-Calc @@ -140,7 +142,6 @@ Authors: Tom Yu %package plugin-kdb-ldap -License: MIT License (or similar) Summary: MIT Kerberos5 Implementation--LDAP Database Plugin Group: Productivity/Networking/Security Requires: krb5-server = %{version} @@ -161,7 +162,6 @@ Authors: Tom Yu %package plugin-preauth-pkinit -License: MIT License (or similar) Summary: MIT Kerberos5 Implementation--PKINIT preauth Plugin Group: Productivity/Networking/Security @@ -182,7 +182,6 @@ Authors: %endif #! build_mini %package devel -License: MIT License (or similar) Summary: MIT Kerberos5 - Include Files and Libraries Group: Development/Libraries/C and C++ PreReq: %{name} = %{version} @@ -251,7 +250,6 @@ popd %build cd src -%{?suse_update_config:%{suse_update_config -f}} ./util/reconf CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC " \ ./configure \ diff --git a/krb5.changes b/krb5.changes index 0be899d..86812a4 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Dec 20 20:57:26 UTC 2011 - coolo@suse.com + +- add autoconf as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Tue Dec 20 11:01:39 UTC 2011 - coolo@suse.com + +- remove call to suse_update_config, very old work around + ------------------------------------------------------------------- Mon Nov 21 11:24:12 CET 2011 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index e1ab109..90af346 100644 --- a/krb5.spec +++ b/krb5.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_mini 0 %define srcRoot krb5-1.9.1 @@ -23,15 +22,19 @@ %define krb5docdir %{_defaultdocdir}/krb5 Name: krb5 -License: MIT License (or similar) Url: http://web.mit.edu/kerberos/www/ -BuildRequires: bison libcom_err-devel ncurses-devel -BuildRequires: keyutils keyutils-devel +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: keyutils +BuildRequires: keyutils-devel +BuildRequires: libcom_err-devel BuildRequires: libselinux-devel +BuildRequires: ncurses-devel Version: 1.9.1 -Release: 21 +Release: 0 %if ! 0%{?build_mini} -BuildRequires: libopenssl-devel openldap2-devel +BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel BuildRequires: pam-devel # bug437293 %ifarch ppc64 @@ -39,6 +42,7 @@ Obsoletes: krb5-64bit %endif # Summary: MIT Kerberos5 Implementation--Libraries +License: MIT Group: Productivity/Networking/Security %else Summary: MIT Kerberos5 Implementation--Libraries @@ -97,7 +101,6 @@ Authors: %if ! %{build_mini} %package client -License: MIT License (or similar) Summary: MIT Kerberos5 implementation - client programs Group: Productivity/Networking/Security @@ -117,7 +120,6 @@ Authors: Tom Yu %package server -License: MIT License (or similar) Summary: MIT Kerberos5 implementation - server Group: Productivity/Networking/Security Requires: perl-Date-Calc @@ -140,7 +142,6 @@ Authors: Tom Yu %package plugin-kdb-ldap -License: MIT License (or similar) Summary: MIT Kerberos5 Implementation--LDAP Database Plugin Group: Productivity/Networking/Security Requires: krb5-server = %{version} @@ -161,7 +162,6 @@ Authors: Tom Yu %package plugin-preauth-pkinit -License: MIT License (or similar) Summary: MIT Kerberos5 Implementation--PKINIT preauth Plugin Group: Productivity/Networking/Security @@ -182,7 +182,6 @@ Authors: %endif #! build_mini %package devel -License: MIT License (or similar) Summary: MIT Kerberos5 - Include Files and Libraries Group: Development/Libraries/C and C++ PreReq: %{name} = %{version} @@ -251,7 +250,6 @@ popd %build cd src -%{?suse_update_config:%{suse_update_config -f}} ./util/reconf CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC " \ ./configure \