Hello community, here is the log from the commit of package conky for openSUSE:Factory checked in at 2012-03-06 13:37:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conky (Old) and /work/SRC/openSUSE:Factory/.conky.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conky", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/conky/conky.changes 2011-10-11 18:24:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2012-03-06 13:37:46.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Feb 29 08:55:12 UTC 2012 - [email protected] + +- license update: GPL-3.0+ + See the COPYING file + +------------------------------------------------------------------- +Mon Jan 30 08:47:15 UTC 2012 - [email protected] + +- use lua51 on factory + +------------------------------------------------------------------- +Thu Jan 12 11:30:32 UTC 2012 - [email protected] + +- change license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conky.spec ++++++ --- /var/tmp/diff_new_pack.vRyiGl/_old 2012-03-06 13:37:47.000000000 +0100 +++ /var/tmp/diff_new_pack.vRyiGl/_new 2012-03-06 13:37:47.000000000 +0100 @@ -1,5 +1,21 @@ # vim: set sw=4 ts=4 et: - +# +# spec file for package conky +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# +# %if 0%{?suse_version} >= 1100 %define with_lua_extra 1 %else @@ -10,6 +26,8 @@ Version: 1.8.1 Release: 0 Summary: Lightweight System Monitor +License: GPL-3.0+ +Group: System/Monitoring Source: http://prdownloads.sourceforge.net/conky/conky-%{version}.tar.bz2 Source1: conky.desktop # PATCH-FIX-UPSTREAM - conky-fix-curl-FTBFS.patch - remove deprecated curl/types.h to fix FTBFS in newer versions of curl, http://tinyurl.com/4x76bbx @@ -19,22 +37,27 @@ # PATCH-FIX - add -lm when linking against -liw Patch1: conky-libiw_with_libm.patch Source99: conky-rpmlintrc -URL: http://conky.sourceforge.net -Group: System/Monitoring -License: BSD license (revised) -BuildRoot: %{_tmppath}/build-%{name}-%{version} -BuildRequires: make gcc fontconfig-devel freetype2-devel +Url: http://conky.sourceforge.net +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: gcc +BuildRequires: make BuildRequires: xorg-x11-devel %if 0%{?suse_version} >= 1120 BuildRequires: libiw-devel %else BuildRequires: wireless-tools %endif -BuildRequires: libpng-devel zlib-devel glib2-devel +BuildRequires: glib2-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel BuildRequires: xorg-x11-devel BuildRequires: cairo-devel BuildRequires: update-desktop-files -BuildRequires: autoconf automake libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: docbook2x BuildRequires: alsa-devel %if %with_lua_extra @@ -48,8 +71,12 @@ BuildRequires: ncurses-devel %if 0%{?suse_version} >= 1020 %define with_lua 1 +%if 0%{?suse_version} >= 1220 +BuildRequires: lua51-devel +%else BuildRequires: lua-devel %endif +%endif %if 0%{?suse_version} >= 1020 || 0%{?fedora_version} > 0 %if 0%{?sles_version} < 11 BuildRequires: vim-enhanced @@ -111,8 +138,8 @@ %package vim Summary: Conky Configuration File Support for Vim -Requires: vim-base Group: Productivity/Editors/Vi +Requires: vim-base %description vim Conky is an advanced, highly configurable system monitor for X. @@ -122,8 +149,8 @@ %package nano Summary: Conky Configuration File Support for nano -Requires: nano Group: Productivity/Editors/Other +Requires: nano %description nano Conky is an advanced, highly configurable system monitor for X. @@ -310,3 +337,4 @@ %doc README.feature-nvidia %endif +%changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
