rpms/kdenetwork/F-11 kppp.console, NONE, 1.1 kppp.pam, NONE, 1.1 kdenetwork.spec, 1.208, 1.209

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10573

Modified Files:
	kdenetwork.spec 
Added Files:
	kppp.console kppp.pam 
Log Message:
add consolehelper for kppp



--- NEW FILE kppp.console ---
USER=root
PROGRAM=/usr/sbin/kppp
SESSION=true


--- NEW FILE kppp.pam ---
#%PAM-1.0
auth        include     config-util
account     include     config-util
session     include     config-util


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -p -r1.208 -r1.209
--- kdenetwork.spec	5 May 2010 20:16:51 -0000	1.208
+++ kdenetwork.spec	12 May 2010 16:55:37 -0000	1.209
@@ -3,15 +3,16 @@ Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.4.3
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: krdc-icons.tar.bz2
+Source2: kppp.console 
+Source3: kppp.pam
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
@@ -71,6 +72,9 @@ Requires: ppp
 ## krdc
 Requires(hint): rdesktop
 
+# consolehelper
+Requires: usermode-gtk
+
 Obsoletes: %{name}-extras < 7:4.0.0 
 
 # kopete-bonjour review, https://bugzilla.redhat.com/451302
@@ -123,6 +127,15 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# Run kppp through consolehelper
+mkdir -p %{buildroot}%{_sbindir} \
+         %{buildroot}%{_sysconfdir}/security/console.apps
+chmod 0755 %{buildroot}%{_bindir}/kppp
+mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir}
+ln -s consolehelper %{buildroot}%{_bindir}/kppp
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/kppp
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/kppp
+
 
 %clean
 rm -rf %{buildroot}
@@ -154,6 +167,8 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
+%config(noreplace) %{_sysconfdir}/security/console.apps/kppp
+%config(noreplace) %{_sysconfdir}/pam.d/kppp
 %{_kde4_bindir}/*
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
@@ -179,6 +194,7 @@ fi
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*.so
 %{_libdir}/mozilla/plugins/skypebuttons.so
+%{_sbindir}/kppp
 
 %files libs
 %defattr(-,root,root,-)
@@ -194,8 +210,8 @@ fi
 
 
 %changelog
-* Wed May 05 2010 Rex Dieter <rdieter at fedoraproject.org> - 7:4.4.3-1.1
-- rebuild against correct tag
+* Wed May 12 2010 Than Ngo <than at redhat.com> - 7:4.4.3-2
+- add consolehelper
 
 * Fri Apr 30 2010 Jaroslav Reznik <jreznik at redhat.com> - 7:4.4.3-1
 - 4.4.3