rpms/asymptote/devel asymptote-1.29-settings.patch, NONE, 1.1 asymptote.spec, 1.25, 1.26

[Jose Pedro Oliveira (jpo)]

Author: jpo

Update of /cvs/extras/rpms/asymptote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2965

Modified Files:
	asymptote.spec 
Added Files:
	asymptote-1.29-settings.patch 
Log Message:
- Using "evince" as the default PS and PDF viewers (#244151).
  (patch file: asymptote-1.29-settings.patch)
- Use relative symbolic links in the vim-common triggers.


asymptote-1.29-settings.patch:

--- NEW FILE asymptote-1.29-settings.patch ---
diff -ruN asymptote-1.29-orig/settings.cc asymptote-1.29/settings.cc
--- asymptote-1.29-orig/settings.cc	2007-05-19 18:25:56.000000000 +0100
+++ asymptote-1.29/settings.cc	2007-06-16 21:16:06.000000000 +0100
@@ -72,11 +72,11 @@
 bool msdos=false;
 const char *HOME="HOME";
 const char pathSeparator=':';
-string defaultPSViewer="gv";
+string defaultPSViewer="evince";
 #ifdef __APPLE__
 string defaultPDFViewer="open";
 #else  
-string defaultPDFViewer="acroread";
+string defaultPDFViewer="evince";
 #endif  
 string defaultGhostscript="gs";
 string defaultDisplay="display";


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- asymptote.spec	2 Jun 2007 22:29:37 -0000	1.25
+++ asymptote.spec	16 Jun 2007 20:48:38 -0000	1.26
@@ -5,13 +5,14 @@
 
 Name:           asymptote
 Version:        1.29
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Descriptive vector graphics language
 
 Group:          Applications/Publishing
 License:        GPL
 URL:            http://asymptote.sourceforge.net/
 Source:         http://dl.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.src.tgz
+Patch0:         asymptote-1.29-settings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
 %{__sed} -i 's/\r//' doc/CAD1.asy
 
@@ -68,7 +70,8 @@
 # Vim syntax file
 for vimver in 63 64 70 71 ; do
     install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
-    ln -s %{_datadir}/%{name}/asy.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
+    cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
+    ln -s ../../../%{name}/asy.vim .
 done
 
 
@@ -111,7 +114,8 @@
 %triggerin -- vim-common
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
 [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-  ln -sf %{_datadir}/%{name}/asy.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || :
+    cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+    ln -sf ../../../%{name}/asy.vim . || :
 
 %triggerun -- vim-common
 VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
@@ -123,7 +127,8 @@
 if [ $1 = 1 ]; then
     rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/asy.vim || :
     [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-        ln -sf %{_datadir}/%{name}/asy.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || :
+        cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
+        ln -sf ../../../%{name}/asy.vim . || :
 fi
 
 
@@ -140,6 +145,11 @@
 
 
 %changelog
+* Sat Jun 16 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.29-3
+- Using "evince" as the default PS and PDF viewers (#244151).
+  (patch file: asymptote-1.29-settings.patch)
+- Use relative symbolic links in the vim-common triggers.
+
 * Sat Jun  2 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.29-2
 - Add asy-faq to install-info (#155750).
 - Add support for vim 7.1.