rpms/rkward/devel .cvsignore, 1.5, 1.6 rkward.spec, 1.10, 1.11 sources, 1.5, 1.6

[Pierre-YvesChibon (pingou)]

Author: pingou

Update of /cvs/pkgs/rpms/rkward/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17826

Modified Files:
	.cvsignore rkward.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jan 2008 00:23:22 -0000	1.5
+++ .cvsignore	25 Feb 2008 17:55:12 -0000	1.6
@@ -1 +1 @@
-rkward-0.4.9.tar.gz
+rkward-0.5.0a.tar.gz


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/rkward.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rkward.spec	10 Feb 2008 14:14:18 -0000	1.10
+++ rkward.spec	25 Feb 2008 17:55:12 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           rkward
-Version:        0.4.9
-Release:        3%{?dist}
+Version:        0.5.0a
+Release:        1%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
 
@@ -10,11 +10,13 @@
 Source0:        http://downloads.sourceforge.net/rkward/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel R-devel php desktop-file-utils gettext PyQt-devel
-BuildRequires:  kdelibs3-devel
+BuildRequires:  R-devel desktop-file-utils gettext PyQt-devel
+BuildRequires:  kdelibs-devel cmake pcre-devel
 BuildRequires:  qt-devel 
 Requires:       php-cli
 
+%{?kde4_macros_api:Requires: kde4-macros(api) = %{?kde4_macros_api}}
+
 %description
 RKWard aims to provide an easily extensible, easy to use IDE/GUI for the
 R-project. RKWard tries to combine the power of the R-language with the
@@ -29,33 +31,36 @@
 intégration dans les suites bureautiques.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-# set some default enviroments
-unset QTDIR && . /etc/profile.d/qt.sh
-%configure  --with-r-libdir=%{_libdir}/R/library --disable-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}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/R/library
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot} -C %{_target_platform}
+
+desktop-file-install \
+  --vendor="fedora" \
+  --dir=%{buildroot}%{kde4_datadir}/applications/kde4 \
+  %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
+
+#/usr/share/applications/kde4/rkward.desktop
+%find_lang %{name} || touch %{name}.lang
 
 #This file is conflicting with the kdelibs one
-rm -f $RPM_BUILD_ROOT%{_datadir}/apps/katepart/syntax/r.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/kde4/apps/katepart/syntax/r.xml
 # already in R-base package
 rm -f $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 
-desktop-file-install --vendor="fedora"                                 \
-                     --delete-original                                 \
-                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications/    \
-                      $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
-
 
 ## File lists
 # locale's
@@ -93,22 +98,25 @@
 %defattr(-,root,root,-)
 %doc README COPYING TODO AUTHORS
 %{_libdir}/R/library/%{name}/*
-%{_datadir}/apps/%{name}/
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/crystalsvg/16x16/apps/%{name}.png
-%{_datadir}/icons/crystalsvg/22x22/apps/%{name}.png
-%{_datadir}/icons/crystalsvg/32x32/apps/%{name}.png
-%{_datadir}/icons/crystalsvg/48x48/apps/%{name}.png
-%{_datadir}/icons/crystalsvg/64x64/apps/%{name}.png
-%{_datadir}/icons/crystalsvg/128x128/apps/%{name}.png
-%{_datadir}/icons/locolor/16x16/apps/%{name}.png
-%{_datadir}/icons/locolor/32x32/apps/%{name}.png
-%{_datadir}/apps/katepart/syntax/%{name}.xml
+%{_datadir}/kde4/apps/%{name}/
+#%{_datadir}/applications/kde4/fedora-%{name}.desktop
+%{_datadir}/applications/kde4/%{name}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 %{_bindir}/%{name}
 %{_bindir}/%{name}.bin
-
+%{_datadir}/doc/HTML/en/%{name}
+%{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
 
 %changelog
+*Mon Feb 25 2008 Pingou <pingoufc4 at yahoo.fr> 0.5.0a-1
+- Update to 0.5.0a for KDE4
+
 *Sun Feb 10 2008 Pingou <pingoufc4 at yahoo.fr> 0.4.9-3
 - Change the Requires
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jan 2008 00:23:22 -0000	1.5
+++ sources	25 Feb 2008 17:55:12 -0000	1.6
@@ -1 +1 @@
-8c2998aaa3fc9ce74795e85b984e4779  rkward-0.4.9.tar.gz
+ed7f6ef8eedbd2ef0c4833e793acdeb8  rkward-0.5.0a.tar.gz