|
@@ -15,15 +15,16 @@
|
|
%define with_ibm 0
|
|
%define with_ibm 0
|
|
%define with_wlan 0
|
|
%define with_wlan 0
|
|
|
|
|
|
-Name: conky
|
|
+Name: conky
|
|
Version: 1.8.1
|
|
Version: 1.8.1
|
|
-Release: 1%{?_dist_release}
|
|
+Release: 2%{?_dist_release}
|
|
Summary: A lightweight system monitor for X
|
|
Summary: A lightweight system monitor for X
|
|
Summary(ja): X 用軽量システムモニタ
|
|
Summary(ja): X 用軽量システムモニタ
|
|
Group: User Interface/X
|
|
Group: User Interface/X
|
|
License: GPLv3+
|
|
License: GPLv3+
|
|
URL: http://conky.sf.net/
|
|
URL: http://conky.sf.net/
|
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
|
|
|
+Patch0: conky-1.8.1-delete-curl_types.h.patch
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
BuildRequires: glib2-devel
|
|
BuildRequires: glib2-devel
|
|
@@ -61,6 +62,9 @@ BuildRequires: curl-devel
|
|
BuildRequires: wireless-tools-devel
|
|
BuildRequires: wireless-tools-devel
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
+Vendor: Project Vine
|
|
|
|
+Distribution: Vine Linux
|
|
|
|
+
|
|
%description
|
|
%description
|
|
A system monitor for X originally based on the torsmo code. but more kickass.
|
|
A system monitor for X originally based on the torsmo code. but more kickass.
|
|
It just keeps on given'er. Yeah.
|
|
It just keeps on given'er. Yeah.
|
|
@@ -71,6 +75,9 @@ torsmo をベースにした X 用のシステムモニタです。
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
|
+%patch0
|
|
|
|
+%endif
|
|
|
|
|
|
for i in AUTHORS ChangeLog; do
|
|
for i in AUTHORS ChangeLog; do
|
|
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
|
|
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
|
|
@@ -152,6 +159,10 @@ done
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Nov 16 2016 Toshiaki Ara <ara_t@384.jp> 1.10.4-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add Vendor and Distribution
|
|
|
|
+
|
|
* Sun Jun 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.8.1-1
|
|
* Sun Jun 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.8.1-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|