gnome-panel 3.14.0f21

3 files changed, 27 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 61583cb..46d5407 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ gnome-panel-2.31.6.tar.bz2
 /gnome-panel-3.5.4.tar.xz
 /gnome-panel-3.6.0.tar.xz
 /gnome-panel-3.6.2.tar.xz
+/gnome-panel-3.14.0.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 2d74188..9a6c619 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,29 +1,29 @@
-%define gettext_package gnome-panel-2.0
+%define gettext_package gnome-panel-3.0
 
 %define gnome_desktop_version 2.91.6
-%define glib2_version 2.31.14
+%define glib2_version 2.35.0
 %define gtk3_version 3.3.8
-%define libwnck_version 2.91.6
+%define libwnck_version 3.4.6
 %define gnome_menus_version 3.7.90
+%define telepathy_glib_version 0.14.0
 %define evolution_data_server_version 3.5.3
 %define cairo_version 1.0.0
-%define dbus_version 1.1.2
-%define dbus_glib_version 0.80
-%define gnome_doc_utils_version 0.3.2
-%define libgweather_version 3.5.1
+%define libgweather_version 3.9.2
+%define dconf_version 0.13.4
+%define librsvg_version 2.36.2
 
 %define use_evolution_data_server 1
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 3.8.1
+Version: 3.14.0
 Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
-Source0: http://download.gnome.org/sources/gnome-panel/3.8/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-panel/3.14/%{name}-%{version}.tar.xz
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=646749
-Patch0: Use-16px-menu-icons.patch
+#Patch0: Use-16px-menu-icons.patch
 
 License: GPLv2+ and LGPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -60,19 +60,19 @@ BuildRequires: dconf-devel
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: yelp-tools
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: dconf-devel >= %{dconf_version}
 BuildRequires: gtk-doc
 BuildRequires: pango-devel
 BuildRequires: libXau-devel
 BuildRequires: libXrandr-devel
 %if %{use_evolution_data_server}
 BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
-BuildRequires: dbus-devel >= %{dbus_version}
 %endif
 BuildRequires: polkit-devel >= 0.92
 BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: librsvg2-devel
+BuildRequires: librsvg2-devel >= %{librsvg_version}
 BuildRequires: NetworkManager-devel
+BuildRequires: telepathy-glib-devel >= %{telepathy_glib_version}
 BuildRequires: intltool
 BuildRequires: gettext-devel
 BuildRequires: libtool
@@ -103,7 +103,7 @@ Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
 Obsoletes: gnome-applet-sensors-devel <= 0:2.2.7-5
 Obsoletes: gnome-applet-timer <= 0:2.1.4-3
 Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
-Obsoletes: gnome-applets <= 1:2.32.0-5
+Obsoletes: gnome-applets <= 1:3.8.1-1
 Obsoletes: gnome-netstatus <= 0:2.28.2-2
 Obsoletes: gnome-python2-applet <= 0:2.32.0-2
 Obsoletes: gnome-schedule <= 0:2.0.2-7
@@ -144,7 +144,7 @@ Panel Applets using the libpanel-applet library.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .16px
+#patch0 -p1 -b .16px
 
 rm -f libtool
 autoreconf -i -f
@@ -168,20 +168,15 @@ awk '/^========/ { seen+=1 }
 
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 find $RPM_BUILD_ROOT -name '*.*a' -delete;
 
-# provided by gnome-flashback
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-session/sessions
-rm -rf $RPM_BUILD_ROOT%{_datadir}/xsessions
-
-desktop-file-install --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
+# FIXME: GNOME-Flashback is not yet registered in list of DEs
+#desktop-file-install --delete-original \
+#  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+#  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
 
 %find_lang %{gettext_package} --all-name --with-gnome
 
@@ -236,17 +231,20 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 %files libs
 %{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
+%{_libdir}/girepository-1.0/PanelApplet-5.0.typelib
 
 %files devel
 %{_bindir}/panel-test-applets
-%{_includedir}/gnome-panel-4.0
+%{_includedir}/gnome-panel/
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
 %{_datadir}/gtk-doc
-%{_datadir}/gir-1.0/PanelApplet-4.0.gir
+%{_datadir}/gir-1.0/PanelApplet-5.0.gir
 
 %changelog
+* Wed Feb 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-1
+- Version bump for GNOME Flashback 3.14.
+
 * Sun Jan 11 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.8.1-1
 - Version bump for GNOME Flashback 3.10.
 
diff --git a/sources b/sources
index c382f1a..85f6418 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f394ad73babbce95fd0bb65ec6fd3519  gnome-panel-3.6.2.tar.xz
+dcab3e1c007f16b13d54a8ac7ac236e9  gnome-panel-3.14.0.tar.xz