rpms/kdenetwork/F-13 kdenetwork.spec,1.235,1.235.2.1

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3690/F-13

Modified Files:
      Tag: kdenetwork-4_4_2-x_fc13
	kdenetwork.spec 
Log Message:
Backport from 4.4.3 to 4.4.2 for possible f13-final tagging:

* Wed May 12 2010 Than Ngo <than at redhat.com> - 7:4.4.2-3
- add consolehelper (#591079)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-13/kdenetwork.spec,v
retrieving revision 1.235
retrieving revision 1.235.2.1
diff -u -p -r1.235 -r1.235.2.1
--- kdenetwork.spec	15 Apr 2010 18:41:00 -0000	1.235
+++ kdenetwork.spec	12 May 2010 22:46:06 -0000	1.235.2.1
@@ -3,15 +3,17 @@ Summary: KDE Network Applications
 Name:    kdenetwork
 Epoch:   7
 Version: 4.4.2
-Release: 2%{?dist}
+Release: 3%{?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
@@ -75,6 +77,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
@@ -131,6 +136,16 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# Run kppp through consolehelper
+mkdir -p %{buildroot}%{_sbindir} \
+         %{buildroot}%{_sysconfdir}/security/console.apps \
+         %{buildroot}%{_sysconfdir}/pam.d
+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}
@@ -162,6 +177,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/
@@ -187,6 +204,7 @@ fi
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*.so
 %{_libdir}/mozilla/plugins/skypebuttons.so
+%{_sbindir}/kppp
 
 %files libs
 %defattr(-,root,root,-)
@@ -202,6 +220,9 @@ fi
 
 
 %changelog
+* Wed May 12 2010 Than Ngo <than at redhat.com> - 7:4.4.2-3
+- add consolehelper (#591079)
+
 * Thu Apr 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 7:4.4.2-2
 - kopete/yahoo: Outgoing messages are not received (kde#226699)