diff --git a/gnome-applets-2.10.1-use-builtin-apm.patch b/gnome-applets-2.10.1-use-builtin-apm.patch new file mode 100644 index 0000000..66408b4 --- /dev/null +++ b/gnome-applets-2.10.1-use-builtin-apm.patch @@ -0,0 +1,15 @@ +--- gnome-applets-2.10.1/configure.in.use-builtin-apm 2005-04-20 09:46:00.000000000 -0400 ++++ gnome-applets-2.10.1/configure.in 2005-04-20 09:46:22.000000000 -0400 +@@ -242,12 +242,10 @@ if test x$disable_battstat = xno; then + case "${host}" in + powerpc-*-linux*) + NEED_LIBAPM=yes +- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) + ;; + # list of supported OS cores that use libapm + *-*-linux*) + NEED_LIBAPM=yes +- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) + ;; + # list of supported OS cores that do not use libapm + *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) diff --git a/gnome-applets.spec b/gnome-applets.spec index 3b20f3f..ad4573d 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -19,7 +19,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.10.1 -Release: 3 +Release: 4 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -27,6 +27,7 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.ta Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2 Patch0: gnome-applets-2.10.1-use-old-modemlights.patch Patch1: gnome-applets-2.10.1-fix-docs-error.patch +Patch2: gnome-applets-2.10.1-use-builtin-apm.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -45,9 +46,6 @@ BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version} BuildRequires: /usr/bin/automake BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libwnck-devel >= %{libwnck_version} -%ifarch %{apmd_archs} -BuildRequires: apmd >= %{apmd_version} -%endif Requires: gnome-panel >= %{gnome_panel_version} Requires: libxklavier >= %{libxklavier_version} @@ -66,16 +64,10 @@ manager for the X Window System. The gnome-applets package provides small utilities for the GNOME panel. %prep -%ifarch %{apmd_archs} -if ! test -e /usr/lib/libapm.a ; then - echo "You must have apmd installed" - exit 1 -fi -%endif - %setup -q %patch0 -p1 -b .use-old-modemlights %patch1 -p1 -b .fix-docs-error +%patch2 -p1 -b .use-builtin-apm cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -161,6 +153,10 @@ fi %{_libdir}/pkgconfig/gswitchit.pc %changelog +* Wed Apr 20 2005 Ray Strode 1:2.10.1-4 +- Use builtin copy of apmlib instead of adding an external dependency + (bug 155125) + * Thu Apr 14 2005 Ray Strode 1:2.10.1-3 - Apply patch from Jan de Groot to silence scrollkeeper noise (bug 152236)