rpms/conky/devel conky-1.8.0-audclient.patch, NONE, 1.1 conky-1.8.0-truefalse.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 conky.spec, 1.19, 1.20 sources, 1.11, 1.12 conky-1.7.2-audclient.patch, 1.1, NONE
Miroslav Lichvar
mlichvar at fedoraproject.org
Thu Apr 1 16:36:37 UTC 2010
Author: mlichvar
Update of /cvs/pkgs/rpms/conky/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15763
Modified Files:
.cvsignore conky.spec sources
Added Files:
conky-1.8.0-audclient.patch conky-1.8.0-truefalse.patch
Removed Files:
conky-1.7.2-audclient.patch
Log Message:
- update to 1.8.0
conky-1.8.0-audclient.patch:
configure | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE conky-1.8.0-audclient.patch ---
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:${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:${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:${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
@@ -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:${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:${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:${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
pkg_failed=yes
fi
conky-1.8.0-truefalse.patch:
conky.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE conky-1.8.0-truefalse.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 25 Aug 2009 14:28:32 -0000 1.11
+++ .cvsignore 1 Apr 2010 16:36:36 -0000 1.12
@@ -1 +1 @@
-conky-1.7.2.tar.bz2
+conky-1.8.0.tar.bz2
Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/conky.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- conky.spec 15 Feb 2010 13:12:08 -0000 1.19
+++ conky.spec 1 Apr 2010 16:36:37 -0000 1.20
@@ -7,21 +7,23 @@
%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
-Release: 2%{?dist}
+Version: 1.8.0
+Release: 1%{?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
+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 at redhat.com> - 1.8.0-1
+- update to 1.8.0
+
* Mon Feb 15 2010 Miroslav Lichvar <mlichvar at redhat.com> - 1.7.2-2
- fix building with new audacious (#556317)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conky/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 25 Aug 2009 14:28:32 -0000 1.11
+++ sources 1 Apr 2010 16:36:37 -0000 1.12
@@ -1 +1 @@
-cf6f5d45d42ad68c618c00271813b80d conky-1.7.2.tar.bz2
+494cbaf1108cfdb977fc80454d9b13e2 conky-1.8.0.tar.bz2
--- conky-1.7.2-audclient.patch DELETED ---
More information about the scm-commits
mailing list