[gnome-applets] Update to 3.1.1 Restored basic functionality
Tomas Bzatek
tbzatek at fedoraproject.org
Mon May 9 15:13:16 UTC 2011
commit 2c3694c4125f941633f114944abe33861970289d
Author: Tomas Bzatek <tbzatek at redhat.com>
Date: Mon May 9 17:13:02 2011 +0200
Update to 3.1.1
Restored basic functionality
.gitignore | 1 +
gnome-applets.spec | 127 +++++++++++++++++++++++++++------------------------
sources | 3 +-
3 files changed, 69 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0760b02..e722321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-2.31.90.1.tar.bz2
/gnome-applets-2.31.91.tar.bz2
/gnome-applets-2.32.0.tar.bz2
+/gnome-applets-3.1.1.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 562e287..dd87be7 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,28 +1,29 @@
-%define glib2_version 2.15.3
+%define glib2_version 2.22.0
%define pango_version 1.2.0
-%define gtk2_version 2.6.0
-%define libgnome_version 2.8.0
-%define libgnomeui_version 2.8.0
-%define libglade_version 2.4.0
-%define gnome_panel_version 2.20.1-5
+%define gtk3_version 3.0
+# %define libgnome_version 2.8.0
+# %define libgnomeui_version 2.8.0
+# %define libglade_version 2.4.0
+%define gnome_panel_version 2.91.90
%define libgtop2_version 2.12.0
-%define gail_version 1.2.0
-%define libbonoboui_version 2.3.0
+# %define gail_version 1.2.0
+# %define libbonoboui_version 2.3.0
%define gstreamer_version 0.10.14
%define gstreamer_plugins_version 0.10.14
%define gstreamer_plugins_good_version 0.10.6
%define libxklavier_version 4.0
-%define libwnck_version 2.9.3
-%define libgnome_desktop_version 2.11.1
-%define gnome_utils_version 2.8.1
-%define dbus_version 0.90
-%define dbus_glib_version 0.70
-%define libnotify_version 0.3.2
-%define pygobject_version 2.6
-%define pygtk_version 2.6
-%define gnome_python_version 2.10
+%define libwnck_version 2.91.0
+# %define libgnome_desktop_version 2.11.1
+# %define gnome_utils_version 2.8.1
+%define dbus_version 1.1.2
+%define dbus_glib_version 0.74
+%define libnotify_version 0.7
+%define pygobject_version 2.26
+# %define pygtk_version 2.6
+# %define gnome_python_version 2.10
%define gconf_version 2.14.0
-%define libgnomekbd_version 2.27.4
+# %define libgnomekbd_version 2.27.4
+%define libgweather_version 2.91.0
%define po_package gnome-applets-2.0
@@ -32,15 +33,15 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.32.0
-Release: 4%{?dist}
+Version: 3.1.1
+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}/2.32/%{name}-%{version}.tar.bz2
-Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2
+# Source2: gnome-applets-2.9.3.1-modemlights.tar.bz2
Patch3: gnome-applets-2.3.6-ppp-command.patch
@@ -64,30 +65,29 @@ Patch52: gnome-applets-dbus-glib.patch
Patch53: gnome-applets-notify.patch
BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libgnome-devel >= %{libgnome_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: libglade2-devel >= %{libglade_version}
BuildRequires: libgtop2-devel >= %{libgtop2_version}
BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gail-devel >= %{gail_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: libwnck-devel >= %{libwnck_version}
-BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version}
-BuildRequires: gnome-utils >= %{gnome_utils_version}
+# 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
-# libgucharmap is linked against gtk3, so drop it until gnome-applets is ported
-#BuildRequires: gucharmap-devel
+# 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}
BuildRequires: xorg-x11-proto-devel
@@ -96,11 +96,11 @@ BuildRequires: which
BuildRequires: libtool autoconf gettext intltool
BuildRequires: pkgconfig
BuildRequires: gnome-icon-theme
-BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
+# BuildRequires: libgnomekbd-devel >= %{libgnomekbd_version}
BuildRequires: libxslt
# for patch 39
BuildRequires: NetworkManager-devel
-BuildRequires: libgweather-devel >= 2.22.1
+BuildRequires: libgweather-devel >= %{libgweather_version}
# For cpufreq
BuildRequires: dbus-devel
BuildRequires: polkit-devel >= 0.92
@@ -137,41 +137,40 @@ and more.
%prep
%setup -q
-%patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .stickynotes-null
+# 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}
+# 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
+# %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
+# autoreconf -i -f
%build
%configure \
--enable-suid=no \
-%if %{build_stickynotes}
- --enable-stickynotes \
-%endif
--disable-battstat \
--disable-scrollkeeper \
--enable-mini-commander \
- --enable-gtk-doc
+ --enable-gtk-doc \
+ --without-hal
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-make
+make %{?_smp_mflags}
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -205,6 +204,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
# drop non-XKB support files
rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap
+%if ! %{build_stickynotes}
+ rm -f $RPM_BUILD_ROOT%{_libexecdir}/stickynotes_applet
+%endif
+
%post
/sbin/ldconfig
@@ -292,10 +295,10 @@ fi
%{_datadir}/icons/hicolor/32x32/apps/*
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/gnome-2.0/ui/*
+# %{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome-applets
%{_bindir}/*
-%{_libdir}/bonobo/servers/*
+# %{_libdir}/bonobo/servers/*
%{python_sitelib}/invest/
%{_libexecdir}/accessx-status-applet
%{_libexecdir}/charpick_applet2
@@ -305,7 +308,7 @@ fi
%{_libexecdir}/gnome-applets/
%{_libexecdir}/gweather-applet-2
%{_libexecdir}/mini_commander_applet
-%{_libexecdir}/modemlights_applet2
+# %{_libexecdir}/modemlights_applet2
%{_libexecdir}/multiload-applet-2
%{_libexecdir}/null_applet
@@ -320,10 +323,14 @@ fi
%{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy
%{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service
%{_datadir}/dbus-1/services/*
-%{_datadir}/gnome-panel/applets/*
+%{_datadir}/gnome-panel/4.0/applets/*
%changelog
+* Mon May 9 2011 Tomas Bzatek <tbzatek at redhat.com> - 1:3.1.1-1
+- Update to 3.1.1
+- Restored basic functionality
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.32.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 60b80ab..f4e3e7e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d2fb61c5cfdba1f87302d972bc62dd81 gnome-applets-2.32.0.tar.bz2
-ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
+e01c38412b9f2622b026f3b964f275ca gnome-applets-3.1.1.tar.bz2
More information about the scm-commits
mailing list