[gnome-applets] Update to 3.1.3

Bastien Nocera hadess at fedoraproject.org
Mon Jul 4 10:33:17 UTC 2011


commit 04688fe19b66bf5ae7f9832745e2bb228887a201
Author: Bastien Nocera <hadess at hadess.net>
Date:   Mon Jul 4 11:33:04 2011 +0100

    Update to 3.1.3

 .gitignore                                        |    1 +
 copy.xsl                                          |   30 ---------
 cpufreq-selector.app                              |    1 -
 cpufreq-selector.pam                              |    4 -
 gnome-applets-2.15.1.1-dont-require-display.patch |   14 ----
 gnome-applets-2.15.2-use-old-modemlights.patch    |   57 -----------------
 gnome-applets-2.23.3-use-builtin-apm.patch        |   16 -----
 gnome-applets-2.3.6-ppp-command.patch             |   21 ------
 gnome-applets-dbus-glib.patch                     |   12 ----
 gnome-applets-libs.patch                          |   38 -----------
 gnome-applets-no-mixer-icon.patch                 |   11 ---
 gnome-applets-notify.patch                        |   13 ----
 gnome-applets-null-battstat.patch                 |   68 --------------------
 gnome-applets.spec                                |   69 ++------------------
 modemlights-libgnome.patch                        |   66 --------------------
 ppp-includes.patch                                |   12 ----
 pymod-check.patch                                 |   24 -------
 seriesid-clash.patch                              |   12 ----
 sources                                           |    2 +-
 stickynotes-null.patch                            |   65 -------------------
 20 files changed, 9 insertions(+), 527 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d6bf6e..5b5617a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gnome-applets-2.31.6.tar.bz2
 /gnome-applets-2.32.0.tar.bz2
 /gnome-applets-3.1.1.tar.bz2
 /gnome-applets-3.1.2.tar.xz
+/gnome-applets-3.1.3.tar.xz
diff --git a/gnome-applets.spec b/gnome-applets.spec
index db528f2..c772cee 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,60 +33,28 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	3.1.2
-Release:        2%{?dist}
+Version:	3.1.3
+Release:        1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 # VCS: git:git://git.gnome.org/gnome-applets
-Source: 	http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
-# Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
-
-
-Patch3:		gnome-applets-2.3.6-ppp-command.patch
-
-Patch34:        ppp-includes.patch
-Patch35:        modemlights-libgnome.patch
-
-# do the nullapplet dance for battstat
-Patch40:	gnome-applets-null-battstat.patch
-# and keep the mixer hidden away from the add to panel dialog
-Patch41:	gnome-applets-no-mixer-icon.patch
-# do the nullapplet dance for stickynotes
-Patch42:	stickynotes-null.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=609945
-Patch50:        gnome-applets-libs.patch
-Patch51:        pymod-check.patch
-
-Patch52:        gnome-applets-dbus-glib.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=632803
-Patch53:        gnome-applets-notify.patch
+Source:		http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk3-devel >= %{gtk3_version}
-# BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
-# BuildRequires:  libgnome-devel >= %{libgnome_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
-# BuildRequires:  libglade2-devel >= %{libglade_version}
 BuildRequires:  libgtop2-devel >= %{libgtop2_version}
 BuildRequires:  pango-devel >= %{pango_version}
-# BuildRequires:  gail-devel >= %{gail_version}
 BuildRequires:  libxklavier-devel >= %{libxklavier_version}
 BuildRequires:  gstreamer-devel >= %{gstreamer_version}
 BuildRequires:  gstreamer-plugins-base-devel >= %{gstreamer_plugins_version}
 BuildRequires:  gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version}
 BuildRequires:  /usr/bin/automake
-# BuildRequires:  libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires:  libwnck3-devel >= %{libwnck_version}
-# BuildRequires:  gnome-desktop3-devel >= %{libgnome_desktop_version}
-# BuildRequires:  gnome-utils >= %{gnome_utils_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  pygobject2-devel >= %{pygobject_version}
-# BuildRequires:  pygtk2-devel >= %{pygtk_version}
-# BuildRequires:  gnome-python2-devel >= %{gnome_python_version}
-# BuildRequires:  gnome-python2-applet
 BuildRequires:  gucharmap-devel
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
@@ -96,13 +64,11 @@ BuildRequires:  which
 BuildRequires:  libtool autoconf gettext intltool
 BuildRequires:  pkgconfig
 BuildRequires:  gnome-icon-theme
-# BuildRequires:  libgnomekbd-devel >= %{libgnomekbd_version}
 BuildRequires:  libxslt
-# for patch 39
 BuildRequires:  NetworkManager-devel
 BuildRequires:  libgweather-devel >= %{libgweather_version}
 # For cpufreq
-BuildRequires: 	dbus-devel
+BuildRequires:	dbus-devel
 BuildRequires:  polkit-devel >= 0.92
 BuildRequires:  scrollkeeper
 BuildRequires:  libSM-devel
@@ -118,10 +84,6 @@ Requires(pre): GConf2 >= %{gconf_version}
 Requires(preun): GConf2 >= %{gconf_version}
 Requires(post): GConf2 >= %{gconf_version}
 
-# For invest-applet
-# Requires:	gnome-python2-applet
-# Requires:	gnome-python2-libegg
-
 Obsoletes:      battstat_applet
 Obsoletes:      gnome-cpufreq-applet
 
@@ -137,26 +99,6 @@ and more.
 %prep
 %setup -q
 
-# TODO: port these three to new infrastructure
-# %patch40 -p1 -b .battstat-null
-# %patch41 -p1 -b .no-mixer-icon
-# %patch42 -p1 -b .stickynotes-null
-
-# We don't ship gnome-system-tools
-# rm -rf modemlights
-# tar xjf %{SOURCE2}
-
-# %patch3 -p1 -b .ppp-command
-# %patch34 -p1 -b .ppp-includes
-# %patch35 -p1 -b .modemlights-libgnome
-# %patch50 -p1 -b .libs
-# %patch51 -p1 -b .pymod
-# %patch52 -p1 -b .dbus-glib
-# %patch53 -p1 -b .notify
-
-# autoreconf -i -f
-
-
 %build
 %configure			\
 	--enable-suid=no 	\
@@ -324,6 +266,9 @@ fi
 
 
 %changelog
+* Mon Jul 04 2011 Bastien Nocera <bnocera at redhat.com> 3.1.3-1
+- Update to 3.1.3
+
 * Tue Jun 14 2011 Tomas Bzatek <tbzatek at redhat.com> - 1:3.1.2-1
 - Update to 3.1.2
 
diff --git a/sources b/sources
index 760ff50..7b3c06a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40378b28964eff66ed5db18444b5e5da  gnome-applets-3.1.2.tar.xz
+909e59e8b991c44e9c10c2ce8bd28103  gnome-applets-3.1.3.tar.xz


More information about the scm-commits mailing list