- add nice icon

- rel 2

Changed files:
    R.desktop -> 1.6
    R.spec -> 1.139

diff --git a/R.desktop b/R.desktop
index c551cd65a22c9bafea14a2e3e69406300dfe29b6..2f49e409b0e15a971242ba40f995418c3cc2ec30 100644 (file)
--- a/R.desktop
+++ b/R.desktop
@@ -2,7 +2,7 @@
 Name=R
 Comment=Language for interactive analysis of statistical data
 Comment[pl]=Język do interaktywnej analizy danych statystycznych
-Icon=
+Icon=R
 Exec=R
 Terminal=true
 Type=Application

diff --git a/R.spec b/R.spec
index 328fdcef560a292114f14dee5451bb96ee28972b..6b8006ac164bed3010c758fc830d8f9687488958 100644 (file)
--- a/R.spec
+++ b/R.spec
@@ -14,13 +14,14 @@ Summary:    A language for data analysis and graphics
 Summary(pl.UTF-8):     Język do analizy danych oraz grafiki
 Name:          R
 Version:       2.11.1
-Release:       1
+Release:       2
 License:       Mixed (distributable), mostly GPL
 Group:         Development/Languages
 # CRAN master site: ftp://cran.r-project.org/pub/R/src/
 Source0:       ftp://stat.ethz.ch/R-CRAN/src/base/R-2/%{name}-%{version}.tar.gz
 # Source0-md5: 7421108ade3e9223263394b9bbe277ce
 Source1:       %{name}.desktop
+Source2:       %{name}.xpm
 URL:           http://www.r-project.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -121,13 +122,14 @@ implementacja i semantyka wywodzi się ze Scheme.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/R,%{_includedir},%{_desktopdir},%{_pixmapsdir}}
 install -d $RPM_BUILD_ROOT%{perl_vendorlib}/{R,Text}
 
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 mv $RPM_BUILD_ROOT%{_libdir}/R/lib/libR*.so $RPM_BUILD_ROOT%{_libdir}
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/include $RPM_BUILD_ROOT%{_includedir}/R
@@ -177,7 +179,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/R/doc/html/packages-head*.html
 %{_libdir}/R/doc/html/*.jpg
 %ghost %{_libdir}/R/doc/html/packages.html
-%{_desktopdir}/*.desktop
+%{_desktopdir}/R.desktop
+%{_pixmapsdir}/R.xpm
 
 %{perl_vendorlib}/R