lilypond: correct SPEC file

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

l/lilypond/lilypond-vl.spec

@@ -2,19 +2,21 @@
 %define name lilypond
 %define iconsdir /usr/share/pixmaps
 %define infodir %{_infodir}/%{name}
-Summary:	A typesetting system for music notation
+%define fontdir %{_datadir}/fonts/%{name}
-Summary(ja):楽譜作成プログラム
+
-Group:		Applications/Publishing
+Summary: A typesetting system for music notation
-Name:		%{name}
+Summary(ja): 楽譜作成プログラム
-Version:	2.18.2
+Group:   Applications/Publishing
-Release:	1%{?_dist_release}
+Name:    %{name}
-License:	GPLv2
+Version: 2.18.2
-URL:		http://www.lilypond.org/
+Release: 2%{?_dist_release}
-Source0:	http://download.linuxaudio.org/lilypond/sources/v2.12/%{name}-%{version}.tar.gz
+License: GPLv3
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+URL:     http://www.lilypond.org/
+Source0: http://download.linuxaudio.org/lilypond/sources/v2.12/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 ## from fc11
-Patch12:	lilypond-2.21.2-gcc44-relocate.patch
+Patch12:  lilypond-2.21.2-gcc44-relocate.patch
 
 BuildRequires: t1utils ImageMagick-devel gettext texlive-common
 BuildRequires: gcc-c++
@@ -23,12 +25,22 @@ BuildRequires: python-devel >= 2.4.0
 BuildRequires: mftrace >= 1.1.19
 BuildRequires: texinfo >= 4.8
 BuildRequires: texi2html
+%if %{?_dist_release} == "vl6"
+BuildRequires: guile-devel >= 1.8
+%endif
+%if %{?_dist_release} >= "vl7"
 BuildRequires: guile18-devel >= 1.8
+%endif
 BuildRequires: ghostscript >= 8.15
 BuildRequires: pango-devel >= 1.12.0
 BuildRequires: rsync
 BuildRequires: texlive-collection-metapost
+%if %{?_dist_release} == "vl6"
 BuildRequires: texlive-collection-genericrecommended
+%endif
+%if %{?_dist_release} >= "vl7"
+BuildRequires: texlive-collection-plaingeneric
+%endif
 BuildRequires: dblatex
 
 BuildRequires: potrace >= 1.3
@@ -40,14 +52,14 @@ BuildRequires: fontforge
 %description
 LilyPond is a music typesetter.  It produces beautiful sheet music using a
 high level description file as input.  Lilypond is part of the GNU project.
- 
+
 LilyPond is split into two packages.  The package "lilypond" provides the
 core package, containing the utilities for converting the music source
 (.ly) files into printable output.  The package "lilypond-documentation" 
 provides the full documentation, example .ly files for various features and 
 the Mutopia project files (musical equivalent of the Gutenberg project - see
 http://www.mutopiaproject.org for details).
- 
+
 If you are new to lilypond, you will almost certainly want to install the
 "lilypond-documentation" package in addition to the "lilypond" package.
 
@@ -56,9 +68,9 @@ LilyPond は GNU プロジェクトで開発されている楽譜作成ソフト
 とてもきれいな楽譜を作ることができます。
 
 LiLyPond は2つのパッケージにわかれています。"lilypond"パッケージがメインパッ
-ケージ"で、楽譜ソースファイル(.ly)を印刷可能な形式に変換するプログラムが入っ
+ケージで、楽譜ソースファイル(.ly)を印刷可能な形式に変換するプログラムが入っ
 てます。tex, html等に簡単に楽譜を挿入するための lilypond-book コマンドもあり
-ます．(Vine用パッケージでは，platexでの利用も可能に変更してあります．)
+ます。(Vine用パッケージでは、platexでの利用も可能に変更してあります。)
 
 "lilypond-documentation" にはマニュアルやいろいろなサンプルファイル(.ly)、
 Mutopiaプロジェクトによるいつくかのファイルが入ってます。Mutopia プロジェクト
@@ -88,6 +100,7 @@ example input files and the files from the Mutopia project.
 LiLyPond のマニュアルです．HTML ,PostScript, PDF の形式のものがあります．
 サンプルや Mutopiaプロジェクトによるファイルも入ってます．
 
+
 %prep
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,15 +110,16 @@ rm -rf $RPM_BUILD_ROOT
 %patch12 -p0
 
 %build
+%if %{?_dist_release} >= "vl7"
 sed -i "s|guile-config|guile-config-1.8|g" aclocal.m4
-autoconf 
+%endif
+autoconf
 %configure \
-	--without-kpathsea \
+  --without-kpathsea \
-	--disable-checking \
+  --disable-checking \
-	--with-ncsb-dir=%{_datadir}/fonts/default/Type1
+  --with-ncsb-dir=%{_datadir}/fonts/default/Type1
 %{__make}
 
-
 %install
 %{__rm} -rf %{buildroot}
 make install DESTDIR=$RPM_BUILD_ROOT package_infodir=%{_infodir} vimdir=%{_datadir}/vim/vim74
@@ -129,10 +143,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
 
-mkdir -p $RPM_BUILD_ROOT%{_fontdir}
+mkdir -p $RPM_BUILD_ROOT%{fontdir}
-mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf/*.otf $RPM_BUILD_ROOT%{_fontdir}
+mv $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf/*.otf $RPM_BUILD_ROOT%{fontdir}
 rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
-ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
+ln -s %{fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -140,10 +154,11 @@ ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS.txt COPYING DEDICATION INSTALL.txt NEWS.txt README.txt 
+%doc AUTHORS.txt COPYING DEDICATION INSTALL.txt NEWS.txt README.txt
-%doc ROADMAP THANKS 
+%doc ROADMAP
 %{_datadir}/emacs/site-lisp/site-start.d/%{name}-init.el
 %{_datadir}/emacs/site-lisp/lilypond*
+%{_datadir}/fonts/%{name}/
 %{_bindir}/*
 %{_infodir}/*
 %{_mandir}/man1/*
@@ -160,6 +175,15 @@ ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
 
 
 %changelog
+* Wed Oct 11 2017 Toshiaki Ara <ara_t@384.jp> 2.18.2-2
+- rebuild for Vine6
+  - revert BuildRequires: guile-devel instead of guile18-devel for Vine6
+  - skip 'sed -i "s|guile-config|guile-config-1.8|g" aclocal.m4' for Vine6
+- change BuildRequires: texlive-collection-plaingeneric
+  instead of texlive-collection-genericrecommended for VineSeed
+- change License: GPLv3
+- define %%{_fontdir}
+
 * Sun Jan 25 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18.2-1
 - update to 2.18.2
 - change BuildRequires: texlive-common instead of tetex
@@ -167,7 +191,6 @@ ln -s %{_fontdir} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/otf
 - remove Patch0,10,13
 - add BuildRequires: texlive-collection-metapost, texlive-collection-genericrecommended, rsync, dblatex, texi2html
 
-
 * Thu Apr 22 2010 Shu KONNO <owa@bg.wakwak.com> 2.12.3-1
 - updated LilyPond to 2.12.3
 - applied new versioning policy, spec in utf-8