summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalev Lember <kalevlember@gmail.com>2011-09-07 02:21:14 +0300
committerKalev Lember <kalevlember@gmail.com>2011-09-07 02:21:14 +0300
commitef55ac5eb16e029ba45dc48395b9acf701cc7f75 (patch)
tree42f53d194f05d2049878eaae1b21a5721a2eae04
parent28fc315252cf3949b97c5adbd9ef34d234c59a68 (diff)
downloadgnome-applets-ef55ac5eb16e029ba45dc48395b9acf701cc7f75.tar.gz
gnome-applets-ef55ac5eb16e029ba45dc48395b9acf701cc7f75.tar.xz
gnome-applets-ef55ac5eb16e029ba45dc48395b9acf701cc7f75.zip
Update to 3.1.91
-rw-r--r--.gitignore1
-rw-r--r--0001-Explicitly-link-against-libm.patch58
-rw-r--r--gnome-applets.spec7
-rw-r--r--sources2
4 files changed, 6 insertions, 62 deletions
diff --git a/.gitignore b/.gitignore
index fd61143..6f3963e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ gnome-applets-2.31.6.tar.bz2
/gnome-applets-3.1.4.tar.xz
/gnome-applets-3.1.5.tar.xz
/gnome-applets-3.1.90.tar.xz
+/gnome-applets-3.1.91.tar.xz
diff --git a/0001-Explicitly-link-against-libm.patch b/0001-Explicitly-link-against-libm.patch
deleted file mode 100644
index 6f61419..0000000
--- a/0001-Explicitly-link-against-libm.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d9020e1eb228e780fc0bbc316a6741ed5b6cb3c5 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 1 Sep 2011 00:23:04 +0300
-Subject: [PATCH] Explicitly link against libm
-
-gdk-pixbuf used to include libm in its pkgconfig libs line, but that was
-recently changed.
----
- configure.in | 3 +++
- geyes/Makefile.am | 3 ++-
- multiload/Makefile.am | 3 ++-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 118e34b..a089ac8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -51,6 +51,9 @@ AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
- X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
- AC_SUBST(X_LIBS)
-
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- GNOME_COMPILE_WARNINGS
-
- dnl Check for non-portable headers
-diff --git a/geyes/Makefile.am b/geyes/Makefile.am
-index 935d932..46abd31 100644
---- a/geyes/Makefile.am
-+++ b/geyes/Makefile.am
-@@ -16,7 +16,8 @@ geyes_applet2_SOURCES = \
- geyes.h
-
- geyes_applet2_LDADD = \
-- $(GNOME_APPLETS_LIBS)
-+ $(GNOME_APPLETS_LIBS) \
-+ $(LIBM)
-
- appletdir = $(datadir)/gnome-panel/4.0/applets
- applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
-diff --git a/multiload/Makefile.am b/multiload/Makefile.am
-index a659f07..94da298 100644
---- a/multiload/Makefile.am
-+++ b/multiload/Makefile.am
-@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \
- multiload_applet_2_LDADD = \
- $(GNOME_APPLETS_LIBS) \
- $(GTOP_APPLETS_LIBS) \
-- $(GIO_UNIX_LIBS)
-+ $(GIO_UNIX_LIBS) \
-+ $(LIBM)
-
- schemasdir = @GCONF_SCHEMA_FILE_DIR@
- schemas_in_files = multiload.schemas.in
---
-1.7.6.1
-
diff --git a/gnome-applets.spec b/gnome-applets.spec
index bd4f198..16ded8f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 3.1.90
+Version: 3.1.91
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -41,7 +41,6 @@ Group: User Interface/Desktops
URL: http://www.gnome.org/
# VCS: git:git://git.gnome.org/gnome-applets
Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
-Patch0: 0001-Explicitly-link-against-libm.patch
Patch1: gnome-applets-cpupower.patch
BuildRequires: glib2-devel >= %{glib2_version}
@@ -103,7 +102,6 @@ and more.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
autoreconf -i -f
@@ -257,6 +255,9 @@ fi
%changelog
+* Wed Sep 07 2011 Kalev Lember <kalevlember@gmail.com> - 3.1.91-1
+- Update to 3.1.91
+
* Wed Aug 31 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.90-1
- Update to 3.1.90
diff --git a/sources b/sources
index aa6aef7..53e6f7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39e5564749361c7bfc7056a79bcd8ceb gnome-applets-3.1.90.tar.xz
+6c3f2842a808499e38174f24d957ef72 gnome-applets-3.1.91.tar.xz