rpms/knetworkmanager/F-8 fedora-knetworkmanager.desktop, NONE, 1.1 knetworkmanager-autostart.desktop, NONE, 1.1 knetworkmanager-svn_checkout.sh, 1.4, 1.5 knetworkmanager.spec, 1.12, 1.13

Tue Oct 23 02:22:00 UTC 2007

Author: ausil

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

Modified Files:
	knetworkmanager-svn_checkout.sh knetworkmanager.spec 
Added Files:
	fedora-knetworkmanager.desktop 
	knetworkmanager-autostart.desktop 
Log Message:
stub package until knetworkmanager works

--- NEW FILE fedora-knetworkmanager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KNetworkManager
Name[bn]=à¦•à§‡-à¦¨à§‡à¦Ÿà¦“à§Ÿà¦¾à¦°à§à¦•-à¦®à§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
Name[sv]=Knetworkmanager
GenericName=Network Manager
GenericName[bn]=à¦¨à§‡à¦Ÿà¦“à§Ÿà¦¾à¦°à§à¦• à¦®à§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
GenericName[br]=Merour rouedad
GenericName[da]=NetvÃ¦rkshÃ¥ndtering
GenericName[de]=Netzwerkverwaltung
GenericName[el]=Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ Î´Î¹ÎºÏ„ÏÎ¿Ï…
GenericName[es]=Gestor de red
GenericName[et]=VÃµrguhaldur
GenericName[it]=Gestore di rete
GenericName[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒžãƒãƒ¼ã‚¸ãƒ£
GenericName[nl]=Netwerkbeheer
GenericName[pt]=Gestor de Redes
GenericName[sr]=Ð£Ð¿Ñ€Ð°Ð²Ð½Ð¸Ðº Ð¼Ñ€ÐµÐ¶Ðµ
GenericName[sr at Latn]=Upravnik mreÅ¾e
GenericName[sv]=NÃ¤tverksverktyg
GenericName[tr]=AÄŸ YÃ¶neticisi
Exec=nm-applet
Icon=network
Type=Application
Comment=A KDE frontend for NetworkManager
Comment[bg]=Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð·Ð° NetworkManager (KDE)
Comment[bn]=à¦¨à§‡à¦Ÿà¦“à§Ÿà¦¾à¦°à§à¦•-à¦®à§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°à§‡à¦° à¦œà¦¨à§à¦¯ à¦à¦•à¦Ÿà¦¿ à¦•à§‡à¦¡à¦¿à¦‡ à¦«à§à¦°à¦¨à§à¦Ÿ-à¦à¦¨à§à¦¡
Comment[ca]=Un frontal del KDE per al NetworkManager
Comment[da]=En KDE-grÃ¦nseflade for Networkmanager
Comment[de]=Eine KDE-OberflÃ¤che fÃ¼r NetworkManager
Comment[el]=ÎœÎ¹Î± Î´Î¹Î±ÏƒÏÎ½Î´ÎµÏƒÎ· Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½Ï„Î¿Ï‚ Î³Î¹Î± Ï„Î¿ NetworkManager
Comment[es]=Una interfaz de KDE a NetworkManager
Comment[et]=KDE NetworkManageri kasutajaliides
Comment[it]=Un front-end di NetworkManager per KDE
Comment[ja]=NetworkManager ã® KDE ãƒ•ãƒãƒ³ãƒˆã‚¨ãƒ³ãƒ‰
Comment[nl]=Een KDE-schil voor NetworkManager
Comment[pt]=Uma interface para KDE do NetworkManager
Comment[sr]=KDE Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð·Ð° NetworkManager
Comment[sr at Latn]=KDE program za NetworkManager
Comment[sv]=Ett grÃ¤nssnitt till Networkmanager fÃ¶r KDE
Comment[tr]=NetworkManager iÃ§in bir KDE Ã¶n yÃ¼zÃ¼
X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
X-DCOP-ServiceType=Unique
X-KDE-autostart-condition=knetworkmanagerrc:General:Autostart:true
Categories=Qt;KDE;System;


--- NEW FILE knetworkmanager-autostart.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=KNetworkManager
Name[bn]=à¦•à§‡-à¦¨à§‡à¦Ÿà¦“à§Ÿà¦¾à¦°à¦•-à¦®à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
Name[sv]=Knetworkmanager
GenericName=Network Manager
GenericName[bn]=à¦¨à§‡à¦Ÿà¦“à§Ÿà¦¾à¦°à¦• à¦®à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°
GenericName[br]=Merour rouedad
GenericName[da]=NetvÃ¦rkshÃ¥ndtering
GenericName[de]=Netzwerkverwaltung
GenericName[el]=Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ Î´Î¹ÎºÏ„ÏÎ¿Ï…
GenericName[es]=Gestor de red
GenericName[et]=VÃµrguhaldur
GenericName[it]=Gestore di rete
GenericName[ja]=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒžãƒãƒ¼ã‚¸ãƒ£
GenericName[nl]=Netwerkbeheer
GenericName[pt]=Gestor de Redes
GenericName[sr]=Ð£Ð¿Ñ€Ð°Ð²Ð½Ð¸Ðº Ð¼Ñ€ÐµÐ¶Ðµ
GenericName[sr at Latn]=Upravnik mreÅ¾e
GenericName[sv]=NÃ¤tverksverktyg
GenericName[tr]=AÄŸ YÃ¶neticisi
Exec=nm-applet
Icon=network
Type=Application
Comment=A KDE frontend for NetworkManager
Comment[bg]=Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð·Ð° NetworkManager (KDE)
Comment[bn]=à¦¨à§‡à¦Ÿà¦“à§Ÿà¦¾à¦°à¦•-à¦®à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°à§‡à¦° à¦œà¦¨à¦¯ à¦à¦•à¦Ÿà¦¿ à¦•à§‡à¦¡à¦¿à¦‡ à¦«à¦°à¦¨à¦Ÿ-à¦à¦¨à¦¡
Comment[ca]=Un frontal del KDE per al NetworkManager
Comment[da]=En KDE-grÃ¦nseflade for Networkmanager
Comment[de]=Eine KDE-OberflÃ¤che fÃ¼r NetworkManager
Comment[el]=ÎœÎ¹Î± Î´Î¹Î±ÏƒÏÎ½Î´ÎµÏƒÎ· Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½Ï„Î¿Ï‚ Î³Î¹Î± Ï„Î¿ NetworkManager
Comment[es]=Una interfaz de KDE a NetworkManager
Comment[et]=KDE NetworkManageri kasutajaliides
Comment[it]=Un front-end di NetworkManager per KDE
Comment[ja]=NetworkManager ã® KDE ãƒ•ãƒãƒ³ãƒˆã‚¨ãƒ³ãƒ‰
Comment[nl]=Een KDE-schil voor NetworkManager
Comment[pt]=Uma interface para KDE do NetworkManager
Comment[sr]=KDE Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð·Ð° NetworkManager
Comment[sr at Latn]=KDE program za NetworkManager
Comment[sv]=Ett grÃ¤nssnitt till Networkmanager fÃ¶r KDE
Comment[tr]=NetworkManager iÃ§in bir KDE Ã¶n yÃ¼zÃ¼
X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
X-DCOP-ServiceType=Unique
X-KDE-autostart-condition=knetworkmanagerrc:General:Autostart:true
Categories=Qt;KDE;System;



Index: knetworkmanager-svn_checkout.sh
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/F-8/knetworkmanager-svn_checkout.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- knetworkmanager-svn_checkout.sh	21 Sep 2007 16:48:31 -0000	1.4
+++ knetworkmanager-svn_checkout.sh	23 Oct 2007 02:21:27 -0000	1.5
@@ -5,11 +5,10 @@
 
 set -x
 rm -rf $EXPORT_DIR
-svn --non-recursive export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/ $EXPORT_DIR
+#svn --non-recursive export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/ $EXPORT_DIR
+svn --non-recursive export svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network $EXPORT_DIR
 # app
-#svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/knetworkmanager/ $EXPORT_DIR/knetworkmanager
-#svn export  svn://websvn.kde.org/home/kde/trunk/extragear/network/knetworkmanager $EXPORT_DIR/knetworkmanager
-svn export  svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
+svn export  svn://websvn.kde.org/home/kde/branches/work/knetworkmanager/ $EXPORT_DIR/knetworkmanager
 # docs
 #svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc/knetworkmanager $EXPORT_DIR/doc/
 # auto*/configure bits


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/F-8/knetworkmanager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- knetworkmanager.spec	21 Sep 2007 16:48:31 -0000	1.12
+++ knetworkmanager.spec	23 Oct 2007 02:21:27 -0000	1.13
@@ -1,23 +1,20 @@
-%define         svn svn20070921
+%define         svn svn20071022
 
 Name:           knetworkmanager
 Version:        0.2
-Release:        0.2.%{svn}%{?dist}
+Release:        0.4.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://en.opensuse.org/Projects/KNetworkManager
-Source0:        knetworkmanager-%{svn}.tar.bz2
+Source0:        knetworkmanager-autostart.desktop
 #script to make svn tarball
-Source1:	knetworkmanager-svn_checkout.sh
+Source1:	fedora-knetworkmanager.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake
-BuildRequires:  NetworkManager-devel >= 0.6.2
-BuildRequires:  desktop-file-utils kdelibs-devel hal-devel wireless-tools-devel
-BuildRequires:  dbus-qt-devel libnl-devel
+Requires:       NetworkManager-gnome
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -28,6 +25,7 @@
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
 Requires:       openvpn
+Requires:       NetworkManager-openvpn
 
 %description openvpn
 openvpn support for KNetworkManager 
@@ -38,6 +36,7 @@
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
 Requires:       vpnc
+Requires:       NetworkManager-vpnc
 
 %description vpnc
 vpnc support for knetworkmanager
@@ -60,43 +59,45 @@
 Development headers for knetworkmanager
 
 %prep 
-%setup -q -n %{name}
-
-make -f Makefile.cvs
+#nothing to prep
 
 %build
-%configure --disable-rpath --with-openvpn --with-vpnc --with-pptp \
-           --disable-warnings 
-make %{?_smp_mflags}
-
+#nothing to build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$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
 
 desktop-file-install \
 --dir $RPM_BUILD_ROOT%{_datadir}/applications \
---vendor=fedora \
---remove-category=Applet \
---remove-category=Network \
---add-category=System \
---delete-original \
-$RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/autostart/
-cp $RPM_BUILD_ROOT%{_datadir}/applications/fedora-knetworkmanager.desktop $RPM_BUILD_ROOT%{_datadir}/autostart/knetworkmanager-autostart.desktop
-
-## File lists
-# locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-   lang=$(basename $lang_dir)
-   echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
-done
-fi
+%SOURCE1
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,52 +108,36 @@
 %postun
 touch --no-create %{_datadir}/icons/crystalsvg || :
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc knetworkmanager/COPYING knetworkmanager/AUTHORS knetworkmanager/README knetworkmanager/TODO knetworkmanager/NEWS
-%config(noreplace) /etc/dbus-1/system.d/knetworkmanager.conf
 %{_bindir}/knetworkmanager
-%{_libdir}/kde3/knetworkmanager.*
-%{_libdir}/libkdeinit_knetworkmanager.*
-%{_datadir}/icons/crystalsvg/*/apps/knetworkmanager.png
-%{_datadir}/apps/knetworkmanager
-%{_datadir}/autostart/knetworkmanager-autostart.desktop
-%{_datadir}/config.kcfg/knetworkmanager.kcfg
 %{_datadir}/applications/fedora-knetworkmanager.desktop
-%{_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
+%{_datadir}/autostart/knetworkmanager-autostart.desktop
+%{_sysconfdir}/skel/.kde/env/start-custom.sh
+%{_sysconfdir}/skel/.kde/shutdown/stop-custom.sh
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/knetworkmanager-plugin.h
-%{_includedir}/knetworkmanager-vpnplugin.h
 
 %files openvpn
 %defattr(-,root,root,-)
-%{_libdir}/kde3/knetworkmanager_openvpn.la
-%{_libdir}/kde3/knetworkmanager_openvpn.so
-%{_libdir}/kde3/knetworkmanager_openvpn.so.0
-%{_libdir}/kde3/knetworkmanager_openvpn.so.0.0.0
-%{_datadir}/services/knetworkmanager_openvpn.desktop
 
 %files vpnc
 %defattr(-,root,root,-)
-%{_libdir}/kde3/knetworkmanager_vpnc.la
-%{_libdir}/kde3/knetworkmanager_vpnc.so
-%{_libdir}/kde3/knetworkmanager_vpnc.so.0
-%{_libdir}/kde3/knetworkmanager_vpnc.so.0.0.0
-%{_datadir}/services/knetworkmanager_vpnc.desktop
 
 %files pptp
 %defattr(-,root,root,-)
-%{_libdir}/kde3/knetworkmanager_pptp.la
-%{_libdir}/kde3/knetworkmanager_pptp.so
-%{_libdir}/kde3/knetworkmanager_pptp.so.0
-%{_libdir}/kde3/knetworkmanager_pptp.so.0.0.0
-%{_datadir}/services/knetworkmanager_pptp.desktop
 
 
 %changelog
+* Mon Oct 22 2007 Dennis Gilmore <dennis at ausil.us> - 0.2-0.4
+- put in wrapper script to call nm-applet
+
+* Sat Sep 29 2007 Dennis Gilmore <dennis at ausil.us> - 0.2-0.3.svn20070929
+- update to 20070929
+- should somewhat work with nm-0.7
+- fix BR's
+
 * Fri Sep 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.2.svn20070921
 - License: GPLv2+
 - update tarball to 20070921


