- update to 1.8.0
This commit is contained in:
Miroslav Lichvar
parent
1e12bb1e5c
commit
b63008c6d6
|
|
@ -1 +1 @@
|
|||
conky-1.7.2.tar.bz2
|
||||
conky-1.8.0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,33 +1,33 @@
|
|||
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
|
||||
diff -up conky-1.8.0/configure.audclient conky-1.8.0/configure
|
||||
--- conky-1.8.0/configure.audclient 2010-03-30 19:50:43.000000000 +0200
|
||||
+++ conky-1.8.0/configure 2010-04-01 17:29:13.000000000 +0200
|
||||
@@ -11233,12 +11233,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
|
||||
- { { $as_echo "$as_me:${as_lineno-$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
|
||||
+ { { $as_echo "$as_me:${as_lineno-$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
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; 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
|
||||
@@ -11251,12 +11251,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
|
||||
- { { $as_echo "$as_me:${as_lineno-$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
|
||||
+ { { $as_echo "$as_me:${as_lineno-$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
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; 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
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
diff -up conky-1.8.0/src/conky.c.truefalse conky-1.8.0/src/conky.c
|
||||
--- conky-1.8.0/src/conky.c.truefalse 2010-03-25 21:27:32.000000000 +0100
|
||||
+++ conky-1.8.0/src/conky.c 2010-04-01 18:00:48.000000000 +0200
|
||||
@@ -4518,13 +4518,13 @@ void setalignment(int* ltext_alignment,
|
||||
int a = string_to_alignment(value);
|
||||
|
||||
if (a <= 0) {
|
||||
- if(setbyconffile == true) {
|
||||
+ if(setbyconffile == TRUE) {
|
||||
CONF_ERR;
|
||||
} else NORM_ERR("'%s' is not a alignment setting", value);
|
||||
} else {
|
||||
*ltext_alignment = a;
|
||||
}
|
||||
- } else if(setbyconffile == true) {
|
||||
+ } else if(setbyconffile == TRUE) {
|
||||
CONF_ERR;
|
||||
}
|
||||
}
|
||||
@@ -4573,7 +4573,7 @@ char load_config_file(const char *f)
|
||||
}
|
||||
}
|
||||
CONF("alignment") {
|
||||
- setalignment(&text_alignment, window.type, value, f, line, true);
|
||||
+ setalignment(&text_alignment, window.type, value, f, line, TRUE);
|
||||
}
|
||||
CONF("background") {
|
||||
fork_to_background = string_to_bool(value);
|
||||
@@ -5696,7 +5696,7 @@ void initialisation(int argc, char **arg
|
||||
set_first_font(optarg);
|
||||
break;
|
||||
case 'a':
|
||||
- setalignment(&text_alignment, window.type, optarg, NULL, 0, false);
|
||||
+ setalignment(&text_alignment, window.type, optarg, NULL, 0, FALSE);
|
||||
break;
|
||||
|
||||
#ifdef OWN_WINDOW
|
||||
12
conky.spec
12
conky.spec
|
|
@ -7,13 +7,14 @@
|
|||
%bcond_with lua_imlib
|
||||
%bcond_with moc
|
||||
%bcond_without mpd
|
||||
%bcond_with ncurses
|
||||
%bcond_with nvidia
|
||||
%bcond_without rss
|
||||
%bcond_without ibm
|
||||
%bcond_without wlan
|
||||
|
||||
Name: conky
|
||||
Version: 1.7.2
|
||||
Version: 1.8.0
|
||||
Release: 2%{?dist}
|
||||
Summary: A system monitor for X
|
||||
|
||||
|
|
@ -21,7 +22,8 @@ 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
|
||||
Patch0: conky-1.8.0-audclient.patch
|
||||
Patch1: conky-1.8.0-truefalse.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: libXft-devel
|
||||
|
|
@ -36,6 +38,7 @@ BuildRequires: libXext-devel
|
|||
%{?with_lua_cairo:BuildRequires: cairo-devel tolua++-devel}
|
||||
%{?with_lua_imlib:BuildRequires: imlib2-devel tolua++-devel}
|
||||
%{?with_nvidia:BuildRequires: libXNVCtrl-devel}
|
||||
%{?with_ncurses:BuildRequires: ncurses-devel}
|
||||
%{?with_rss:BuildRequires: curl-devel libxml2-devel}
|
||||
%{?with_wlan:BuildRequires: wireless-tools-devel}
|
||||
|
||||
|
|
@ -46,6 +49,7 @@ It just keeps on given'er. Yeah.
|
|||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .audclient
|
||||
%patch1 -p1 -b .truefalse
|
||||
|
||||
for i in AUTHORS; do
|
||||
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
|
||||
|
|
@ -63,6 +67,7 @@ done
|
|||
%{!?with_moc: --disable-moc} \
|
||||
%{!?with_mpd: --disable-mpd} \
|
||||
%{?with_nvidia: --enable-nvidia} \
|
||||
%{!?with_ncurses: --disable-ncurses} \
|
||||
%{?with_rss: --enable-rss} \
|
||||
%{?with_ibm: --enable-ibm} \
|
||||
%{?with_wlan: --enable-wlan} \
|
||||
|
|
@ -95,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 01 2010 Miroslav Lichvar <mlichvar@redhat.com> - 1.8.0-2
|
||||
- update to 1.8.0
|
||||
|
||||
* Mon Feb 15 2010 Miroslav Lichvar <mlichvar@redhat.com> - 1.7.2-2
|
||||
- fix building with new audacious (#556317)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue