[asymptote] use unversioned docdir macros

Tom Callaway spot at fedoraproject.org
Wed Aug 14 15:08:52 UTC 2013


commit 647c9c214eb14584f82b3f5b7336dc8b8f0ec3b3
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Aug 14 11:09:06 2013 -0400

    use unversioned docdir macros

 asymptote.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/asymptote.spec b/asymptote.spec
index 92ad916..e970bf0 100644
--- a/asymptote.spec
+++ b/asymptote.spec
@@ -2,7 +2,7 @@
 
 Name:           asymptote
 Version:        2.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Descriptive vector graphics language
 Group:          Applications/Publishing
 License:        LGPLv3+
@@ -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
@@ -117,7 +117,7 @@ make all
 %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}
@@ -173,7 +173,7 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%doc %{_defaultdocdir}/%{name}-%{version}/
+%doc %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}/}
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{texpkgdir}/
@@ -206,6 +206,9 @@ 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
 


More information about the scm-commits mailing list