diff --git a/.gitignore b/.gitignore index d22fc0e..cfd888a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ asymptote-2.03.src.tgz /asymptote-2.06.src.tgz /asymptote-2.07.src.tgz /asymptote-2.08.src.tgz +/asymptote-2.10.src.tgz diff --git a/asymptote.spec b/asymptote.spec index 5d96038..3eaae52 100644 --- a/asymptote.spec +++ b/asymptote.spec @@ -1,10 +1,9 @@ %{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")} Name: asymptote -Version: 2.08 -Release: 4%{?dist} +Version: 2.10 +Release: 1%{?dist} Summary: Descriptive vector graphics language - Group: Applications/Publishing License: LGPLv3+ URL: http://asymptote.sourceforge.net/ @@ -17,7 +16,6 @@ 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}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel BuildRequires: readline-devel @@ -115,65 +113,54 @@ cp %{SOURCE3} asymptote.sty make all %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=$RPM_BUILD_ROOT%{_mandir} - -# pushd doc -# make install DESTDIR=$RPM_BUILD_ROOT mandir=$RPM_BUILD_ROOT%{_mandir} -# popd +make install DESTDIR=%{buildroot} mandir=%{buildroot}%{_mandir} install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \ - $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/ + %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ # Emacs files -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} -cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/*.el $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} -mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/asy-init.el $RPM_BUILD_ROOT%{_emacs_sitestartdir} -for i in $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el; do +mkdir -p %{buildroot}%{_emacs_sitestartdir} +mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} +cp -a %{buildroot}%{_datadir}/%{name}/*.el %{buildroot}%{_emacs_sitelispdir}/%{name} +mv %{buildroot}%{_emacs_sitelispdir}/%{name}/asy-init.el %{buildroot}%{_emacs_sitestartdir} +for i in %{buildroot}%{_emacs_sitelispdir}/%{name}/*.el; do %{_emacs_bytecompile} $i done # XEmacs files -mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir} -mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name} -cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/*.el $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name} -mv $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}/asy-init.el $RPM_BUILD_ROOT%{_xemacs_sitestartdir} -for i in $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}/*.el; do +mkdir -p %{buildroot}%{_xemacs_sitestartdir} +mkdir -p %{buildroot}%{_xemacs_sitelispdir}/%{name} +cp -a %{buildroot}%{_datadir}/%{name}/*.el %{buildroot}%{_xemacs_sitelispdir}/%{name} +mv %{buildroot}%{_xemacs_sitelispdir}/%{name}/asy-init.el %{buildroot}%{_xemacs_sitestartdir} +for i in %{buildroot}%{_xemacs_sitelispdir}/%{name}/*.el; do %{_xemacs_bytecompile} $i done # Vim syntax file for vimver in 63 64 70 71 72 73 ; do - install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax - cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax + install -dm 755 %{buildroot}%{_datadir}/vim/vim$vimver/syntax + cd %{buildroot}%{_datadir}/vim/vim$vimver/syntax ln -s ../../../%{name}/asy.vim . done # Move info file -mv $RPM_BUILD_ROOT%{_infodir}/asymptote/asymptote.info $RPM_BUILD_ROOT%{_infodir}/asymptote.info +mv %{buildroot}%{_infodir}/asymptote/asymptote.info %{buildroot}%{_infodir}/asymptote.info # copy icon to pixmaps dir -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +mkdir -p %{buildroot}%{_datadir}/pixmaps/ +cp %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/ -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --vendor "fedora" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ %{SOURCE2} # Clean up symlink -rm -rf $RPM_BUILD_ROOT%{_bindir}/xasy -cd $RPM_BUILD_ROOT%{_bindir} +rm -rf %{buildroot}%{_bindir}/xasy +cd %{buildroot}%{_bindir} ln -s ../share/%{name}/GUI/xasy.py xasy - - -%clean -rm -rf $RPM_BUILD_ROOT - - %post texhash >/dev/null 2>&1 || : /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : @@ -187,7 +174,6 @@ if [ $1 = 0 ]; then fi %files -%defattr(-,root,root,-) %doc %{_defaultdocdir}/%{name}-%{version}/ %{_bindir}/* %{_datadir}/%{name}/ @@ -205,26 +191,25 @@ fi %{_datadir}/applications/*.desktop %files -n emacs-%{name} -%defattr(-,root,root,-) %{_emacs_sitestartdir}/*.el %{_emacs_sitelispdir}/%{name}/*.elc %dir %{_emacs_sitelispdir}/%{name} %files -n emacs-%{name}-el -%defattr(-,root,root,-) %{_emacs_sitelispdir}/%{name}/*.el %files -n xemacs-%{name} -%defattr(-,root,root,-) %{_xemacs_sitelispdir}/%{name}/*.elc %{_xemacs_sitestartdir}/*.el %dir %{_xemacs_sitelispdir}/%{name} %files -n xemacs-%{name}-el -%defattr(-,root,root,-) %{_xemacs_sitelispdir}/%{name}/*.el %changelog +* Fri May 27 2011 Tom Callaway - 2.10-1 +- update to 2.10 + * Thu Mar 3 2011 Tom Callaway - 2.08-4 - no, really, fix info parsing - breakout emacs subpackages diff --git a/sources b/sources index 8ffbcb2..2e2b7c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab7bc11c8110b6eb459285b9c206cfe6 asymptote-2.08.src.tgz +774067a30e54308a061aed20098c01d9 asymptote-2.10.src.tgz