From f357c153aaa563af7448c3006b4527e63d746ce6 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Dec 20 2010 19:51:42 +0000 Subject: Merge branch 'master' into f14 --- diff --git a/lilypond.spec b/lilypond.spec index 0ad0c64..e5e8626 100644 --- a/lilypond.spec +++ b/lilypond.spec @@ -1,6 +1,6 @@ Name: lilypond Version: 2.13.39 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A typesetting system for music notation Group: Applications/Publishing @@ -167,7 +167,7 @@ make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT package_infodir=%{_infodir} \ - vimdir=%{_datadir}/vim/vim72 + vimdir=%{_datadir}/vim/vim73 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}/python/midi.so @@ -237,6 +237,9 @@ fi %changelog +* Mon Dec 20 2010 Jon Ciesla - 2.13.39-2 +- Update for new vim, BZ 663889. + * Mon Nov 15 2010 Jon Ciesla - 2.13.39-1 - Update to first Beta for 2.14.x to fix FTBFS BZ 631363.