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

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/knetstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5268/FC-5

Modified Files:
	.cvsignore knetstats.spec sources 
Removed Files:
	knetstats-1.5-desktop.patch knetstats-1.5-rpathfix.patch 
Log Message:
auto-import knetstats-1.6-1 on branch FC-5 from knetstats-1.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetstats/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jun 2006 08:08:26 -0000	1.2
+++ .cvsignore	12 Sep 2006 20:36:07 -0000	1.3
@@ -1 +1 @@
-knetstats-1.5.tar.bz2
+knetstats-1.6.tar.bz2


Index: knetstats.spec
===================================================================
RCS file: /cvs/extras/rpms/knetstats/FC-5/knetstats.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knetstats.spec	17 Jun 2006 08:08:26 -0000	1.1
+++ knetstats.spec	12 Sep 2006 20:36:07 -0000	1.2
@@ -1,20 +1,16 @@
-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
+Name:          knetstats
+Version:       1.6
+Release:       1%{?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
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: kdelibs-devel, gettext, desktop-file-utils
 
 %description
 A simple KDE network monitor that show rx/tx LEDs or numeric information about
@@ -23,51 +19,54 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .
-%patch1 -p0 -b .
-
 %build
-scons configure_prefix=%{_prefix}
-scons %{?_smp_mflags}
+%configure --disable-rpath
+%{__make} %{?_smp_mflags}
 
 %install
-rm -fr $RPM_BUILD_ROOT
-scons prefix=$RPM_BUILD_ROOT%{_prefix} install
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} 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
+    --dir %{buildroot}%{_datadir}/applications/ \
+    %{buildroot}%{_datadir}/applications/kde/%{name}.desktop
+
+# Fix absolute symlink
+%{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
+#ln -s ../common %{buildroot}%{_docdir}/HTML/en/%{name}/common
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %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
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %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
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING README
+%doc README
 %{_bindir}/%{name}
-%{_docdir}/HTML/*/%{name}/
 %{_datadir}/apps/%{name}/
-%{_datadir}/icons/*/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_docdir}/HTML/en/%{name}/
+
+%Changelog
+* Tue Sep 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.6-1
+- Upstream release 1.6
+
+* Wed Aug 30 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-8
+- Rebuild for devel
 
-%changelog
 * Sat Jun 17 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 1.5-7
 - dropped knetstats-1.5-kde.patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetstats/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jun 2006 08:08:26 -0000	1.2
+++ sources	12 Sep 2006 20:36:07 -0000	1.3
@@ -1 +1 @@
-9940488a72055aaf6d70f4502d53c712  knetstats-1.5.tar.bz2
+0ced6875eaf39ad8f9a7978dd4355335  knetstats-1.6.tar.bz2


--- knetstats-1.5-desktop.patch DELETED ---


--- knetstats-1.5-rpathfix.patch DELETED ---