rpms/scidavis/F-11 scidavis-manual.patch, 1.1, 1.2 scidavis.spec, 1.30, 1.31 sources, 1.8, 1.9
supercyper
supercyper at fedoraproject.org
Tue Apr 20 02:23:51 UTC 2010
Author: supercyper
Update of /cvs/pkgs/rpms/scidavis/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19748
Modified Files:
scidavis-manual.patch scidavis.spec sources
Log Message:
Sync with devel
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/F-11/scidavis-manual.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scidavis-manual.patch 14 Mar 2010 06:28:44 -0000 1.1
+++ scidavis-manual.patch 20 Apr 2010 02:23:50 -0000 1.2
@@ -1,27 +1,27 @@
-diff -Naur manual/docbook-en/index.docbook manual/docbook-en/index.docbook
---- manual/docbook-en/index.docbook 2009-10-05 04:36:15.000000000 +0800
-+++ manual/docbook-en/index.docbook 2010-03-13 20:33:02.842689502 +0800
+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
@@ -8,7 +8,7 @@
*************************************************************************
-->
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd" [
-+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/share/sgml/docbook/xml-dtd-4.3-VER-REL/docbookx.dtd" [
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/share/xml/docbook/xml-dtd-4.5/docbookx.dtd" [
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/share/sgml/docbook/xml-dtd-4.5-VER-REL/docbookx.dtd" [
<!--
general terms for the application
-->
-diff -Naur manual/Makefile manual/Makefile
---- manual/Makefile 2008-08-30 00:22:33.000000000 +0800
-+++ manual/Makefile 2010-03-13 20:36:38.649942308 +0800
-@@ -13,3 +13,5 @@
+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 @@
pdf-en:
dblatex -o ${BASE}.pdf -c dblatex.conf -p dblatex-param.xsl docbook-en/index.docbook
+install:
+
-diff -Naur manual/scidavis.dsl manual/scidavis.dsl
---- manual/scidavis.dsl 2008-08-30 00:22:33.000000000 +0800
-+++ manual/scidavis.dsl 2010-03-13 20:35:49.601687959 +0800
+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
@@ -6,7 +6,7 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
@@ -31,9 +31,9 @@ diff -Naur manual/scidavis.dsl manual/sc
<!--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 -Naur manual/scidavis_html.xsl manual/scidavis_html.xsl
---- manual/scidavis_html.xsl 2009-10-05 04:36:15.000000000 +0800
-+++ manual/scidavis_html.xsl 2010-03-13 20:34:17.522689162 +0800
+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
@@ -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"/>
Index: scidavis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/F-11/scidavis.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- scidavis.spec 14 Mar 2010 06:58:42 -0000 1.30
+++ scidavis.spec 20 Apr 2010 02:23:50 -0000 1.31
@@ -1,11 +1,11 @@
Summary: Scientific Data Analysis and Visualization
Name: scidavis
Version: 0.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# svn export -r 1293 https://scidavis.svn.sourceforge.net/svnroot/manual/0.2/ manual
+# svn export -r 1323 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-03-13.tar.bz2
+Source1: %{name}-manual-0.2_2010-04-20.tar.bz2
Patch0: %{name}-pro.patch
#fix installation paths of fitPlugins
Patch1: %{name}-fitPlugins.patch
@@ -17,12 +17,12 @@ Group: Applications/Engineering
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gsl-devel
BuildRequires: muParser-devel
-BuildRequires: qt4-devel
-#BuildRequires: qt-assistant-adp-devel
+#BuildRequires: qt4-devel
+BuildRequires: qt-assistant-adp-devel
BuildRequires: qwt-devel
BuildRequires: qwtplot3d-qt4-devel
-#python-devel comes with sip-devel
-#BuildRequires: python-devel
+#python2-devel comes with sip-devel
+#BuildRequires: python2-devel
BuildRequires: PyQt4-devel
#sip-devel comes with PyQt4-devel
#BuildRequires: sip-devel
@@ -30,7 +30,6 @@ BuildRequires: docbook-utils
BuildRequires: docbook-style-xsl
BuildRequires: dblatex
BuildRequires: desktop-file-utils
-Requires: PyQt4
Requires: hicolor-icon-theme
Requires: kde-filesystem
@@ -46,7 +45,7 @@ Group: Documentation
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
Provides: %{name}-manual = %{version}-%{release}
-Obsoletes: %{name}-manual < 0.2.4
+Obsoletes: %{name}-manual < 0.2.4-1
%description doc
The %{name}-doc package contains documentation for the %{name}.
@@ -64,14 +63,14 @@ s/\./\\\./g"`/" manual/docbook-en/index.
#fix default path for fitPlugins
sed -i "s\/usr/lib/%{name}/plugins\%{_libdir}/%{name}/plugins\g" \
%{name}/src/ApplicationWindow.cpp
-sed -i -e 's/Science;Physics;Math;Graphics;/Education;Science;DataVisualization;/' %{name}/%{name}.desktop
+sed -i -e 's/Qt;Science;Physics;Math;Graphics;/Education;Science;DataVisualization;Qt/' %{name}/%{name}.desktop
%build
export PATH=%{_qt4_bindir}:$PATH
%_qt4_qmake LIB=%{_libdir} SCIDOCDIR=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
pushd manual
-make ||:
+make
popd
pushd man
docbook2man manpage.sgml
@@ -94,8 +93,8 @@ desktop-file-install --vendor "" \
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/%{name}.desktop
#add mime-type icons
-mkdir %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/
-mkdir %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
+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 \
@@ -144,6 +143,9 @@ rm -rf %{buildroot}
%{_docdir}/%{name}-%{version}/manual
%changelog
+* Tue Apr 20 2010 Chen Lei <supercyper at 163.com> - 0.2.4-2
+- Update the scidavis documentation
+
* Sat Mar 13 2010 Chen Lei <supercyper at 163.com> - 0.2.4-1
- Update to 0.2.4
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 14 Mar 2010 06:22:26 -0000 1.8
+++ sources 20 Apr 2010 02:23:50 -0000 1.9
@@ -1,2 +1,2 @@
c5650475c5e0b22f9ee5dc49630a0e89 scidavis-0.2.4.tar.bz2
-3179f5424dacd01146ef3368b0007429 scidavis-manual-0.2_2010-03-13.tar.bz2
+d80c760b603d0e65ab36293ec0db99b9 scidavis-manual-0.2_2010-04-20.tar.bz2
More information about the scm-commits
mailing list