rpms/scidavis/devel scidavis-manual.patch, 1.2, 1.3 scidavis.spec, 1.36, 1.37 sources, 1.11, 1.12

supercyper supercyper at fedoraproject.org
Sun May 2 08:00:28 UTC 2010 

Author: supercyper

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

Modified Files:
	scidavis-manual.patch scidavis.spec sources 
Log Message:
Update manual

scidavis-manual.patch:
 Makefile                 |    2 ++
 docbook-en/index.docbook |    2 +-
 scidavis.dsl             |    2 +-
 scidavis_html.xsl        |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

Index: scidavis-manual.patch
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/devel/scidavis-manual.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- scidavis-manual.patch	20 Apr 2010 02:05:17 -0000	1.2
+++ scidavis-manual.patch	2 May 2010 08:00:25 -0000	1.3
@@ -1,6 +1,6 @@
-diff -urP manual.org/docbook-en/index.docbook manual/docbook-en/index.docbook
---- manual.org/docbook-en/index.docbook	2010-04-20 09:56:04.783097165 +0800
-+++ manual/docbook-en/index.docbook	2010-04-20 09:58:52.570850354 +0800
+diff -urp manual.org/docbook-en/index.docbook manual/docbook-en/index.docbook
+--- manual.org/docbook-en/index.docbook	2010-05-02 15:21:59.102806908 +0800
++++ manual/docbook-en/index.docbook	2010-05-02 15:22:53.221057241 +0800
 @@ -8,7 +8,7 @@
  
  *************************************************************************
@@ -10,18 +10,18 @@ diff -urP manual.org/docbook-en/index.do
  <!--
  		general terms for the application
  -->
-diff -urP manual.org/Makefile manual/Makefile
---- manual.org/Makefile	2010-04-20 09:56:04.785097420 +0800
-+++ manual/Makefile	2010-04-20 09:57:56.385849131 +0800
-@@ -12,3 +12,5 @@
+diff -urp manual.org/Makefile manual/Makefile
+--- manual.org/Makefile	2010-05-02 15:21:59.104807302 +0800
++++ manual/Makefile	2010-05-02 15:23:22.012056778 +0800
+@@ -12,3 +12,5 @@ html-packages: html-en
  
  pdf-en:
  	dblatex -o ${BASE}.pdf -c dblatex.conf -p dblatex-param.xsl docbook-en/index.docbook
-+install:
 +
-diff -urP manual.org/scidavis.dsl manual/scidavis.dsl
---- manual.org/scidavis.dsl	2010-04-20 09:56:04.785097420 +0800
-+++ manual/scidavis.dsl	2010-04-20 09:58:21.897849011 +0800
++install:
+diff -urp manual.org/scidavis.dsl manual/scidavis.dsl
+--- manual.org/scidavis.dsl	2010-05-02 15:21:59.104807302 +0800
++++ manual/scidavis.dsl	2010-05-02 15:24:31.091806836 +0800
 @@ -6,7 +6,7 @@
  <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
  
@@ -31,13 +31,13 @@ diff -urP manual.org/scidavis.dsl manual
  <!--ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets-1.79/html/docbook.dsl" CDATA DSSSL-->
  
  <!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. -->
-diff -urP manual.org/scidavis_html.xsl manual/scidavis_html.xsl
---- manual.org/scidavis_html.xsl	2010-04-20 09:56:04.785097420 +0800
-+++ manual/scidavis_html.xsl	2010-04-20 09:57:33.010850115 +0800
+diff -urp manual.org/scidavis_html.xsl manual/scidavis_html.xsl
+--- manual.org/scidavis_html.xsl	2010-05-02 15:21:59.103806896 +0800
++++ manual/scidavis_html.xsl	2010-05-02 15:24:03.020808680 +0800
 @@ -1,5 +1,5 @@
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
--<xsl:import href="file:////usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
+-<xsl:import href="/usr/share/xml/docbook/xsl-stylesheets-1.75.2/html/chunk.xsl"/>
 +<xsl:import href="file:////usr/share/sgml/docbook/xsl-stylesheets-1.75.2/html/chunk.xsl"/>
+ <xsl:import href="docbook2adp.xsl"/>
  
- <xsl:output method="html" encoding="UTF-8" indent="yes"/>
- 
+ <xsl:param name="chunker.output.encoding">UTF-8</xsl:param>


Index: scidavis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- scidavis.spec	20 Apr 2010 02:05:17 -0000	1.36
+++ scidavis.spec	2 May 2010 08:00:27 -0000	1.37
@@ -1,11 +1,11 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.2.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-#  svn export -r 1323 https://scidavis.svn.sourceforge.net/svnroot/scidavis/manual/0.2/ manual
+#  svn export -r 1337 https://scidavis.svn.sourceforge.net/svnroot/scidavis/manual/0.2/ manual
 #  tar -cjvf scidavis-manual-0.2_`date --iso`.tar.bz2 manual
-Source1:	%{name}-manual-0.2_2010-04-20.tar.bz2
+Source1:	%{name}-manual-0.2_2010-05-02.tar.bz2
 Patch0:		%{name}-pro.patch
 #fix installation paths of fitPlugins
 Patch1:		%{name}-fitPlugins.patch
@@ -14,7 +14,6 @@ Patch2:		%{name}-manual.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2+
 Group:		Applications/Engineering
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gsl-devel
 BuildRequires:	muParser-devel
 #BuildRequires:	qt4-devel
@@ -32,6 +31,7 @@ BuildRequires:	dblatex
 BuildRequires:	desktop-file-utils
 Requires:	hicolor-icon-theme
 Requires:	kde-filesystem
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 SciDAVis is a user-friendly data analysis and visualization program primarily
@@ -93,12 +93,11 @@ desktop-file-install --vendor "" \
 	--dir %{buildroot}%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 #add mime-type icons
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
-install -cpm 644 %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png \
-	%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-sciprj.png
-install -cpm 644 %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png \
-	%{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-sciprj.png
+for i in %{buildroot}%{_datadir}/icons/hicolor/*/
+do
+	install -m 644 -Dp $i/apps/%{name}.png $i/mimetypes/application-x-sciprj.png || \
+	install -m 644 -Dp $i/apps/%{name}.svg $i/mimetypes/application-x-sciprj.svg
+done
 
 %post
 update-desktop-database &> /dev/null || :
@@ -143,6 +142,9 @@ rm -rf %{buildroot}
 %{_docdir}/%{name}-%{version}/manual
 
 %changelog
+* Sun May 02 2010 Chen Lei <supercyper at 163.com> - 0.2.4-3 
+- Update the scidavis documentation
+
 * Tue Apr 20 2010 Chen Lei <supercyper at 163.com> - 0.2.4-2 
 - Update the scidavis documentation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	20 Apr 2010 02:05:17 -0000	1.11
+++ sources	2 May 2010 08:00:27 -0000	1.12
@@ -1,2 +1,3 @@
 c5650475c5e0b22f9ee5dc49630a0e89  scidavis-0.2.4.tar.bz2
 d80c760b603d0e65ab36293ec0db99b9  scidavis-manual-0.2_2010-04-20.tar.bz2
+162c6c2d13a48f4e2c9fdc7c304c2bc6  scidavis-manual-0.2_2010-05-02.tar.bz2

More information about the scm-commits mailing list