2.99.0
This commit is contained in:
Matthias Clasen
parent
90b21c80d6
commit
1212188643
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
gnome-system-monitor-2.28.1.tar.bz2
|
||||
/gnome-system-monitor-2.28.2.tar.bz2
|
||||
/gnome-system-monitor-2.99.0.tar.bz2
|
||||
|
||||
@ -11,22 +11,20 @@
|
||||
|
||||
Summary: Process and resource monitor
|
||||
Name: gnome-system-monitor
|
||||
Version: 2.28.2
|
||||
Release: 2%{?dist}
|
||||
Version: 2.99.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
URL: http://www.gnome.org/
|
||||
#VCS: git:git://git.gnome.org/gnome-system-monitor
|
||||
Source: http://download.gnome.org/sources/gnome-system-monitor/2.28/%{name}-%{version}.tar.bz2
|
||||
Source: http://download.gnome.org/sources/gnome-system-monitor/2.99/%{name}-%{version}.tar.bz2
|
||||
Source1: about-this-computer.desktop
|
||||
BuildRequires: GConf2-devel
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
BuildRequires: libgtop2-devel >= %{libgtop2_version}
|
||||
BuildRequires: libwnck-devel >= %{libwnck_version}
|
||||
BuildRequires: pango-devel >= %{pango_version}
|
||||
BuildRequires: gtk2-devel >= %{gtk2_version}
|
||||
BuildRequires: gtkmm24-devel
|
||||
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: gtkmm30-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: startup-notification-devel
|
||||
BuildRequires: intltool scrollkeeper gettext
|
||||
BuildRequires: libselinux-devel >= %{libselinux_version}
|
||||
@ -40,15 +38,6 @@ BuildRequires: polkit-devel >= %{polkit_version}
|
||||
# needed for autoreconf
|
||||
BuildRequires: autoconf, automake, libtool
|
||||
|
||||
# sent upstream: http://bugzilla.gnome.org/show_bug.cgi?id=491462
|
||||
Patch0: polkit.patch
|
||||
|
||||
# sent upstream: http://bugzilla.gnome.org/show_bug.cgi?id=421912
|
||||
Patch1: session.patch
|
||||
|
||||
# http://bugzilla.gnome.org/show_bug.cgi?id=592758
|
||||
Patch2: memmapsdialog.patch
|
||||
|
||||
Requires(pre): GConf2 >= %{gconf_version}
|
||||
Requires(post): GConf2 >= %{gconf_version}
|
||||
Requires(preun): GConf2 >= %{gconf_version}
|
||||
@ -60,87 +49,48 @@ such as CPU and memory.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .polkit
|
||||
%patch1 -p1 -b .session
|
||||
%patch2 -p1 -b .memmapsdialog
|
||||
|
||||
autoreconf -i -f
|
||||
|
||||
%build
|
||||
%configure --enable-selinux --disable-scrollkeeper --enable-polkit
|
||||
# dunno why the deps are not picked up correctly here
|
||||
make -C src gnome-system-monitor-mechanism-glue.h gnome-system-monitor-mechanism-client-glue.h
|
||||
%configure --enable-selinux --disable-scrollkeeper
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||
%makeinstall
|
||||
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
desktop-file-install --vendor gnome --delete-original \
|
||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||
--remove-category Application \
|
||||
--remove-category Application \
|
||||
$RPM_BUILD_ROOT%{_datadir}/applications/*
|
||||
|
||||
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
|
||||
|
||||
# save space by linking identical images in translated docs
|
||||
helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
|
||||
for f in $helpdir/C/figures/*.png; do
|
||||
b="$(basename $f)"
|
||||
for d in $helpdir/*; do
|
||||
if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
|
||||
g="$d/figures/$b"
|
||||
if [ -f "$g" ]; then
|
||||
if cmp -s $f $g; then
|
||||
rm "$g"; ln -s "../../C/figures/$b" "$g"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
%find_lang %{name} --with-gnome
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null || :
|
||||
|
||||
%pre
|
||||
if [ "$1" -gt 1 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule \
|
||||
%{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null || :
|
||||
%postun
|
||||
if [ $1 -eq 0 ]; then
|
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
|
||||
fi
|
||||
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule \
|
||||
%{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas > /dev/null || :
|
||||
fi
|
||||
%posttrans
|
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-, root, root,-)
|
||||
%doc AUTHORS NEWS COPYING README
|
||||
%{_sysconfdir}/gconf/schemas/*
|
||||
%{_bindir}/gnome-system-monitor
|
||||
%{_datadir}/applications/*
|
||||
%{_datadir}/pixmaps/gnome-system-monitor/
|
||||
%{_sysconfdir}/dbus-1/system.d/org.gnome.SystemMonitor.Mechanism.conf
|
||||
%{_libexecdir}/gnome-system-monitor-mechanism
|
||||
%{_datadir}/polkit-1/actions/org.gnome.system-monitor.policy
|
||||
%{_datadir}/dbus-1/system-services/org.gnome.SystemMonitor.Mechanism.service
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> - 2.99.0-1
|
||||
- Update to 2.99.0
|
||||
- Drop accumulated patches
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.28.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user