rpms/knetworkmanager/F-8 gnome-keyring-daemon-start.sh, NONE, 1.1 gnome-keyring-daemon-stop.sh, NONE, 1.1 knetworkmanager_nm-applet.sh, NONE, 1.1 knetworkmanager.spec, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/knetworkmanager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19848

Modified Files:
	knetworkmanager.spec 
Added Files:
	gnome-keyring-daemon-start.sh gnome-keyring-daemon-stop.sh 
	knetworkmanager_nm-applet.sh 
Log Message:
* Tue Oct 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.6
- %_sysconfdir/skel/.kde/ -> %_sysconfdir/kde/
- cleanup start/stop scripts
- omit %svn from Release
- Requires: kde-filesystem



--- NEW FILE gnome-keyring-daemon-start.sh ---
#!/bin/sh

if [ -x /usr/bin/gnome-keyring-daemon ]; then
  eval `/usr/bin/gnome-keyring-daemon`
  export GNOME_KEYRING_PID
  export GNOME_KEYRING_SOCKET
fi


--- NEW FILE gnome-keyring-daemon-stop.sh ---
#/bin/sh

if [ -n "$GNOME_KEYRING_PID" ];then
  kill $GNOME_KEYRING_PID
fi



--- NEW FILE knetworkmanager_nm-applet.sh ---
#!/bin/sh

exec /usr/bin/nm-applet


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/F-8/knetworkmanager.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- knetworkmanager.spec	23 Oct 2007 02:27:31 -0000	1.14
+++ knetworkmanager.spec	23 Oct 2007 20:05:10 -0000	1.15
@@ -1,20 +1,22 @@
-%define         svn svn20071022
+#define         svn svn20071022
 
 Name:           knetworkmanager
 Version:        0.2
-Release:        0.5.%{svn}%{?dist}
+Release:        0.6%{?svn:.%{svn}}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://en.opensuse.org/Projects/KNetworkManager
 Source0:        knetworkmanager-autostart.desktop
-#script to make svn tarball
 Source1:	fedora-knetworkmanager.desktop
-
+Source2:        knetworkmanager_nm-applet.sh
+Source3:        gnome-keyring-daemon-start.sh
+Source4:        gnome-keyring-daemon-stop.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       NetworkManager-gnome
+Requires:       kde-filesystem
 BuildRequires:  desktop-file-utils
 
 %description
@@ -67,37 +69,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kde/env $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kde/shutdown $RPM_BUILD_ROOT%{_datadir}/autostart $RPM_BUILD_ROOT%{_bindir}
-
-install -p %SOURCE0 $RPM_BUILD_ROOT%{_datadir}/autostart/knetworkmanager-autostart.desktop
 
-echo > $RPM_BUILD_ROOT%{_bindir}/knetworkmanager << EOF
-#!/bin/sh
-exec nm-applet
-EOF
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/knetworkmanager
-
-
-# and set up gnome-keyring to startup/shutdown in kde
-echo > $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kde/env/start-custom.sh << EOF
-#!/bin/sh
-eval `gnome-keyring-daemon`
-export GNOME_KEYRING_PID
-export GNOME_KEYRING_SOCKET
-EOF
-chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kde/env/start-custom.sh
-
-echo > $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kde/shutdown/stop-custom.sh << EOF
-#/bin/sh
-if [-n "$GNOME_KEYRING_PID"];then
-kill $GNOME_KEYRING_PID
-fi
-EOF
-chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.kde/shutdown/stop-custom.sh
+install -p -m644 -D %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/autostart/knetworkmanager-autostart.desktop
 
 desktop-file-install \
 --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-%SOURCE1
+%{SOURCE1}
+
+install -p -m755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/knetworkmanager
+install -p -m755 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/gnome-keyring-daemon-start.sh
+install -p -m755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/kde/shutdown/gnome-keyring-daemon-stop.sh
 
 
 %clean
@@ -114,8 +95,8 @@
 %{_bindir}/knetworkmanager
 %{_datadir}/applications/fedora-knetworkmanager.desktop
 %{_datadir}/autostart/knetworkmanager-autostart.desktop
-%{_sysconfdir}/skel/.kde/env/start-custom.sh
-%{_sysconfdir}/skel/.kde/shutdown/stop-custom.sh
+%{_sysconfdir}/kde/env/*.sh
+%{_sysconfdir}/kde/shutdown/*.sh
 
 %files devel
 %defattr(-,root,root,-)
@@ -131,6 +112,12 @@
 
 
 %changelog
+* Tue Oct 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.6
+- %%_sysconfdir/skel/.kde/ -> %%_sysconfdir/kde/
+- cleanup start/stop scripts
+- omit %%svn from Release
+- Requires: kde-filesystem
+
 * Mon Oct 22 2007 Dennis Gilmore <dennis at ausil.us> - 0.2-0.5
 - we still need to BR desktop-file-utils