SPECS: kdebase.spec - fix kdialog req; enable kerberos5 (needs fix...

arekm arekm at pld-linux.org
Mon Jul 4 19:54:44 CEST 2005


Author: arekm                        Date: Mon Jul  4 17:54:44 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix kdialog req; enable kerberos5 (needs fixed X11 headers first)

---- Files affected:
SPECS:
   kdebase.spec (1.447 -> 1.448) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.447 SPECS/kdebase.spec:1.448
--- SPECS/kdebase.spec:1.447	Mon Jul  4 13:49:14 2005
+++ SPECS/kdebase.spec	Mon Jul  4 19:54:39 2005
@@ -9,6 +9,7 @@
 # Conditional build:
 %bcond_without	apidocs		# Do not prepare API documentation
 %bcond_without	ldap		# build or not ldap ioslave
+%bcond_without	kerberos5	# kerberos 5 support
 
 %define		_state		stable
 %define		_kdever		3.4.1
@@ -26,7 +27,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	%{_ver}
-Release:	2
+Release:	3
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -85,6 +86,7 @@
 BuildRequires:	gettext-devel
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	grep
+%{?with_kerberos5:BuildRequires: heimdal-devel}
 BuildRequires:	hal-devel
 BuildRequires:	jasper-devel
 BuildRequires:	kdelibs-devel >= %{_minlibsevr}
@@ -525,11 +527,11 @@
 Summary(pl):	KDesktop - obsługa ikon na pulpicie, menu itp.
 Group:		X11/Applications
 Provides:	kdebase-kicker
-Requires:	kde-kdialog
 Requires:	kde-kgreet
 Requires:	kde-kside
 Requires:	kde-logoutpic
 Requires:	%{name}-desktop-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-kdialog = %{epoch}:%{version}-%{release}
 Requires:	%{name}-kfind = %{epoch}:%{version}-%{release}
 Requires:	%{name}-kjobviewer = %{epoch}:%{version}-%{release}
 Requires:	%{name}-kpager = %{epoch}:%{version}-%{release}
@@ -1118,6 +1120,8 @@
 	fi
 done
 
+sed -i -e 's#krb5/##g' configure* */configure* */*.c
+
 %build
 %if %{with apidocs}
 	if [ ! -f "%{_kdedocdir}/en/common/kde-common.css" ]; then
@@ -1144,6 +1148,7 @@
 	--with-kdm-pam=kdm \
 	--with-pam=kdesktop \
 	--with-qt-libraries=%{_libdir} \
+	%{?with_kerberos5:--with-krb5auth} \
 	%{!?with_ldap:--without-ldap} \
 	--with-distribution="PLD Linux Distribution"
 
@@ -2793,6 +2798,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.448  2005/07/04 17:54:39  arekm
+- fix kdialog req; enable kerberos5 (needs fixed X11 headers first)
+
 Revision 1.447  2005/07/04 11:49:14  baggins
 - stop being uber-smart and just use TERM=xterm (not xterm-color),
   like the rest of the world does
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.447&r2=1.448&f=u




More information about the pld-cvs-commit mailing list