rpms/rkward/devel rkward-0.5.3-docbook_dtd.patch, NONE, 1.1 rkward.spec, 1.40, 1.41

[Rex Dieter]

Author: rdieter

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

Modified Files:
	rkward.spec 
Added Files:
	rkward-0.5.3-docbook_dtd.patch 
Log Message:
* Mon Jun 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.3-3
- FTBFS: patch handbook for kde-4.5 (#599758)
- update icon scriptlets
- use %find_lang --with-kde
- %files: use %_kde4_appsdir macro


rkward-0.5.3-docbook_dtd.patch:
 index.docbook                        |    2 +-
 writing_plugins_introduction.docbook |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rkward-0.5.3-docbook_dtd.patch ---
diff -up rkward-0.5.3/doc/rkward/index.docbook.docbook_dtd rkward-0.5.3/doc/rkward/index.docbook
--- rkward-0.5.3/doc/rkward/index.docbook.docbook_dtd	2008-01-21 12:58:24.000000000 -0600
+++ rkward-0.5.3/doc/rkward/index.docbook	2010-06-28 07:44:46.000521291 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY rkward '<application>RKWard</application>'>
   <!ENTITY kapp "&rkward;"><!-- replace rkward here -->
   <!ENTITY % addindex "IGNORE">
diff -up rkward-0.5.3/doc/rkward/writing_plugins_introduction.docbook.docbook_dtd rkward-0.5.3/doc/rkward/writing_plugins_introduction.docbook
--- rkward-0.5.3/doc/rkward/writing_plugins_introduction.docbook.docbook_dtd	2010-03-04 06:08:32.000000000 -0600
+++ rkward-0.5.3/doc/rkward/writing_plugins_introduction.docbook	2010-06-28 07:45:09.256770072 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY rkward '<application>RKWard</application>'>
   <!ENTITY kapp "&rkward;"><!-- replace rkward here -->
   <!ENTITY % addindex "IGNORE">


Index: rkward.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rkward/devel/rkward.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- rkward.spec	28 Jun 2010 07:04:08 -0000	1.40
+++ rkward.spec	28 Jun 2010 14:01:30 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name:           rkward
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical frontend for R language
 Summary(fr):    Interface graphique pour le langage R 
 
@@ -12,6 +12,9 @@ URL:            http://rkward.sourceforg
 Source0:        http://downloads.sourceforge.net/rkward/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50: rkward-0.5.3-docbook_dtd.patch
+
 BuildRequires:  R-devel >= %{Rversion} desktop-file-utils gettext 
 BuildRequires:  kdelibs-devel cmake pcre-devel
 BuildRequires:  giflib-devel  
@@ -39,6 +42,8 @@ intégration dans les suites bureautique
 # Not needed from 0.5.0c
 #sed -i -e "s|#include \"Rdevices.h\"||" rkward/rbackend/rembedinternal.cpp
 
+%patch50 -p1 -b docbook_dtd
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -50,7 +55,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 desktop-file-install \
   --vendor="" \
@@ -58,51 +63,40 @@ desktop-file-install \
   %{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}/kde4/apps/katepart/syntax/r.xml
+rm -f $RPM_BUILD_ROOT%{_kde4_appsdir}/katepart/syntax/r.xml
 # already in R-base package
 rm -f $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 
 
 ## File lists
 # locale's
-%find_lang %{name} || touch %{name}.lang
-# HTML (1.0)
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
-  if [ -d $lang_dir ]; then
-    lang=$(basename $lang_dir)
-    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
-   # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+%find_lang %{name} --with-kde || touch %{name}.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/locolor
-touch --no-create %{_datadir}/icons/crystalsvg
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/locolor
-touch --no-create %{_datadir}/icons/crystalsvg
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING TODO AUTHORS
 %{_libdir}/R/library/%{name}/
-%{_datadir}/kde4/apps/%{name}/
+%{_kde4_appsdir}/%{name}/
 %{_datadir}/applications/kde4/%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/22x22/apps/%{name}.png
@@ -113,10 +107,15 @@ touch --no-create %{_datadir}/icons/crys
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
 %{_bindir}/%{name}
 %{_bindir}/%{name}.bin
-%{_datadir}/doc/HTML/en/%{name}
-%{_datadir}/kde4/apps/katepart/syntax/%{name}.xml
+%{_kde4_appsdir}/katepart/syntax/%{name}.xml
 
 %changelog
+* Mon Jun 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.5.3-3
+- FTBFS: patch handbook for kde-4.5 (#599758)
+- update icon scriptlets
+- use %%find_lang --with-kde
+- %%files: use %%_kde4_appsdir macro
+
 * Mon Jun 28 2010 pingou <pingou at pingoured.fr> - 0.5.3-2
 - Change BR kdelibs4-devel to kdelibs-devel