updated asymptote-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4027 ec354946-7b23-47d6-9f5a-488ba84defc7

a/asymptote/asymptote-vl.spec

@@ -5,16 +5,12 @@
 %define build_texmf     %{buildroot}%{texmf}
 
 %define exec_texhash	[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash 2> /dev/null
-%define exec_updmap	[ -x %{_bindir}/updmap-sys ] && %{_bindir}/env - %{_bindir}/updmap-sys --nostop 2> /dev/null
-
-#% define emacs_sitelisp  %{_datadir}/emacs/site-lisp
-#% define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
 
 %define emacspkg asy-mode
 
 Name:           asymptote
-Version:        1.70
+Version:        2.10
-Release:        5%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        Descriptive vector graphics language
 Summary(ja):    MetaPost に触発されたスクリプトベースのベクターグラフィック言語
 
@@ -24,14 +20,18 @@ URL:            http://asymptote.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.src.tgz
 Source1:	asy.gif
 Source2:	xasy.desktop
+#Source3:	asymptote.sty.204
 
 Source11:	%{emacspkg}-install.sh
 Source12:	%{emacspkg}-remove.sh
 #Source13:	%{name}-init.el
 
-#Patch0:         asymptote-1.29-settings.patch
+#Patch0:         asymptote-2.00-settings.patch
-Patch0:         asymptote-1.70-settings-vine.patch
+Patch0:         asymptote-2.00-settings-vine.patch
 Patch1:		asymptote-1.63-gcc44.patch
+Patch2:		asymptote-1.91-fix-implicit-DSO-linking-libGL.patch
+# This doesn't need to go upstream. We put the info file in the topdir, not a subdir, so we need this fix.
+Patch3:		asymptote-2.08-info-path-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  ncurses-devel
@@ -39,22 +39,25 @@ BuildRequires:  readline-devel
 BuildRequires:  fftw3-devel >= 3.0
 BuildRequires:  gc-devel >= 6.8
 BuildRequires:  gsl-devel
-BuildRequires:  texlive
+BuildRequires:  texlive-common
+BuildRequires:  texlive-collection-texinfo
+BuildRequires:  texlive-collection-genericrecommended
 BuildRequires:  ghostscript
 BuildRequires:  texinfo
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  freeglut-devel
 BuildRequires:  zlib-devel
+BuildRequires:	libtool
 
-Requires:       tetex
+Requires:       texlive-common
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
 # for /usr/bin/texhash and /sbin/install-info
-Requires(post): tetex, info
+Requires(post): texlive, info
-Requires(postun): tetex, info
+Requires(postun): texlive, info
 
 %define texpkgdir   %{texmf}/tex/latex/%{name}
 
@@ -65,6 +68,8 @@ Asymptote provides for figures the same high-quality level of typesetting
 that LaTeX does for scientific text.
 
 This package is custmized for Japanese. 
+- added eplatex, platex to latex engines
+- use pdvips as dvips command
 
 %description -l ja
 Asymptote は MetaPost に触発されているが，C++ のような構文に改良された，
@@ -73,6 +78,8 @@ Asymptote は科学的なテキストに対して LaTeX がしている組版の
 同じくらい高品質なレベルの図を提供します．
 
 このパッケージは日本語向けにカスタマイズされています．
+- latex エンジンに eplatex, platex を追加
+- dvips コマンドとして pdvips を使う
 
 
 %package gui
@@ -82,6 +89,7 @@ Group: Applications/Graphics
 Requires: %{name} = %{version}-%{release}
 Requires:       tkinter
 Requires:	python-imaging
+BuildArch:     noarch
 
 %description gui
 A graphical interface for Asymptote
@@ -94,6 +102,7 @@ Group: Applications/Editors/Emacs
 Requires: %{name} = %{version}-%{release}
 BuildRequires: emacsen
 %prereq_ge     emacsen-common
+BuildArch:     noarch
 
 %description -n %{emacspkg}
 Emacs mode for editing Asymptote source code
@@ -101,44 +110,36 @@ Emacs mode for editing Asymptote source code
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .settings
 %patch1 -p1 -b .gcc44
+%patch2 -p1 -b .DSO
+%patch3 -p1 -b .path-fix
 %{__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,}
+%__mv examples/interpolate1.asy{.utf8,}
+autoreconf -i
 
 %build
 %configure \
     --enable-gc=system \
     --with-docdir=%{_defaultdocdir}/%{name}-%{version}/ \
-    --with-latex=%{texmf}/tex/latex
+    --with-latex=%{texmf}/tex/latex \
+     --with-context=%{texmf}/tex/context \
+     ;
 %__make %{?_smp_mflags}
 cd doc/
-%__make asymptote.pdf
+%__make asy-latex.pdf
+%__make all
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install-all DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=%{buildroot} mandir=%{buildroot}%{_mandir}
 
 %__install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \
     $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/
 
-# # 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 71 ; do
 #     install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
@@ -146,19 +147,22 @@ cd doc/
 #     ln -s ../../../%{name}/asy.vim .
 # done
 
+# Move info file
+%__mv %{buildroot}%{_infodir}/asymptote/asymptote.info %{buildroot}%{_infodir}/asymptote.info
+
 # copy icon to pixmaps dir
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+%__cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor "vine"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         %{SOURCE2}
 
 # Clean up symlink
-rm -rf $RPM_BUILD_ROOT%{_bindir}/xasy
+%__rm -rf $RPM_BUILD_ROOT%{_bindir}/xasy
 cd $RPM_BUILD_ROOT%{_bindir}
-ln -s ../share/%{name}/GUI/xasy.py xasy
+%__ln_s ../share/%{name}/GUI/xasy.py xasy
 
 
 ## <asy-mode>
@@ -199,7 +203,6 @@ ln -s ../share/%{name}/GUI/xasy.py xasy
 /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 || :
 %{exec_texhash}
-%{exec_updmap}
 
 
 %post -n %{emacspkg}
@@ -219,7 +222,6 @@ if [ $1 = 0 ]; then
     /sbin/install-info --delete %{name} %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete asy-faq %{_infodir}/dir 2>/dev/null || :
     %{exec_texhash}
-    %{exec_updmap}
 fi
 
 
@@ -240,14 +242,10 @@ fi
 %{_datadir}/%{name}/
 %exclude %{_datadir}/asymptote/GUI/
 %{texpkgdir}/
-%{_mandir}/man*/asy.*
+%{texmf}/tex/context/
+%{_mandir}/man1/*.1*
 %{_infodir}/*.info*
-#%{_datadir}/vim/vim*/syntax/asy.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/
 
 
 %files gui
@@ -266,6 +264,9 @@ fi
 
 
 %changelog
+* Sat Jun 04 2011 Munehiro Yamamoto <munepi@vinelinux.org> - 2.10-1
+- new upstream release
+
 * Sun Aug 08 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 1.70-5
 - TeX Live 2009