rpms/knetstats/devel knetstats-1.5-desktop.patch, NONE, 1.1 knetstats-1.5-rpathfix.patch, NONE, 1.1 knetstats.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/knetstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13018/devel

Modified Files:
	.cvsignore sources 
Added Files:
	knetstats-1.5-desktop.patch knetstats-1.5-rpathfix.patch 
	knetstats.spec 
Log Message:
auto-import knetstats-1.5-7 on branch devel from knetstats-1.5-7.src.rpm

knetstats-1.5-desktop.patch:

--- NEW FILE knetstats-1.5-desktop.patch ---
--- SOURCES/knetstats.desktop	2005-11-15 05:22:59.000000000 +0100
+++ knetstats.desktop	2006-06-08 23:32:34.000000000 +0200
@@ -2,12 +2,11 @@
 Encoding=UTF-8
 Name=KNetStats
 GenericName=KNetStats
-Comment=Netwrok monitor
+Comment=Network monitor
 Exec=knetstats
 Icon=knetstats
 Terminal=false
 Type=Application
-Categories=Application;Network;
-StartupNotify=true
+X-KDE-StartupNotify=true
 Categories=KDE;Application;Network;
 

knetstats-1.5-rpathfix.patch:

--- NEW FILE knetstats-1.5-rpathfix.patch ---
--- knetstats-1.5/SConstruct	2005-11-15 00:53:28.000000000 +0100
+++ SConstruct	2006-06-05 15:51:22.000000000 +0200
@@ -23,7 +23,7 @@
 ## Load the builders in config
 env = Environment( tools=['default', 'generic', 'kde'], toolpath=['./', './admin'])
 
-env.KDEuse("environ rpath")
+env.KDEuse("environ")
 #env.KDEuse("environ rpath lang_qt thread nohelp")
 
 env['CXXCOMSTR']=bstr


--- NEW FILE knetstats.spec ---
Name:      knetstats
Version:   1.5
Release:   7%{?dist}
Summary:   Network monitor in KDE

License:   GPL
Group:     Applications/Internet
URL:       http://knetstats.sourceforge.net/

Source0:   http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2

Patch0:    knetstats-1.5-rpathfix.patch
Patch1:    knetstats-1.5-desktop.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-devel, gettext, desktop-file-utils, scons
Requires:  %{_docdir}/HTML/en/common

%description
A simple KDE network monitor that show rx/tx LEDs or numeric information about
the transfer rate of any network interface in a system tray icon.

%prep
%setup -q

%patch0 -p0 -b .
%patch1 -p0 -b .

%build
scons configure_prefix=%{_prefix}
scons %{?_smp_mflags}

%install
rm -fr $RPM_BUILD_ROOT
scons prefix=$RPM_BUILD_ROOT%{_prefix} install

desktop-file-install --vendor fedora \
    --add-category X-Fedora \
    --add-category Network \
    --delete-original \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
    $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README
%{_bindir}/%{name}
%{_docdir}/HTML/*/%{name}/
%{_datadir}/apps/%{name}/
%{_datadir}/icons/*/*/apps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Sat Jun 17 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-7
- dropped knetstats-1.5-kde.patch

* Fri Jun 16 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-6
- GTK+ icon cache added in %post and %postun for icons to show up on menus

* Mon Jun 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-5
- Corrected "Permission Denied" while creating ln -s 'common' to '../common'
- Dropped qt-devel as BuildRequire
- Removed (unneccessary) update-desktop-database in %post and %postun
- patch for admin.py due to dangling-relative-symlink with ../common

* Sun Jun 11 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-4
- patch for SConstruct renamed to knetstats-1.5-rpathfix.patch
- patch for knetstats-1.5-desktop.patch
- Integration of desktop-file-install
- Added scons as BuildRequire

* Mon Jun 05 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-3
- Dropped scons and gcc-c++ as BuildRequire
- patch for SConstruct added

* Sun Jun 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-2
- Removed packager tag and corrected "incoherent-version-in-changelog"

* Sat Jun 03 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetstats/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jun 2006 08:07:37 -0000	1.1
+++ .cvsignore	17 Jun 2006 08:08:26 -0000	1.2
@@ -0,0 +1 @@
+knetstats-1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetstats/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jun 2006 08:07:37 -0000	1.1
+++ sources	17 Jun 2006 08:08:26 -0000	1.2
@@ -0,0 +1 @@
+9940488a72055aaf6d70f4502d53c712  knetstats-1.5.tar.bz2