diff options
Diffstat (limited to 'gnome-panel.spec')
| -rw-r--r-- | gnome-panel.spec | 53 |
1 files changed, 22 insertions, 31 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index c2cc784..724d9cb 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -21,11 +21,11 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.30.0 -Release: 2%{?dist} +Version: 2.31.2 +Release: 1%{?dist} URL: http://www.gnome.org #VCS: git:git://git.gnome.org/gnome-panel -Source0: http://download.gnome.org/sources/gnome-panel/2.30/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar.bz2 Source3: redhat-panel-default-setup.entries Source4: gnome-compiler-flags.m4 @@ -102,7 +102,7 @@ Patch10: preferred-apps.patch # don't pop up an error dialog if an applet from the # default configuration is missing; we don't want to # add a hard dependency on e.g. tomboy -Patch11: applet-error.patch +#Patch11: applet-error.patch # http://bugzilla.gnome.org/show_bug.cgi?id=520111 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch @@ -165,39 +165,21 @@ Panel Applets using the libpanel-applet library. %patch8 -p1 -b .launcher-desktop-files %patch9 -p1 -b .desktop-file-monitoring %patch10 -p1 -b .preferred-apps -%patch11 -p1 -b .applet-error +#%patch11 -p1 -b .applet-error %patch24 -p1 -b .allow-spurious-view-done-signals %patch38 -p1 -b .clock-network %patch40 -p1 -b .clock-home %patch41 -p1 -b .bookmarks-submenu %patch43 -p1 -b .panel-padding -%patch45 -p1 -b .icon-padding +#%patch45 -p1 -b .icon-padding %patch47 -p1 -b .fix-clock-crash %patch48 -p1 -b .libs -. %{SOURCE6} - cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries cp -f %{SOURCE4} m4 cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas -libtoolize -f -aclocal -I m4 -automake -autoconf - -# strip unneeded translations from .mo files -# ideally intltool (ha!) would do that for us -# http://bugzilla.gnome.org/show_bug.cgi?id=474987 -cd po -grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]policy[.]in$" POTFILES.in > POTFILES.keep -mv POTFILES.keep POTFILES.in -intltool-update --pot -for p in *.po; do - msgmerge $p %{gettext_package}.pot > $p.out - msgfmt -o `basename $p .po`.gmo $p.out -done - +autoreconf -i -f %build %configure \ @@ -236,8 +218,10 @@ sed -e 's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/ sed -e 's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|; s|<default>1</default>|<default>2</default>|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas ## blow away stuff we don't want -/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper -/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper +rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a +rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-3.*a + desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -245,9 +229,6 @@ desktop-file-install --delete-original \ %find_lang %{gettext_package} --all-name --with-gnome -%clean -rm -rf $RPM_BUILD_ROOT - %post touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : @@ -359,26 +340,36 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || : %{_bindir}/gnome-panel %{_bindir}/gnome-desktop-item-edit %{_libexecdir}/* -%{_libdir}/bonobo/servers/*.server %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/gconf/schemas/*.entries +%{_libdir}/gnome-panel %{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf %{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service %{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy +%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service +%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service +%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service +%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service + %files libs %{_libdir}/*.so.* %files devel %defattr(-, root, root) %{_bindir}/panel-test-applets +%{_bindir}/panel-test-applets-bonobo %{_libdir}/pkgconfig/* +%{_includedir}/gnome-panel-3.0/libpanel-applet %{_includedir}/panel-2.0 %{_libdir}/*.so %{_datadir}/gtk-doc/html/* %changelog +* Fri May 28 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-1 +- Update to 2.31.2 + * Sun May 09 2010 Matthew Barnes <mbarnes@redhat.com> 2.30.0-2 - Rebuild against newer libedataserver and libedataserverui. |