|
@@ -1,9 +1,12 @@
|
|
-# TODO: make libXNVCtrl-devel
|
|
|
|
|
|
+# TODO: - make libXNVCtrl-devel
|
|
|
|
+# - with --enable-lua-imlib2
|
|
|
|
|
|
%define with_alsa 0
|
|
%define with_alsa 0
|
|
%define with_audacious 0
|
|
%define with_audacious 0
|
|
%define with_imlib 1
|
|
%define with_imlib 1
|
|
-%define with_lua 0
|
|
|
|
|
|
+%define with_lua 1
|
|
|
|
+%define with_lua_cairo 1
|
|
|
|
+%define with_lua_imlib 1
|
|
%define with_moc 1
|
|
%define with_moc 1
|
|
%define with_mpd 0
|
|
%define with_mpd 0
|
|
%define with_nvidia 0
|
|
%define with_nvidia 0
|
|
@@ -13,7 +16,7 @@
|
|
%define with_wlan 0
|
|
%define with_wlan 0
|
|
|
|
|
|
Name: conky
|
|
Name: conky
|
|
-Version: 1.7.1.1
|
|
|
|
|
|
+Version: 1.8.1
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
Summary: A lightweight system monitor for X
|
|
Summary: A lightweight system monitor for X
|
|
Summary(ja): X 用軽量システムモニタ
|
|
Summary(ja): X 用軽量システムモニタ
|
|
@@ -21,9 +24,10 @@ 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.7.1.1-nonxft.patch
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
|
|
+BuildRequires: glib2-devel
|
|
|
|
+BuildRequires: libxml2-devel
|
|
BuildRequires: libXft-devel
|
|
BuildRequires: libXft-devel
|
|
BuildRequires: libXt-devel
|
|
BuildRequires: libXt-devel
|
|
BuildRequires: libXdamage-devel
|
|
BuildRequires: libXdamage-devel
|
|
@@ -37,6 +41,12 @@ BuildRequires: imlib2-devel
|
|
%if %{with_lua}
|
|
%if %{with_lua}
|
|
BuildRequires: lua-devel
|
|
BuildRequires: lua-devel
|
|
%endif
|
|
%endif
|
|
|
|
+%if %{with_lua_cairo}
|
|
|
|
+BuildRequires: cairo-devel tolua++-devel
|
|
|
|
+%endif
|
|
|
|
+%if %{with_lua_imlib}
|
|
|
|
+BuildRequires: imlib2-devel tolua++-devel
|
|
|
|
+%endif
|
|
%if %{with_audacious}
|
|
%if %{with_audacious}
|
|
BuildRequires: audacious-devel
|
|
BuildRequires: audacious-devel
|
|
BuildRequires: dbus-glib-devel
|
|
BuildRequires: dbus-glib-devel
|
|
@@ -61,7 +71,6 @@ torsmo をベースにした X 用のシステムモニタです。
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-%patch0 -p1 -b .nonxft
|
|
|
|
|
|
|
|
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}{_,}
|
|
@@ -73,6 +82,7 @@ done
|
|
--disable-rpath \
|
|
--disable-rpath \
|
|
%if !%{with_alsa}
|
|
%if !%{with_alsa}
|
|
--disable-alsa \
|
|
--disable-alsa \
|
|
|
|
+ %endif
|
|
%if %{with_audacious}
|
|
%if %{with_audacious}
|
|
--enable-audacious=yes \
|
|
--enable-audacious=yes \
|
|
%endif
|
|
%endif
|
|
@@ -82,6 +92,12 @@ done
|
|
%if !%{with_lua}
|
|
%if !%{with_lua}
|
|
--disable-lua \
|
|
--disable-lua \
|
|
%endif
|
|
%endif
|
|
|
|
+ %if %{with_lua_cairo}
|
|
|
|
+ --enable-lua-cairo \
|
|
|
|
+ %endif
|
|
|
|
+ %if %{with_lua_imlib}
|
|
|
|
+ --enable-lua-imlib2 \
|
|
|
|
+ %endif
|
|
%if !%{with_moc}
|
|
%if !%{with_moc}
|
|
--disable-moc \
|
|
--disable-moc \
|
|
%endif
|
|
%endif
|
|
@@ -105,6 +121,10 @@ done
|
|
%endif
|
|
%endif
|
|
;
|
|
;
|
|
|
|
|
|
|
|
+# don't use rpath
|
|
|
|
+%__sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
|
|
+%__sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
|
|
+
|
|
%__make %{?_smp_mflags}
|
|
%__make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
|
@@ -112,6 +132,9 @@ done
|
|
%__rm -rf $RPM_BUILD_ROOT
|
|
%__rm -rf $RPM_BUILD_ROOT
|
|
%__make install DESTDIR=$RPM_BUILD_ROOT
|
|
%__make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
+%__rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conky/conky_no_x11.conf
|
|
|
|
+%__rm -f $RPM_BUILD_ROOT%{_libdir}/conky/*.{la,a}
|
|
|
|
+
|
|
%clean
|
|
%clean
|
|
%__rm -rf $RPM_BUILD_ROOT
|
|
%__rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
@@ -122,10 +145,27 @@ done
|
|
%dir %{_sysconfdir}/%{name}
|
|
%dir %{_sysconfdir}/%{name}
|
|
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
|
|
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
|
|
%{_bindir}/%{name}
|
|
%{_bindir}/%{name}
|
|
|
|
+%if %{with_lua_cairo} || %{with_lua_imlib}
|
|
|
|
+%{_libdir}/conky
|
|
|
|
+%endif
|
|
%{_mandir}/man1/*
|
|
%{_mandir}/man1/*
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Jun 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.8.1-1
|
|
|
|
+- new upstream release
|
|
|
|
+
|
|
|
|
+* Sat Mar 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.7.2-1
|
|
|
|
+- new upstream release
|
|
|
|
+- enable lua, lua-cairo
|
|
|
|
+- added BuildRequires: glib2-devel
|
|
|
|
+
|
|
|
|
+* 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
|
|
|
|
+
|
|
* Thu Jul 30 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.7.1.1-1
|
|
* Thu Jul 30 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.7.1.1-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|