rpms/torsmo/devel torsmo.spec,1.7,1.8

[Andreas Bierfert]

Author: awjb

Update of /cvs/pkgs/rpms/torsmo/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24405/devel

Modified Files:
	torsmo.spec 
Log Message:
- spec cleanup
- fix #593956



Index: torsmo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/torsmo/devel/torsmo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- torsmo.spec	27 Jul 2009 06:08:18 -0000	1.7
+++ torsmo.spec	20 May 2010 18:06:38 -0000	1.8
@@ -1,22 +1,22 @@
 Name:           torsmo
 Version:        0.18
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        TyopoytaORvelo System MOnitor
 
 Group:          Applications/System
 License:        BSD
 URL:            http://torsmo.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/torsmo/torsmo-0.18.tar.gz
+Source0:        http://download.sourceforge.net/torsmo/%{name}-%{version}.tar.gz
 Source1:        torsmo.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  xorg-x11-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  desktop-file-utils
-
-# modular X
-BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXrender-devel
 
 %description
 Torsmo (TyopoytaORvelo System MOnitor) is a system monitor that sits in the
@@ -30,6 +30,9 @@ For a sample configuration take a look t
 %setup -q
 
 %build
+CFLAGS="`pkg-config xft --cflags` -DXFT %{optflags}" ; export CFLAGS
+XFT_LIBS=`pkg-config xft --libs` ; export XFT_LIBS
+
 %configure --enable-xft --enable-proc-uptime --enable-seti \
 --x-includes=%{_includedir} --x-libraries=%{_libdir}
 make %{?_smp_mflags}
@@ -42,6 +45,9 @@ desktop-file-install --vendor fedora    
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         %{SOURCE1}
+iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
+iconv -f iso8859-1 -t utf-8 torsmorc.sample > torsmorc.sample.conv && mv -f torsmorc.sample.conv torsmorc.sample
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*desktop
 
 %changelog
+* Thu May 20 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.18-11
+- fix xft build problem (#593956)
+- ship documentation in utf8
+- spec cleanup
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild