Author: qboosh Date: Sun Oct 30 13:34:33 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.6.4 - updated info,sh,po patches, removed obsolete ps2png patch, added fhs patch - package vim syntax files
---- Files affected: SPECS: lilypond.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/lilypond.spec diff -u SPECS/lilypond.spec:1.33 SPECS/lilypond.spec:1.34 --- SPECS/lilypond.spec:1.33 Sat Nov 6 19:06:45 2004 +++ SPECS/lilypond.spec Sun Oct 30 14:34:27 2005 @@ -1,28 +1,37 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with gui # enable experimental GUI +# Summary: Music typesetter Summary(pl): Program do składania nut Name: lilypond -Version: 2.4.1 +Version: 2.6.4 Release: 1 License: GPL Group: Applications/Sound -Source0: http://lilypond.org/download/v2.4/%{name}-%{version}.tar.gz -# Source0-md5: 5fdb447c9a55c52c670c80f09bddcecf +Source0: http://lilypond.org/download/v2.6/%{name}-%{version}.tar.gz +# Source0-md5: b2df3f75851e7ef3e264570feaa52aa6 Patch0: %{name}-info.patch Patch1: %{name}-sh.patch Patch2: %{name}-po.patch -Patch3: %{name}-ps2png.patch +Patch3: %{name}-fhs.patch URL: http://www.lilypond.org/ BuildRequires: automake -BuildRequires: bison >= 1.25 +BuildRequires: bison >= 1.29 BuildRequires: flex >= 2.5.4a -BuildRequires: fontforge +BuildRequires: fontconfig-devel >= 1:2.2.0 +BuildRequires: fontforge >= 20050624 BuildRequires: gettext-devel -BuildRequires: guile-devel >= 1.6 +BuildRequires: ghostscript >= 8.15 +%{?with_gui:BuildRequires: gtk+2-devel >= 2:2.4.0} +BuildRequires: guile-devel >= 5:1.6.5 BuildRequires: kpathsea-devel BuildRequires: libltdl-devel -BuildRequires: libstdc++-devel >= 5:3.1 -BuildRequires: mftrace >= 1.0.17 +BuildRequires: libstdc++-devel >= 5:3.3 +BuildRequires: mftrace >= 1.1.9 +BuildRequires: pango-devel >= 1.6.0 +BuildRequires: pkgconfig >= 1:0.9.0 BuildRequires: python-devel >= 2.1 BuildRequires: tetex-dvips BuildRequires: tetex-fonts-cm @@ -31,8 +40,8 @@ BuildRequires: tetex-fonts-type1-ec-mftraced BuildRequires: texinfo >= 4.6 BuildConflicts: lilypond < 1.6.0 -Requires: ghostscript -Requires: guile >= 1.6 +Requires: ghostscript >= 8.15 +Requires: guile >= 5:1.6.5 Requires: python >= 2.1 Requires: tetex-fonts-type1-ec-mftraced Requires: tetex-format-latex >= 1.0 @@ -69,6 +78,19 @@ %description -n emacs-lilypond-mode-pkg -l pl Tryb edycji plików LilyPond dla Emacsa. +%package -n vim-syntax-lilypond +Summary: LilyPond files support for Vim +Summary(pl): Obsługa plików LilyPonda dla Vima +Group: Applications/Editors/Vim +Requires: %{name} = %{version}-%{release} +Requires: vim >= 4:6.4.001-2 + +%description -n vim-syntax-lilypond +LilyPond files support for Vim. + +%description -n vim-syntax-lilypond -l pl +Obsługa plików LilyPonda dla Vima. + %prep %setup -q %patch0 -p1 @@ -78,44 +100,48 @@ %build cp -f /usr/share/automake/config.* stepmake/bin +%{__autoconf} %configure \ - %{?debug:--disable-optimising} + %{?debug:--disable-optimising} \ + %{?with_gui:--enable-gui} %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{texmfdir}/{dvips,tex},%{texfontsdir}/{afm,source,tfm,type1}} +install -d $RPM_BUILD_ROOT{%{texmfdir}/{dvips/misc,tex},%{texfontsdir}/{source,tfm,type1}} %{__make} install \ - local_lilypond_datadir=$RPM_BUILD_ROOT%{_datadir}/lilypond/%{version} \ - datadir=$RPM_BUILD_ROOT%{_datadir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - localedir=$RPM_BUILD_ROOT%{_localedir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} + DESTDIR=$RPM_BUILD_ROOT -%{__perl} -pi -e "s#$RPM_BUILD_ROOT##" $RPM_BUILD_ROOT%{_bindir}/* +find $RPM_BUILD_ROOT -name fonts.cache-1 | xargs rm -f +# for dvips mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/dvips \ $RPM_BUILD_ROOT%{texmfdir}/dvips/lilypond -mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/afm \ - $RPM_BUILD_ROOT%{texfontsdir}/afm/lilypond +# ? mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/source \ $RPM_BUILD_ROOT%{texfontsdir}/source/lilypond +# for latex and dvips mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/tfm \ $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond -mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/type1 \ - $RPM_BUILD_ROOT%{texfontsdir}/type1/lilypond mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/tex \ $RPM_BUILD_ROOT%{texmfdir}/tex/lilypond -rmdir $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts +# both for lilypond and dvips +ln -sf %{_datadir}/lilypond/%{version}/fonts/type1 \ + $RPM_BUILD_ROOT%{texfontsdir}/type1/lilypond +ln -sf %{_datadir}/lilypond/%{version}/ps/music-drawing-routines.ps \ + $RPM_BUILD_ROOT%{texmfdir}/dvips/misc +# no need for subdir mv -f $RPM_BUILD_ROOT%{_infodir}/lilypond/*.info* $RPM_BUILD_ROOT%{_infodir} -# to avoid conflict with tth (call in lily.scm changed by -ps2png.patch) -mv -f $RPM_BUILD_ROOT%{_bindir}/{ps2png,lilypond-ps2png} -mv -f $RPM_BUILD_ROOT%{_mandir}/man1/{ps2png,lilypond-ps2png}.1 +# vim syntax/etc. files +install -d $RPM_BUILD_ROOT%{_datadir}/vim +mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/vim \ + $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles + +# lilypond/stepmake build system - not needed at runtime +rm -rf $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/make %find_lang %{name} @@ -142,6 +168,7 @@ %attr(755,root,root) %{_libdir}/lilypond/%{version}/python/midi.so %dir %{_datadir}/lilypond %dir %{_datadir}/lilypond/%{version} +%{_datadir}/lilypond/%{version}/fonts %{_datadir}/lilypond/%{version}/ly %{_datadir}/lilypond/%{version}/ps %dir %{_datadir}/lilypond/%{version}/python @@ -151,14 +178,11 @@ %{_infodir}/*.info* %{_mandir}/man1/* -# lilypond/stepmake build system - not needed at runtime -#%{_datadir}/lilypond/%{version}/make - -%{texfontsdir}/afm/lilypond %{texfontsdir}/source/lilypond %{texfontsdir}/tfm/lilypond %{texfontsdir}/type1/lilypond %{texmfdir}/dvips/lilypond +%{texmfdir}/dvips/misc/*.ps %{texmfdir}/tex/lilypond %{_datadir}/omf/lilypond @@ -167,12 +191,25 @@ %defattr(644,root,root,755) %{_datadir}/emacs/site-lisp/*.el +%files -n vim-syntax-lilypond +%defattr(644,root,root,755) +%{_datadir}/vim/vimfiles/compiler/lilypond.vim +%{_datadir}/vim/vimfiles/ftdetect/lilypond.vim +%{_datadir}/vim/vimfiles/ftplugin/lilypond.vim +%{_datadir}/vim/vimfiles/indent/lilypond.vim +%{_datadir}/vim/vimfiles/syntax/lilypond* + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.34 2005/10/30 13:34:27 qboosh +- updated to 2.6.4 +- updated info,sh,po patches, removed obsolete ps2png patch, added fhs patch +- package vim syntax files + Revision 1.33 2004/11/06 18:06:45 qboosh - added more POSIX sh syntax fixes to sh patch - moved more dirs into texmf tree - now works, release 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/lilypond.spec?r1=1.33&r2=1.34&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit