- updated to 3.0.0; merged from DEVEL

Changed files:
    gnome-system-monitor.spec -> 1.80

diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 13c39979f285cf6715f99c7f728094c6d680e35d..2aea6917ebbf277e531333b944018ba3f54e6a7b 100644 (file)
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -1,39 +1,39 @@
 Summary:       Simple process monitor
 Summary(pl.UTF-8):     Prosty monitor procesów
 Name:          gnome-system-monitor
-Version:       2.28.2
+Version:       3.0.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 3f0bca9b0ebc7a365466851cd580d167
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: d444f6b48ee3872c438125a388d92484
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.26.0
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
-BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1.11
 BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-devel
-BuildRequires: glibmm-devel >= 2.16.2
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: glibmm-devel >= 2.28.0
 BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-doc-utils >= 0.14.0
-BuildRequires: gnome-icon-theme >= 2.24.0
-BuildRequires: gtkmm-devel >= 2.12.0
-BuildRequires: intltool >= 0.40.0
-BuildRequires: libgtop-devel >= 1:2.24.0
+BuildRequires: gnome-doc-utils >= 0.20.0
+BuildRequires: gnome-icon-theme >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gtkmm3-devel >= 3.0.0
+BuildRequires: intltool >= 0.41.0
+BuildRequires: libgtop-devel >= 1:2.28.2
 BuildRequires: librsvg-devel >= 2.22.0
-BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.24.0
+BuildRequires: libtool >= 2:2.2
+BuildRequires: libwnck-devel >= 3.0.0
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: libxml2-progs
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
+Requires(post,postun): glib2 >= 1:2.26.0
 Requires(post,postun): scrollkeeper
-Requires(post,preun):  GConf2
-Requires:      libgtop >= 1:2.24.0
-Requires:      libwnck >= 2.24.0
+Requires:      gnome-icon-theme >= 3.0.0
+Requires:      libgtop >= 1:2.28.2
 Obsoletes:     procman
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -57,7 +57,8 @@ GNOME System Monitor to prosty monitor procesów i systemu.
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-schemas-install \
+       --disable-silent-rules \
+       --disable-schemas-compile \
        --disable-scrollkeeper
 %{__make}
 
@@ -73,13 +74,11 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install gnome-system-monitor.schemas
+%glib_compile_schemas
 %scrollkeeper_update_post
 
-%preun
-%gconf_schema_uninstall gnome-system-monitor.schemas
-
 %postun
+%glib_compile_schemas
 %scrollkeeper_update_postun
 
 %files -f %{name}.lang
@@ -87,4 +86,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gnome-system-monitor
 %{_desktopdir}/gnome-system-monitor.desktop
 %{_pixmapsdir}/gnome-system-monitor
-%{_sysconfdir}/gconf/schemas/gnome-system-monitor.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml