Hello community,
here is the log from the commit of package lilypond for openSUSE:Factory checked in at 2015-08-03 17:21:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lilypond (Old)
and /work/SRC/openSUSE:Factory/.lilypond.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lilypond"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lilypond/lilypond-doc.changes 2014-12-16 14:49:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lilypond.new/lilypond-doc.changes 2015-08-03 17:21:55.000000000 +0200
@@ -1,0 +2,22 @@
+Fri Jul 17 14:19:14 UTC 2015 - davejplater@gmail.com
+
+- Created package texinfo4 from 13.2's texinfo package to fix the
+ documentation build in Factory and future openSUSE versions
+ until upstream have fixed the problem. See bnc#936870
+- Added patch lilypond-doc-texinfo4.patch to enable lilypond to use
+ the texinfo4 binaries to build the documentation.
+
+-------------------------------------------------------------------
+Wed Jul 1 19:11:46 UTC 2015 - tjcw@physics.org
+
+- Uncomment texi2html BuildRequires: to fix build break
+ Note, the build can go for tens of minutes without producing any output.
+ It will eventually make progress.
+
+-------------------------------------------------------------------
+Tue Feb 24 15:06:52 UTC 2015 - dimstar@opensuse.org
+
+- Add texi2html BuildRequires: this was split off from texinfo (as
+ it's in fact an independent upstream tarball).
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/lilypond/lilypond.changes 2014-04-02 17:24:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lilypond.new/lilypond.changes 2015-08-03 17:21:55.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Jul 1 19:10:27 UTC 2015 - tjcw@physics.org
+
+- Add netpbm BuildRequires in all paths, to fix build break
+
+-------------------------------------------------------------------
+Tue Feb 24 15:05:40 UTC 2015 - dimstar@opensuse.org
+
+- Add netpbm BuildRequires: needed for pngtopnm.
+
+-------------------------------------------------------------------
New:
----
lilypond-doc-texinfo4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilypond-doc.spec ++++++
--- /var/tmp/diff_new_pack.hF5wkF/_old 2015-08-03 17:21:57.000000000 +0200
+++ /var/tmp/diff_new_pack.hF5wkF/_new 2015-08-03 17:21:57.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lilypond-doc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,9 +35,10 @@
BuildRequires: gentium
BuildRequires: gettext-tools
BuildRequires: ghostscript-fonts-other
+BuildRequires: lilypond = %{version}
#BuildRequires: ghostscript-fonts-rus
+BuildRequires: ghostscript >= 8.60
BuildRequires: ghostscript-fonts-std
-BuildRequires: ghostscript-library >= 8.60
BuildRequires: guile1 >= 1.8.2
BuildRequires: gzip
BuildRequires: libgnutls-devel
@@ -56,7 +57,17 @@
BuildRequires: ImageMagick-extra
BuildRequires: netpbm
BuildRequires: rsync
+
+%if 0%{?suse_version} > 1320
+# NOTE: when lilypond documentation build with texinfo 5.x is fixed by upstream remove patch, the 4s from makeinfo,
+# NOTE: texinfo and update buildrequires with:
+#BuildRequires: texi2html
+BuildRequires: makeinfo4
+BuildRequires: texinfo4
+Patch0: lilypond-doc-texinfo4.patch
+%else
BuildRequires: texinfo
+%endif
BuildRequires: fonts-arabic
BuildRequires: ifntjapa
@@ -158,6 +169,9 @@
%prep
%setup -q -n lilypond-%{version}
+%if 0%{?suse_version} > 1320
+%patch0
+%endif
# Convert translations to UTF-8
for file in $(grep -L charset=UTF-8 po/*.po) ; do
msgconv -t UTF-8 $file >$file.new
@@ -171,7 +185,7 @@
%build
chmod 644 Documentation/pictures/*.png
# export GS_LIB="/home/$USER/.fonts" is a work around for bnc#568280
-#export GS_LIB="/home/$USER/.fonts:%{_buildir}/mf/out"
+#export GS_LIB="/home/$USER/.fonts:%%{_buildir}/mf/out"
export CFLAGS="-fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ggdb"
%if 0%{?suse_version} == 1210
export CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
@@ -181,17 +195,19 @@
export CXXFLAGS="$CFLAGS"
export LILYPOND_EXTERNAL_BINARY="%{_bindir}/lilypond"
export LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY
-%configure --with-ncsb-dir=%{_datadir}/ghostscript/fonts/
+rm configure
./smart-autogen.sh --noconfigure
+%configure --with-ncsb-dir=%{_datadir}/ghostscript/fonts/
# build documentation
echo "*********************************"
echo "* Start the documentation build *"
echo "*********************************"
pushd Documentation
-# Don't build documentation paralelly. It fails randomly.
+# Don't build documentation in paralell. It fails randomly.
LILYPOND_EXTERNAL_BINARY="%{_bindir}/lilypond" LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY make -e doc \
-|| (lndir -ignorelinks out-www/notation . && \
-LILYPOND_EXTERNAL_BINARY="%{_bindir}/lilypond" LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY make doc)
+|| (cat internals.texi2pdf.log && false)
+#|| (lndir -ignorelinks out-www/notation . && \
+#LILYPOND_EXTERNAL_BINARY="%%{_bindir}/lilypond" LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY make doc)
popd
make out=www WWW-post
@@ -249,18 +265,15 @@
echo "%%exclude %{_docdir}/lilypond/$f" >> files-en
done
echo "%%exclude %{_datadir}/lilypond/%{rlversion}/ls-R" >> files-en
+#rm %%{_infodir}/lilypond || :
%post
-rm %{_infodir}/lilypond || :
-ln -s %{_docdir}/lilypond/Documentation %{_infodir}/lilypond
-%install_info --info-dir=%{_infodir} %{_infodir}/lilypond
+ln -sf %{_docdir}/lilypond/Documentation %{_infodir}/lilypond && \
+%install_info --debug --info-dir=%{_infodir} --info-file=%{_infodir}/lilypond.gz
%postun
rm -f %{_infodir}/lilypond
-%files -f files-en
-%defattr(-,root,root)
-
%files cs -f files-cs
%defattr(-,root,root)
@@ -288,4 +301,7 @@
%files zh -f files-zh
%defattr(-,root,root)
+%files -f files-en
+%defattr(-,root,root)
+
%changelog
++++++ lilypond.spec ++++++
--- /var/tmp/diff_new_pack.hF5wkF/_old 2015-08-03 17:21:57.000000000 +0200
+++ /var/tmp/diff_new_pack.hF5wkF/_new 2015-08-03 17:21:57.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lilypond
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,17 +50,23 @@
BuildRequires: python-devel >= 2.4.0
BuildRequires: rsync
BuildRequires: t1utils
+# Package texi2html was split off from texinfo in current Factory.
+%if 0%{?suse_version} > 1320
BuildRequires: texi2html
+%endif
BuildRequires: texinfo >= 4.8
%if %suse_version > 1220
BuildRequires: dblatex
BuildRequires: makeinfo
+# Needed for pngtopnm
+BuildRequires: netpbm
BuildRequires: texlive-extratools
BuildRequires: texlive-latex
BuildRequires: texlive-lh
BuildRequires: texlive-metafont
BuildRequires: texlive-metapost
%else
+BuildRequires: netpbm
BuildRequires: texlive
BuildRequires: texlive-bin
BuildRequires: texlive-bin-tools
++++++ lilypond-doc-texinfo4.patch ++++++
Index: configure.ac
===================================================================
--- configure.ac.orig 2014-03-17 17:29:16.000000000 +0200
+++ configure.ac 2015-07-18 13:29:33.709776183 +0200
@@ -226,14 +226,14 @@ fi
STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
-STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
+STEPMAKE_PROGS(MAKEINFO, makeinfo4, REQUIRED, 4.11)
+STEPMAKE_PROGS(TEXI2HTML, texi2html4, $DOCUMENTATION_REQUIRED, 1.82)
STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED)
STEPMAKE_PROGS(PDFTEX, pdfetex pdftex etex, $DOCUMENTATION_REQUIRED)
-STEPMAKE_PROGS(TEXI2PDF, texi2pdf, $DOCUMENTATION_REQUIRED)
-STEPMAKE_PROGS(TEXINDEX, texindex, $DOCUMENTATION_REQUIRED)
+STEPMAKE_PROGS(TEXI2PDF, texi2pdf4, $DOCUMENTATION_REQUIRED)
+STEPMAKE_PROGS(TEXINDEX, texindex4, $DOCUMENTATION_REQUIRED)
AC_MSG_CHECKING(for epsf.tex)
TEX_EPSF=`kpsewhich tex epsf`
if test "$TEX_EPSF" = ""; then
Index: scripts/lilypond-book.py
===================================================================
--- scripts/lilypond-book.py.orig 2014-03-17 17:29:16.000000000 +0200
+++ scripts/lilypond-book.py 2015-07-18 13:29:33.709776183 +0200
@@ -245,7 +245,7 @@ case --pdf option is set instead of pdfl
help=_ ("run executable PROG instead of texi2pdf"),
metavar=_ ("PROG"),
action='store', dest='texinfo_program',
- default='texi2pdf')
+ default='texi2pdf4')
group.add_option ('--pdf',
action="store_true",
dest="create_pdf",
Index: stepmake/stepmake/texinfo-rules.make
===================================================================
--- stepmake/stepmake/texinfo-rules.make.orig 2014-03-17 17:29:16.000000000 +0200
+++ stepmake/stepmake/texinfo-rules.make 2015-07-18 13:43:46.163460072 +0200
@@ -68,9 +68,9 @@ endif
$(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi $(outdir)/%.pdf.omf $(outdir)/weblinks.itexi | $(OUT_TEXINFO_MANUALS)
ifeq ($(WEB_VERSION),yes)
- $(buildscript-dir)/run-and-check "cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) -D web_version -I $(abs-src-dir) $(TEXINFO_PAPERSIZE_OPTION) $(