From 2ac4f22f339867fe4285a5289fa15f256db04066 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mar 12 2010 03:54:56 +0000 Subject: 2.29.92.1 --- diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch index 1ef5f7f..b3b57ad 100644 --- a/gnome-panel-libs.patch +++ b/gnome-panel-libs.patch @@ -1,7 +1,42 @@ -diff -up gnome-panel-2.29.6/configure.in.libs gnome-panel-2.29.6/configure.in ---- gnome-panel-2.29.6/configure.in.libs 2010-02-11 23:09:20.086009297 -0500 -+++ gnome-panel-2.29.6/configure.in 2010-02-11 23:35:24.292035257 -0500 -@@ -251,14 +251,18 @@ PKG_CHECK_MODULES(X, x11 xau, :, [ +diff -up gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs gnome-panel-2.29.92.1/applets/clock/Makefile.am +--- gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs 2010-03-11 22:23:51.692914036 -0500 ++++ gnome-panel-2.29.92.1/applets/clock/Makefile.am 2010-03-11 22:38:20.988697805 -0500 +@@ -65,8 +65,9 @@ CLOCK_LDADD = \ + ../../libpanel-applet/libpanel-applet-2.la \ + $(CLOCK_LIBS) \ + $(LIBPANEL_APPLET_LIBS) \ +- $(POLKIT_LIBS) \ +- -lgweather ++ $(POLKIT_LIBS) \ ++ -lgweather \ ++ -lm + + BUILT_SOURCES = \ + clock-marshallers.c \ +@@ -134,7 +135,8 @@ gnome_clock_applet_mechanism_INCLUDES = + + gnome_clock_applet_mechanism_LDADD = \ + $(CLOCK_MECHANISM_LIBS) \ +- $(POLKIT_LIBS) ++ $(POLKIT_LIBS) \ ++ -lm + + if CLOCK_INPROCESS + APPLET_TYPE = shlib +diff -up gnome-panel-2.29.92.1/configure.in.libs gnome-panel-2.29.92.1/configure.in +--- gnome-panel-2.29.92.1/configure.in.libs 2010-03-11 21:31:25.628657996 -0500 ++++ gnome-panel-2.29.92.1/configure.in 2010-03-11 22:11:11.098665958 -0500 +@@ -72,6 +72,9 @@ dnl pkg-config dependency checks + PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0) + + PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk) ++ ++PANEL_LIBS="$PANEL_LIBS -lm" ++ + AC_SUBST(PANEL_CFLAGS) + AC_SUBST(PANEL_LIBS) + +@@ -256,16 +259,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [ X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS" ]) @@ -9,16 +44,22 @@ diff -up gnome-panel-2.29.6/configure.in.libs gnome-panel-2.29.6/configure.in - dnl X RANDR extension - if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then - AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) -+ PKG_CHECK_MODULES(RANDR, xrandr) -+ X_LIBS="$X_LIBS $RANDR_LIBS" - fi - -+AC_SUBST(X_LIBS) -+ -+LIBS="$LIBS -lm" +-if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then +- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) +- have_randr=yes +-else +- have_randr=no +-fi ++PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [ ++ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) ++ have_randr=yes ++ X_LIBS="$X_LIBS $XRANDR_LIBS" ++], [ ++ have_randr=no ++]) + ++AC_SUBST(X_LIBS) + dnl IDL directories - ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`" +diff -up gnome-panel-2.29.92.1/gnome-panel/Makefile.am.libs gnome-panel-2.29.92.1/gnome-panel/Makefile.am diff --git a/gnome-panel.spec b/gnome-panel.spec index 8b7a643..664464a 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -21,9 +21,10 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.29.92 +Version: 2.29.92.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/2.29/%{name}-%{version}.tar.bz2 Source3: redhat-panel-default-setup.entries @@ -43,11 +44,9 @@ Requires: gnome-session-xsession Requires: %{name}-libs = %{version}-%{release} Requires(post): GConf2 >= %{gconf_version} -Requires(post): scrollkeeper Requires(post): hicolor-icon-theme Requires(pre): GConf2 >= %{gconf_version} Requires(preun): GConf2 >= %{gconf_version} -Requires(postun): scrollkeeper BuildRequires: libxml2-python BuildRequires: intltool @@ -74,6 +73,7 @@ BuildRequires: gtk-doc BuildRequires: pango-devel BuildRequires: libbonobo-devel BuildRequires: libXau-devel +BuildRequires: libXrandr-devel %if %{use_evolution_data_server} BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version} BuildRequires: ORBit2-devel >= %{orbit_version} @@ -224,8 +224,6 @@ awk '/^========/ { seen+=1 } %install -rm -rf $RPM_BUILD_ROOT - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=$RPM_BUILD_ROOT install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL @@ -251,10 +249,7 @@ desktop-file-install --delete-original \ rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi +touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -336,11 +331,14 @@ fi %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor +if [ $1 -eq 0 ]; then + touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : + gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || : fi +%posttrans +gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || : + %files -f %{gettext_package}.lang %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README @@ -381,8 +379,8 @@ fi %{_datadir}/gtk-doc/html/* %changelog -* Tue Mar 09 2010 Bastien Nocera 2.29.92-1 -- Update to 2.29.92 +* Thu Mar 11 2010 Matthias Clasen 2.29.92.1-1 +- Update to 2.29.92.1 * Mon Feb 22 2010 Matthias Clasen 2.29.91-1 - Update to 2.29.91 diff --git a/sources b/sources index 02c0f53..e16960d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c201e06265dbc95024ed8dc84d6eba0 gnome-panel-2.29.92.tar.bz2 +8da6241b6850e702c739e338f78b39f9 gnome-panel-2.29.92.1.tar.bz2