[asymptote/f18] update to 2.24

Tom Callaway spot at fedoraproject.org
Mon Dec 9 15:36:42 UTC 2013


commit 5814b227f0ade86d2ec21b3b8996d1af36e1c107
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Dec 9 10:36:43 2013 -0500

    update to 2.24

 asymptote.spec |   88 ++++++++++++++++++++++++++++++++++---------------------
 sources        |    2 +-
 2 files changed, 55 insertions(+), 35 deletions(-)
---
diff --git a/asymptote.spec b/asymptote.spec
index 4cb45eb..e970bf0 100644
--- a/asymptote.spec
+++ b/asymptote.spec
@@ -1,44 +1,44 @@
 %{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}
 
 Name:           asymptote
-Version:        2.21
-Release:        3%{?dist}
+Version:        2.24
+Release:        2%{?dist}
 Summary:        Descriptive vector graphics language
 Group:          Applications/Publishing
 License:        LGPLv3+
 URL:            http://asymptote.sourceforge.net/
 Source0:        http://download.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.src.tgz
-Source1:	asy.gif
-Source2:	xasy.desktop
-Source3:	asymptote.sty.204
+Source1:        asy.gif
+Source2:        xasy.desktop
+Source3:        asymptote.sty.204
 Patch0:         asymptote-2.00-settings.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
+Patch3:         asymptote-2.08-info-path-fix.patch
 BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
 BuildRequires:  fftw-devel >= 3.0
 BuildRequires:  gc-devel >= 6.8
 BuildRequires:  gsl-devel
 BuildRequires:  tex(latex) tex(epsf.tex)
-BuildRequires:	tex(pdftex.map)
-BuildRequires:	tex(cm-super-t1.enc)
-BuildRequires:	tex(parskip.sty)
+BuildRequires:  tex(pdftex.map)
+BuildRequires:  tex(cm-super-t1.enc)
+BuildRequires:  tex(parskip.sty)
 BuildRequires:  ghostscript
 BuildRequires:  texinfo-tex
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  freeglut-devel
 BuildRequires:  zlib-devel
-BuildRequires:	libtool
-BuildRequires:	mesa-libOSMesa-devel
+BuildRequires:  libtool
+BuildRequires:  mesa-libOSMesa-devel
 BuildRequires:  emacs
 BuildRequires:  xemacs
 # For cc-mode
-BuildRequires:	xemacs-packages-extra
+BuildRequires:  xemacs-packages-extra
 
 Requires:       tex(latex)
 Requires:       tkinter
-Requires:	python-imaging-tk
+Requires:        python-imaging-tk
 # for /usr/bin/texhash and /sbin/install-info
 Requires(post): texlive-kpathsea-bin, tex-kpathsea, info
 Requires(postun): texlive-kpathsea-bin, tex-kpathsea, info
@@ -52,19 +52,19 @@ Asymptote provides for figures the same high-quality level of typesetting
 that LaTeX does for scientific text.
 
 %package -n emacs-%{name}
-Summary:	Compiled elisp files to run %{name} under GNU Emacs
-Group:		Applications/Publishing
-Requires:	emacs(bin) >= %{_emacs_version}
-Requires:	%{name} = %{version}-%{release}
+Summary:    Compiled elisp files to run %{name} under GNU Emacs
+Group:      Applications/Publishing
+Requires:   emacs(bin) >= %{_emacs_version}
+Requires:   %{name} = %{version}-%{release}
 
 %description -n emacs-%{name}
 This package contains the byte compiled elisp packages to run %{name} with GNU
 Emacs.
 
 %package -n emacs-%{name}-el
-Summary:	Elisp source files for %{name} under GNU Emacs
-Group:		Applications/Publishing
-Requires:	emacs-%{name} = %{version}-%{release}
+Summary:    Elisp source files for %{name} under GNU Emacs
+Group:      Applications/Publishing
+Requires:   emacs-%{name} = %{version}-%{release}
 
 %description -n emacs-%{name}-el
 This package contains the elisp source files for %{name} under GNU Emacs. You
@@ -72,19 +72,19 @@ do not need to install this package to run %{name}. Install the emacs-%{name}
 package to use %{name} with GNU Emacs.
 
 %package -n xemacs-%{name}
-Summary:	Compiled elisp files to run %{name} under XEmacs
-Group:		Applications/Publishing
-Requires:	xemacs(bin) >= %{_xemacs_version}
-Requires:	%{name} = %{version}-%{release}
+Summary:    Compiled elisp files to run %{name} under XEmacs
+Group:      Applications/Publishing
+Requires:   xemacs(bin) >= %{_xemacs_version}
+Requires:   %{name} = %{version}-%{release}
 
 %description -n xemacs-%{name}
 This package contains the byte compiled elisp packages to use %{name} with
 XEmacs.
 
 %package -n xemacs-%{name}-el
-Summary:	Elisp source files for %{name} under XEmacs
-Group:		Applications/Publishing
-Requires:	xemacs-%{name} = %{version}-%{release}
+Summary:    Elisp source files for %{name} under XEmacs
+Group:      Applications/Publishing
+Requires:   xemacs-%{name} = %{version}-%{release}
 
 %description -n xemacs-%{name}-el
 This package contains the elisp source files for %{name} under XEmacs. You do
@@ -103,7 +103,7 @@ mv examples/interpolate1.asy{.utf8,}
 autoreconf -i
 
 %build
-%configure --enable-gc=system --with-docdir=%{_defaultdocdir}/%{name}-%{version}/ --with-latex=%{_texmf}/tex/latex --with-context=%{_texmf}/tex/context/
+%configure --enable-gc=system --with-docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}/} --with-latex=%{_texmf}/tex/latex --with-context=%{_texmf}/tex/context/
 make %{?_smp_mflags}
 cd doc/
 %if 0%{?fedora} < 18
@@ -114,10 +114,10 @@ cp %{SOURCE3} asymptote.sty
 make all
 
 %install
-make install DESTDIR=%{buildroot} mandir=%{buildroot}%{_mandir}
+%make_install 
 
 install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \
-    %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
+    %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 
 # Emacs files
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
@@ -153,9 +153,7 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps/
 cp %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/
 
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor "fedora"                  \
-        --dir %{buildroot}%{_datadir}/applications   \
-        %{SOURCE2}
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 # Clean up symlink
 rm -rf %{buildroot}%{_bindir}/xasy
@@ -175,7 +173,7 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%doc %{_defaultdocdir}/%{name}-%{version}/
+%doc %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}/}
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{texpkgdir}/
@@ -208,6 +206,28 @@ fi
 %{_xemacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Wed Aug 14 2013 Tom Callaway <spot at fedoraproject.org> - 2.24-2
+- use unversioned docdir macros
+
+* Wed Aug 14 2013 Tom Callaway <spot at fedoraproject.org> - 2.24-1
+- update to 2.24
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu May 23 2013 Tom Callaway <spot at fedoraproject.org> - 2.23-1
+- update to 2.23
+
+* Fri May 17 2013 Tom Callaway <spot at fedoraproject.org> - 2.22-1
+- update to 2.22
+
+* Sun Feb 10 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 2.21-5
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
+* Thu Jan 31 2013 Tom Callaway <spot at fedoraproject.org> - 2.21-4
+- use pillow compatible import (from PIL import foo)
+
 * Tue Oct 23 2012 Tom Callaway <spot at fedoraproject.org> - 2.21-3
 - more missing BR, conditionalize texlive hacks
 
diff --git a/sources b/sources
index 7c0f402..75372ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb52371ace51a254c568fef7e6a2c589  asymptote-2.21.src.tgz
+a7be98f029ed4924ae34de9eb47cb5ac  asymptote-2.24.src.tgz


More information about the scm-commits mailing list