Author: tpg
Date: Thu Feb 15 21:59:19 2007
New Revision: 121530
Added:
packages/cooker/rkward/current/SOURCES/rkward-0.4.6.tar.bz2 (contents,
props changed)
packages/cooker/rkward/current/SOURCES/rkward-desktop.patch
Removed:
packages/cooker/rkward/current/SOURCES/rkward-0.4.5.tar.bz2
Modified:
packages/cooker/rkward/current/SPECS/rkward.spec
Log:
- new version
- fix menu entry and icons
Added: packages/cooker/rkward/current/SOURCES/rkward-0.4.6.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/rkward/current/SOURCES/rkward-desktop.patch
==============================================================================
--- (empty file)
+++ packages/cooker/rkward/current/SOURCES/rkward-desktop.patch Thu Feb 15
21:59:19 2007
@@ -0,0 +1,9 @@
+--- rkward/rkward.desktop 2007-02-08 20:56:16.000000000 +0000
++++ rkward.desktop.tpg 2007-02-15 20:57:32.000000000 +0000
+@@ -10,5 +10,5 @@
+ Terminal=false
+ Type=Application
+ DocPath=rkward/index.html
+-Categories=Education;Science;Math;
++Categories=X-MandrivaLinux-MoreApplications-Sciences-Mathematics;Education;Science;Math;
+ # vi: encoding=utf-8
Modified: packages/cooker/rkward/current/SPECS/rkward.spec
==============================================================================
--- packages/cooker/rkward/current/SPECS/rkward.spec (original)
+++ packages/cooker/rkward/current/SPECS/rkward.spec Thu Feb 15 21:59:19 2007
@@ -1,15 +1,12 @@
-%define name rkward
-%define version 0.4.5
-%define release %mkrel 1
-
-Summary: A KDE GUI to R
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Source0:
http://downloads.sourceforge.net/rkward/%{name}-%{version}.tar.bz2
+Summary: A KDE gui to R
+Name: rkward
+Version: 0.4.6
+Release: %mkrel 1
License: GPL
Group: Sciences/Mathematics
Url: http://rkward.sourceforge.net/
+Source0:
http://downloads.sourceforge.net/rkward/%{name}-%{version}.tar.bz2
+Patch0: %{name}-desktop.patch
Buildrequires: R-base
BuildRequires: kdelibs-devel
BuildRequires: ImageMagick
@@ -29,17 +26,17 @@
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p0
%build
%configure --with-extra-includes=%{_libdir}/R/include/
--with-extra-libs=%{_libdir}/R/lib/ --disable-rpath
--with-qt-libraries=$QTDIR/%{_lib}
%make
%install
-rm -rf %{buildroot}
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
%makeinstall
-mkdir -p %{buildroot}/%{_menudir}
-kdedesktop2mdkmenu.pl %{name} "More Applications/Sciences/Mathematics"
%{buildroot}/%{_datadir}/applnk/Applications/rkward.desktop
%{buildroot}/%{_menudir}/%{name}
-%find_lang %{name}
+
# already provided by kdelibs-common
rm -f %{buildroot}/%{_datadir}/apps/katepart/syntax/r.xml
@@ -47,35 +44,40 @@
# perl -pi -e "s,/usr/lib,%{_libdir}," %{buildroot}/%{_bindir}/%{name}
# install rkward R package
-cd rkward/rbackend/rpackages/
+pushd rkward/rbackend/rpackages/
R CMD INSTALL -l %{buildroot}/%{_libdir}/R/library rkward
+popd
# already in R-base package
rm -f %{buildroot}/%{_libdir}/R/library/R.css
-cd -
+mkdir -p %{buildroot}%{_datadir}/applications
+mv -f %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop
%{buildroot}%{_datadir}/applications
+
+%find_lang %{name}
-mkdir -p %{buildroot}/{%{_iconsdir},%{_liconsdir},%{_miconsdir}}
-convert -resize 32x32
%{buildroot}/%{_datadir}/icons/crystalsvg/128x128/apps/rkward.png
%{buildroot}/%{_iconsdir}/%{name}.png
-convert -resize 48x48
%{buildroot}/%{_datadir}/icons/crystalsvg/128x128/apps/rkward.png
%{buildroot}/%{_liconsdir}/%{name}.png
-convert -resize 16x16
%{buildroot}/%{_datadir}/icons/crystalsvg/128x128/apps/rkward.png
%{buildroot}/%{_miconsdir}/%{name}.png
%post
%{update_menus}
+%if %mdkversion >= 200700
+%{update_desktop_database}
+%update_icon_cache crystalsvg
+%endif
%postun
%{clean_menus}
+%if %mdkversion >= 200700
+%{clean_desktop_database}
+%clean_icon_cache crystalsvg
+%endif
%clean
-rm -rf %{buildroot}
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
%files -f %{name}.lang
-%defattr(-,root,root)
-%{_libdir}/R/library/rkward
-%{_datadir}/apps/rkward
+%defattr(644,root,root,755)
+%doc %{_datadir}/doc/HTML/en/%{name}/*
+%attr(755,root,root) %{_bindir}/*
+%{_libdir}/R/library/rkward/*
+%{_datadir}/apps/rkward/*
%{_datadir}/apps/katepart/syntax/rkward.xml
-%{_datadir}/applnk/Applications/rkward.desktop
-%{_datadir}/doc/HTML/en/rkward
-%{_datadir}/icons/*/*/apps/%{name}.png
-%{_bindir}/*
-%{_menudir}/%{name}
-%{_miconsdir}/%{name}.png
-%{_iconsdir}/%{name}.png
-%{_liconsdir}/%{name}.png
+%{_datadir}/applications/rkward.desktop
+%{_iconsdir}/crystalsvg/*/apps/%{name}.png
+%{_iconsdir}/locolor/*/apps/%{name}.png
