rpms/asymptote/devel asymptote-1.37-gcc43.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 asymptote.spec, 1.32, 1.33 sources, 1.27, 1.28

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	.cvsignore asymptote.spec sources 
Added Files:
	asymptote-1.37-gcc43.patch 
Log Message:

Bump to 1.37, fix gcc43 failure.


asymptote-1.37-gcc43.patch:

--- NEW FILE asymptote-1.37-gcc43.patch ---
diff -up asymptote-1.37/pipestream.h.BAD asymptote-1.37/pipestream.h
--- asymptote-1.37/pipestream.h.BAD	2008-01-03 13:32:42.000000000 -0500
+++ asymptote-1.37/pipestream.h	2008-01-03 13:32:52.000000000 -0500
@@ -20,6 +20,7 @@
 #define PIPESTREAM_H
 
 #include <iostream>
+#include <cstring>
 #include <sys/wait.h>
 #include <cerrno>
 #include <sstream>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Jul 2007 22:58:07 -0000	1.27
+++ .cvsignore	3 Jan 2008 20:24:40 -0000	1.28
@@ -1 +1 @@
-asymptote-1.33.src.tgz
+asymptote-1.37.src.tgz


Index: asymptote.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/asymptote.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- asymptote.spec	29 Aug 2007 04:37:49 -0000	1.32
+++ asymptote.spec	3 Jan 2008 20:24:40 -0000	1.33
@@ -4,15 +4,16 @@
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 Name:           asymptote
-Version:        1.33
-Release:        2%{?dist}
+Version:        1.37
+Release:        1%{?dist}
 Summary:        Descriptive vector graphics language
 
 Group:          Applications/Publishing
-License:        GPL
+License:        GPLv3+
 URL:            http://asymptote.sourceforge.net/
 Source:         http://dl.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.src.tgz
 Patch0:         asymptote-1.29-settings.patch
+Patch1:         asymptote-1.37-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel
@@ -42,9 +43,13 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__sed} -i 's|^#!/usr/bin/env python$|#!%{__python}|' xasy
 %{__sed} -i 's/\r//' doc/CAD1.asy
 
+# convert to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o examples/interpolate1.asy{.utf8,}
+mv examples/interpolate1.asy{.utf8,}
 
 %build
 %configure --enable-gc=system --with-docdir=%{_defaultdocdir}/%{name}-%{version}/
@@ -79,6 +84,10 @@
     ln -s ../../../%{name}/asy.vim .
 done
 
+# Clean up symlink
+rm -rf $RPM_BUILD_ROOT%{_bindir}/xasy
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s ../share/%{name}/GUI/xasy.py xasy
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,47 +105,6 @@
     /sbin/install-info --delete asy-faq %{_infodir}/dir 2>/dev/null || :
 fi
 
-
-%triggerin -- emacs-common
-[ -d %{emacs_sitelisp} ] && \
-    cd %{emacs_sitelisp} && ln -sf ../../%{name}/asy-{mode,keywords}.el . || :
-[ -d %{emacs_sitelisp}/site-start.d ] && \
-    cd %{emacs_sitelisp}/site-start.d && ln -sf ../../../%{name}/asy-init.el . || :
-
-%triggerin -- xemacs-common
-[ -d %{xemacs_sitelisp} ] && \
-    cd %{xemacs_sitelisp} && ln -sf ../../../%{name}/asy-{mode,keywords}.el . || :
-[ -d %{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,asy-keywords.el,site-start.d/asy-init.el} || :
-
-%triggerun -- xemacs-common
-[ $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 -n | tail -n 1 | sed -e 's/[^ ]* \([^.]*\)\.\([^.]*\).*/\1\2/'`
-[ -d %{_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 -n | head -n 1 | sed -e 's/[^ ]* \([^.]*\)\.\([^.]*\).*/\1\2/'`
-[ $2 = 0 ] && rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/asy.vim || :
-
-%triggerpostun -- vim-common
-VIMVEROLD=`rpm -q --qf='%%{epoch} %%{version}\n' vim-common | sort -n | head -n 1 | sed -e 's/[^ ]* \([^.]*\)\.\([^.]*\).*/\1\2/'`
-VIMVERNEW=`rpm -q --qf='%%{epoch} %%{version}\n' vim-common | sort -n | tail -n 1 | sed -e 's/[^ ]* \([^.]*\)\.\([^.]*\).*/\1\2/'`
-if [ $1 = 1 ]; then
-    rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/asy.vim || :
-    [ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
-        cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
-        ln -sf ../../../%{name}/asy.vim . || :
-fi
-
-
 %files
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}-%{version}/
@@ -145,11 +113,20 @@
 %{texpkgdir}/
 %{_mandir}/man1/*.1*
 %{_infodir}/*.info*
-%ghost %{_datadir}/*emacs
-%ghost %{_datadir}/vim/
+%{_datadir}/vim/vim*/syntax/asy.vim
+# Strictly speaking, we shouldn't own these dirs.
+# However, we don't require emacs/xemacs, we just enhance them.
+# Thus, its ok for dual ownership.
+%{_datadir}/emacs*
+%{_datadir}/xemacs/
 
 
 %changelog
+* Thu Jan  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.37-1
+- bump to 1.37
+- fix gcc43 failures
+- drop triggers
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - sh: kpsewhich: command not found
 - Rebuild for selinux ppc32 issue.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asymptote/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Jul 2007 22:58:07 -0000	1.27
+++ sources	3 Jan 2008 20:24:40 -0000	1.28
@@ -1 +1 @@
-2351b2c74d8808a84944bd972407e61a  asymptote-1.33.src.tgz
+05b6e614f43e2fd163161117c4093f87  asymptote-1.37.src.tgz