- updated to 3.4.0; merged from DEVEL

Changed files:
    gnome-power-manager.spec -> 1.87

diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index 15fadb6e6d39aac8c6c2e0b774fa9e101e81ec4d..f28061759391acb1a1b8760052d695bda3eb89e9 100644 (file)
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -1,12 +1,12 @@
 Summary:       GNOME Power Manager
 Summary(pl.UTF-8):     Zarządca energii dla GNOME
 Name:          gnome-power-manager
-Version:       3.2.1
+Version:       3.4.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/3.2/%{name}-%{version}.tar.xz
-# Source0-md5: 8e8a3759e0805041342c1f49471ee4ed
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/3.4/%{name}-%{version}.tar.xz
+# Source0-md5: 154b012de55244a807510379b67a6b6d
 URL:           http://www.gnome.org/projects/gnome-power-manager/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
@@ -15,7 +15,7 @@ BuildRequires:        docbook-dtd41-sgml
 BuildRequires: docbook-dtd43-xml
 BuildRequires: docbook-utils
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: glib2-devel >= 1:2.31.10
 BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-doc-utils >= 0.14.0
 BuildRequires: gtk+3-devel >= 3.0.0
@@ -24,12 +24,11 @@ BuildRequires:      libtool
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.601
-BuildRequires: scrollkeeper
 BuildRequires: tar >= 1:1.22
 BuildRequires: upower-devel >= 0.9.1
 BuildRequires: xz
-Requires(post,postun): glib2 >= 1:2.28.0
-Requires(post,postun): scrollkeeper
+Requires(post,postun): glib2 >= 1:2.26.0
+Requires:      glib2 >= 1:2.31.10
 Requires:      gnome-icon-theme
 Requires:      gnome-session >= 3.0.0
 Requires:      gtk-update-icon-cache
@@ -94,8 +93,7 @@ Zastosowania infrastruktury zarządcy energii GNOME:
 %{__autoheader}
 %{__autoconf}
 %configure \
-       --disable-silent-rules \
-       --disable-scrollkeeper
+       --disable-silent-rules
 %{__make}
 
 %install
@@ -104,19 +102,17 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome --with-omf --all-name
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%scrollkeeper_update_post
 %update_icon_cache hicolor
 %update_icon_cache gnome
 %glib_compile_schemas
 
 %postun
-%scrollkeeper_update_postun
 %update_icon_cache hicolor
 %update_icon_cache gnome
 %glib_compile_schemas