Merge with master

[lilypond.git] / make / lilypond.fedora.spec.in

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index be2d56bad830ba1b04d50a0feb60752d82fadcf2..fafd9cd376d9df3969c95eae2c271d48d225f07e 100644 (file)
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -39,7 +39,7 @@ Group: Applications/Publishing
 
 %description documentation
 Documentation and example files of LilyPond.  An index is available at
-%{docdir}/web/Documentation/out-www/index.html
+%{docdir}/web/Documentation/index.html
 
 %prep
 %setup
@@ -53,7 +53,7 @@ Documentation and example files of LilyPond.  An index is available at
 # because RPM will gladly do a substitution anyway.
 
 # compile with static libstdc++ for better platform portability.
-./configure --enable-static-gxx --without-kpathsea --disable-checking --prefix=%{_prefix} --enable-optimising
+./configure --enable-static-gxx --disable-checking --prefix=%{_prefix} --enable-optimising
 
 
 make -j2 all
@@ -86,7 +86,7 @@ make prefix="$RPM_BUILD_ROOT%{_prefix}" \
   infodir="$RPM_BUILD_ROOT%{_infodir}"  \
   webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" web-install
 
-ln -sf ../../doc/lilypond/Documentation/user/out-www/*png $RPM_BUILD_ROOT%{_infodir}/lilypond/
+ln -sf ../../doc/lilypond/Documentation/user/*png $RPM_BUILD_ROOT%{_infodir}/lilypond/
 
 # info 
 %if %{info}
@@ -101,8 +101,9 @@ gzip -9fn `find $RPM_BUILD_ROOT%{_infodir}/ -name '*.info'`
 touch /tmp/.lilypond-install
 
 %if %{info}
-/sbin/install-info %{_infodir}/lilypond/lilypond.info.gz %{_infodir}/dir 
-/sbin/install-info %{_infodir}/lilypond/music-glossary.info.gz %{_infodir}/dir 
+  /sbin/install-info %{_infodir}/lilypond/lilypond.info.gz %{_infodir}/dir 
+  /sbin/install-info %{_infodir}/lilypond/lilypond-internals.info.gz %{_infodir}/dir 
+  /sbin/install-info %{_infodir}/lilypond/music-glossary.info.gz %{_infodir}/dir 
 %endif
 
 export PACKAGEDIR=%{_datadir}/lilypond/@TOPLEVEL_VERSION@
@@ -129,6 +130,7 @@ fi
 
 %if %{info}
     /sbin/install-info --delete %{_infodir}/lilypond/lilypond.info.gz %{_infodir}/dir 
+    /sbin/install-info --delete %{_infodir}/lilypond/lilypond-internals.info.gz %{_infodir}/dir 
     /sbin/install-info --delete %{_infodir}/lilypond/music-glossary.info.gz %{_infodir}/dir 
 %endif
 
@@ -156,6 +158,7 @@ scrollkeeper-update
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
+%{_bindir}/musicxml2ly
 %{_bindir}/lilypond-invoke-editor
 
 %doc THANKS
@@ -171,6 +174,7 @@ scrollkeeper-update
 %endif
 
 %{_mandir}/man1/abc2ly.1.gz
+%{_mandir}/man1/musicxml2ly.1.gz
 %{_mandir}/man1/convert-ly.1.gz
 %{_mandir}/man1/etf2ly.1.gz
 %{_mandir}/man1/lilypond.1.gz
@@ -181,8 +185,7 @@ scrollkeeper-update
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo
-
-# %{_libdir}/lilypond/
+%{_libdir}/lilypond/
 
 
 %files documentation
@@ -191,3 +194,7 @@ scrollkeeper-update
 
 %{docdir}
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@
+
+
+%clean
+rm -rf %{buildroot