diff --git a/.cvsignore b/.cvsignore index a7db4ae..cea0331 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-system-monitor-2.5.3.tar.bz2 +gnome-system-monitor-2.6.0.tar.bz2 diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index 9bc88e1..bd21933 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -9,9 +9,9 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.5.3 -Release: 1 -Copyright: GPL +Version: 2.6.0 +Release: 3 +License: GPL Group: Applications/System Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-root @@ -26,8 +26,7 @@ BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: startup-notification-devel BuildRequires: libtool autoconf automake16 -# For intltool: -BuildRequires: perl-XML-Parser >= 2.31-16 +BuildRequires: intltool scrollkeeper gettext Obsoletes: gtop @@ -40,9 +39,6 @@ gnome-system-monitor is a simple process and system monitor. %build -#workaround broken perl-XML-Parser on 64bit arches -export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2:/usr/lib64/perl5/vendor_perl/5.8.0 - libtoolize --force aclocal-1.6 automake-1.6 --add-missing @@ -62,6 +58,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-only-show-in GNOME \ --add-category X-Red-Hat-Base \ $RPM_BUILD_ROOT%{_datadir}/applications/* @@ -76,7 +73,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null %files -f %{name}.lang -%defattr(-, root, root) +%defattr(-, root, root,-) %{_bindir}/gnome-system-monitor %{_datadir}/applications @@ -87,6 +84,15 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-system-mo %{_datadir}/omf %changelog +* Mon May 03 2004 Than Ngo 2.6.0-3 +- cleanup GNOME/KDE menu, only show in GNOME + +* Tue Apr 13 2004 Warren Togami 2.6.0-2 +- #110918 BR intltool scrollkeeper gettext + +* Fri Apr 2 2004 Alex Larsson 2.6.0-1 +- update to 2.6.0 + * Thu Feb 26 2004 Alexander Larsson 2.5.3-1 - update to 2.5.3 diff --git a/sources b/sources index e0aab05..8125b22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d42d637beeb6f623583c3c3065c2788 gnome-system-monitor-2.5.3.tar.bz2 +1bc8709baa43fdca7eee8cad1dc76b17 gnome-system-monitor-2.6.0.tar.bz2