rpms/asymptote/F-7 asymptote-1.29-settings.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 asymptote.spec, 1.24, 1.25 sources, 1.23, 1.24

Jose Pedro Oliveira (jpo) fedora-extras-commits at redhat.com
Sat Jun 16 23:01:47 UTC 2007 

Author: jpo

Update of /cvs/extras/rpms/asymptote/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25010/F-7

Modified Files:
	.cvsignore asymptote.spec sources 
Added Files:
	asymptote-1.29-settings.patch 
Log Message:
Sync with devel.

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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asymptote/F-7/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	21 May 2007 23:04:54 -0000	1.23
+++ .cvsignore	16 Jun 2007 23:00:57 -0000	1.24
@@ -1 +1 @@
-asymptote-1.29.src.tgz
+asymptote-1.30.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/extras/rpms/asymptote/F-7/asymptote.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- asymptote.spec	21 May 2007 23:04:54 -0000	1.24
+++ asymptote.spec	16 Jun 2007 23:00:57 -0000	1.25
@@ -4,7 +4,7 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.29
+Version:        1.30
 Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
@@ -12,6 +12,7 @@
 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
 
@@ -56,19 +58,25 @@
 install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \
     $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/
 
-# Emacs/Xemacs mode and init files
-for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do
-  install -dm 755 $RPM_BUILD_ROOT$dir/site-start.d
-  ln -s %{_datadir}/%{name}/asy-mode.el $RPM_BUILD_ROOT$dir
-  touch $RPM_BUILD_ROOT$dir/asy-mode.elc
-  ln -s %{_datadir}/%{name}/asy-init.el $RPM_BUILD_ROOT$dir/site-start.d
-  touch $RPM_BUILD_ROOT$dir/site-start.d/asy-init.elc
-done
+# Emacs mode and init files
+install -dm 755 $RPM_BUILD_ROOT%{emacs_sitelisp}/site-start.d
+cd $RPM_BUILD_ROOT%{emacs_sitelisp}
+ln -s ../../%{name}/asy-{mode,keywords}.el .
+cd $RPM_BUILD_ROOT%{emacs_sitelisp}/site-start.d
+ln -s ../../../%{name}/asy-init.el .
+
+# Xemacs mode and init files
+install -dm 755 $RPM_BUILD_ROOT%{xemacs_sitelisp}/site-start.d
+cd $RPM_BUILD_ROOT%{xemacs_sitelisp}
+ln -s ../../../%{name}/asy-{mode,keywords}.el .
+cd $RPM_BUILD_ROOT%{xemacs_sitelisp}/site-start.d
+ln -s ../../../../%{name}/asy-init.el .
 
 # Vim syntax file
-for vimver in 63 64 70 ; do
+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
 
 
@@ -79,37 +87,40 @@
 %post
 texhash >/dev/null 2>&1 || :
 /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/asy-faq.info.gz %{_infodir}/dir 2>/dev/null || :
 
 %postun
 texhash >/dev/null 2>&1 || :
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
+    /sbin/install-info --delete %{name} %{_infodir}/dir 2>/dev/null || :
+    /sbin/install-info --delete asy-faq %{_infodir}/dir 2>/dev/null || :
 fi
 
 
 %triggerin -- emacs-common
 [ -d %{emacs_sitelisp} ] && \
-    ln -sf %{_datadir}/%{name}/asy-mode.el %{emacs_sitelisp} || :
+    cd %{emacs_sitelisp} && ln -sf ../../%{name}/asy-{mode,keywords}.el . || :
 [ -d %{emacs_sitelisp}/site-start.d ] && \
-    ln -sf %{_datadir}/%{name}/asy-init.el %{emacs_sitelisp}/site-start.d || :
+    cd %{emacs_sitelisp}/site-start.d && ln -sf ../../../%{name}/asy-init.el . || :
 
 %triggerin -- xemacs-common
 [ -d %{xemacs_sitelisp} ] && \
-    ln -sf %{_datadir}/%{name}/asy-mode.el %{xemacs_sitelisp} || :
+    cd %{xemacs_sitelisp} && ln -sf ../../../%{name}/asy-{mode,keywords}.el . || :
 [ -d %{xemacs_sitelisp}/site-start.d ] && \
-    ln -sf %{_datadir}/%{name}/asy-init.el %{xemacs_sitelisp}/site-start.d || :
+    cd %{xemacs_sitelisp}/site-start.d && ln -sf ../../../../%{name}/asy-init.el . || :
 
 %triggerun -- emacs-common
-[ $2 = 0 ] && rm -f %{emacs_sitelisp}/{asy-mode.el*,site-start.d/asy-init.el*} || :
+[ $2 = 0 ] && rm -f %{emacs_sitelisp}/{asy-mode.el,asy-keywords.el,site-start.d/asy-init.el} || :
 
 %triggerun -- xemacs-common
-[ $2 = 0 ] && rm -f %{xemacs_sitelisp}/{asy-mode.el*,site-start.d/asy-init.el*} || :
+[ $2 = 0 ] && rm -f %{xemacs_sitelisp}/{asy-mode.el,asy-keywords.el,site-start.d/asy-init.el} || :
 
 
 %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/\.//'`
@@ -121,7 +132,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
 
 
@@ -138,6 +150,19 @@
 
 
 %changelog
+* Sat Jun 16 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.30-1
+- Update to 1.30.
+
+* 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 {emacs,xemacs}-common triggers (#155750).
+- 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.
+
 * Mon May 21 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.29-1
 - Update to 1.29.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asymptote/F-7/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	21 May 2007 23:04:54 -0000	1.23
+++ sources	16 Jun 2007 23:00:57 -0000	1.24
@@ -1 +1 @@
-455fc563c35e19dd99ba5e7e0281e637  asymptote-1.29.src.tgz
+11967e87e4a68d46af193d31ebe89d9e  asymptote-1.30.src.tgz

More information about the scm-commits mailing list