summaryrefslogtreecommitdiffstats
path: root/gnome-panel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-panel.spec')
-rw-r--r--gnome-panel.spec30
1 files changed, 13 insertions, 17 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 380feee..2d74188 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -4,7 +4,7 @@
%define glib2_version 2.31.14
%define gtk3_version 3.3.8
%define libwnck_version 2.91.6
-%define gnome_menus_version 3.1.4
+%define gnome_menus_version 3.7.90
%define evolution_data_server_version 3.5.3
%define cairo_version 1.0.0
%define dbus_version 1.1.2
@@ -16,24 +16,15 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.6.2
-Release: 6%{?dist}
+Version: 3.8.1
+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.6/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-panel/3.8/%{name}-%{version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=685142
-Patch1: gnome-panel-use-gnome-menus.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=890219
-Patch2: drop-gweather-xml-include.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=690353
-Patch3: na-style-realize.patch
-
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
@@ -154,14 +145,12 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .16px
-%patch1 -p1 -b .menus
-%patch2 -p0 -b .gweather
-%patch3 -p1 -b .na-style
rm -f libtool
autoreconf -i -f
%build
%configure \
+ --libexecdir=%{_libexecdir}/%{name} \
--disable-gtk-doc \
%if %{use_evolution_data_server}
--enable-eds=yes
@@ -186,6 +175,10 @@ 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
@@ -223,7 +216,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_datadir}/applications/gnome-panel.desktop
%{_bindir}/gnome-panel
%{_bindir}/gnome-desktop-item-edit
-%{_libexecdir}/*
+%{_libexecdir}/%{name}/
%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
@@ -254,6 +247,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Sun Jan 11 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.8.1-1
+- Version bump for GNOME Flashback 3.10.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild