rpms
/
conky
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix building with new audacious (#556317)

This commit is contained in:
Miroslav Lichvar 2010-02-15 13:12:08 +00:00
parent 3f38e69c61
commit ce53b94f68
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
conky-1.7.2-audclient.patch Normal file
View File

@ -0,0 +1,35 @@
diff -up conky-1.7.2/configure.audclient conky-1.7.2/configure
--- conky-1.7.2/configure.audclient 2009-08-25 01:01:58.000000000 +0200
+++ conky-1.7.2/configure 2010-02-15 13:55:10.000000000 +0100
@@ -12030,12 +12030,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_Audacious_CFLAGS="$Audacious_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"audclient >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "audclient >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_Audacious_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
+ pkg_cv_Audacious_CFLAGS=`$PKG_CONFIG --cflags "audclient >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12048,12 +12048,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_Audacious_LIBS="$Audacious_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"audclient >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "audclient >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_Audacious_LIBS=`$PKG_CONFIG --libs "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
+ pkg_cv_Audacious_LIBS=`$PKG_CONFIG --libs "audclient >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
else
pkg_failed=yes
fi

15
conky.spec
View File

@ -1,5 +1,6 @@
%bcond_without alsa
%bcond_without audacious
%bcond_without curl
%bcond_with imlib
%bcond_without lua
%bcond_without lua_cairo
@ -13,24 +14,23 @@
Name: conky
Version: 1.7.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A system monitor for X
Group: User Interface/X
License: GPLv3+
URL: http://conky.sf.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0: conky-1.7.2-audclient.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXft-devel
BuildRequires: libXt-devel
BuildRequires: libXdamage-devel
BuildRequires: libXext-devel
%if %{with audacious}
BuildRequires: audacious-devel
BuildRequires: dbus-glib-devel
%endif
%{?with_alsa:BuildRequires: alsa-lib-devel}
%{?with_audacious:BuildRequires: audacious-devel dbus-glib-devel}
%{?with_curl:BuildRequires: curl-devel}
%{?with_imlib:BuildRequires: imlib2-devel}
%{?with_lua:BuildRequires: lua-devel}
%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel}
@ -45,6 +45,7 @@ It just keeps on given'er. Yeah.
%prep
%setup -q
%patch0 -p1 -b .audclient
for i in AUTHORS; do
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@ -54,6 +55,7 @@ done
%configure \
%{!?with_alsa: --disable-alsa} \
%{?with_audacious: --enable-audacious=yes} \
%{?with_curl: --enable-curl} \
%{?with_imlib: --enable-imlib2} \
%{!?with_lua: --disable-lua} \
%{?with_lua_cairo: --enable-lua-cairo} \
@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Feb 15 2010 Miroslav Lichvar <mlichvar@redhat.com> - 1.7.2-2
- fix building with new audacious (#556317)
* Tue Aug 25 2009 Miroslav Lichvar <mlichvar@redhat.com> - 1.7.2-1
- Update to 1.7.2