rpms/libsvm/F-8 LibSVM-svm-toy-48.png, NONE, 1.1 libsvm-svm-toy-gtk.desktop, NONE, 1.1 libsvm-svm-toy-qt.desktop, NONE, 1.1 libsvm.spec, 1.13, 1.14

[Ding-Yi Chen (dchen)]

Author: dchen

Update of /cvs/pkgs/rpms/libsvm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10468/F-8

Modified Files:
	libsvm.spec 
Added Files:
	LibSVM-svm-toy-48.png libsvm-svm-toy-gtk.desktop 
	libsvm-svm-toy-qt.desktop 
Log Message:
Fix [Bug 436392]


--- NEW FILE libsvm-svm-toy-gtk.desktop ---
[Desktop Entry]
Name=svm-toy-gtk
GenericName=svm-toy GTK version
Comment=GTK version of svm-toy (libsvm demostration program)
Exec=svm-toy-gtk
Icon=libsvm-svm-toy-gtk-48
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;Education;Science;Math;DataVisualization


--- NEW FILE libsvm-svm-toy-qt.desktop ---
[Desktop Entry]
Name=svm-toy-qt
GenericName=svm-toy QT version
Comment=QT version of svm-toy (libsvm demostration program)
Exec=svm-toy-qt
Icon=libsvm-svm-toy-qt-48
StartupNotify=true
Terminal=false
Type=Application
Categories=QT;Education;Science;Math;DataVisualization


Index: libsvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsvm/F-8/libsvm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libsvm.spec	7 Feb 2008 05:14:23 -0000	1.13
+++ libsvm.spec	10 Mar 2008 07:49:46 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.85
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,6 +10,9 @@
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
 Source2:        http://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
+Source3:        libsvm-svm-toy-gtk.desktop
+Source4:        libsvm-svm-toy-qt.desktop
+Source5:        LibSVM-svm-toy-48.png
 Patch0:         %{name}-%{version}.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -42,9 +45,10 @@
 %package python
 Summary:    Python tools and interfaces for libsvm
 Group:      Development/Libraries
-BuildRequires:  python-devel >= 2.4 gawk gnuplot
+BuildRequires:  python-devel >= 2.4 gawk
 #gnuplot is required by easy.py
 Requires:       %{name} = %{version}-%{release}
+Requires:       gnuplot
 
 %description python
 Python tools and interfaces for libsvm.
@@ -69,6 +73,7 @@
 Group:      Development/Libraries
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk2
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-gtk
@@ -80,6 +85,7 @@
 Group:      Development/Libraries
 BuildRequires:  qt-devel
 BuildRequires:  qt
+BuildRequires:  desktop-file-utils
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-qt
@@ -89,8 +95,13 @@
 %prep
 %setup -q 
 %patch0 -p0 -b .bak 
-cp ../../SOURCES/log ChangeLog
-cp ../../SOURCES/guide.pdf .
+cp %{SOURCE1} ChangeLog
+cp %{SOURCE2} .
+cp %{SOURCE3} .
+cp %{SOURCE4} .
+cp %{SOURCE5} libsvm-svm-toy-gtk-48.png
+cp %{SOURCE5} libsvm-svm-toy-qt-48.png
+
 
 
 %build
@@ -109,12 +120,35 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}"
 #cd ${RPM_BUILD_ROOT}%{libdir_libsvm}; ln -sf %{name}.so.%{version} %{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+cp libsvm-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+
+desktop-file-install --delete-original --vendor=fedora \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-gtk.desktop \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/libsvm-svm-toy-qt.desktop \
+
 
 
 %post -p /sbin/ldconfig
 
+%post svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %postun -p /sbin/ldconfig
 
+%postun svm-toy-gtk
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,14 +186,23 @@
 %defattr(-,root,root,-)
 %doc svm-toy/gtk/README
 %{_bindir}/svm-toy-gtk
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-gtk-48.png
 
 %files svm-toy-qt
 %defattr(-,root,root,-)
 %doc svm-toy/qt/README
 %{_bindir}/svm-toy-qt
+%{_datadir}/icons/hicolor/48x48/apps/libsvm-svm-toy-qt-48.png
 
 
 %changelog
+* Tue Feb 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-5
+- [Bug 436392]: Fix by copy from right place.
+-  Add desktop files and icons for svm-toy-gtk and svm-toy-qt
+
+* Tue Feb 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-4
+- Move gnuplot from BuildRequires to Requires
+
 * Thu Feb 07 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-3
 - Fix linker name (libsvm.so)
 - Linked to dynamic libraries