Hello community, here is the log from the commit of package lilypond for openSUSE:Factory checked in at 2017-03-12 20:02:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lilypond (Old) and /work/SRC/openSUSE:Factory/.lilypond.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lilypond" Sun Mar 12 20:02:51 2017 rev:20 rq:477519 version:2.18.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lilypond/lilypond-doc.changes 2015-08-03 17:21:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lilypond.new/lilypond-doc.changes 2017-03-12 20:02:55.746848888 +0100 @@ -1,0 +2,5 @@ +Sun Mar 5 16:17:59 UTC 2017 - [email protected] + +- Some minor cleanup + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/lilypond/lilypond.changes 2015-08-03 17:21:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lilypond.new/lilypond.changes 2017-03-12 20:02:55.774844926 +0100 @@ -1,0 +2,7 @@ +Sun Mar 5 16:17:23 UTC 2017 - [email protected] + +- Use correct vim directory +- Cleanup of the spec file + * Install info files correctly (fixes RPMLint warnings) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilypond-doc.spec ++++++ --- /var/tmp/diff_new_pack.EJTbU7/_old 2017-03-12 20:02:56.786701748 +0100 +++ /var/tmp/diff_new_pack.EJTbU7/_new 2017-03-12 20:02:56.790701182 +0100 @@ -1,7 +1,7 @@ # # spec file for package lilypond-doc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,17 @@ # -Name: lilypond-doc %define ver 2.18 %define plevel 2 +Name: lilypond-doc Version: %{ver}.%{plevel} Release: 0 +Summary: Documentation for the LilyPond Typesetter +License: GFDL-1.3 +Group: Documentation/HTML +Url: http://lilypond.org/ +Source0: http://download.linuxaudio.org/lilypond/sources/v%{ver}/lilypond-%{version}.tar.gz +BuildRequires: ImageMagick-extra BuildRequires: autoconf BuildRequires: autotrace BuildRequires: bison @@ -30,69 +36,60 @@ BuildRequires: flex BuildRequires: fontconfig-devel >= 2.4.0 BuildRequires: fontforge-devel +BuildRequires: fonts-arabic BuildRequires: freetype2-devel >= 2.1.10 BuildRequires: gcc-c++ BuildRequires: gentium BuildRequires: gettext-tools -BuildRequires: ghostscript-fonts-other -BuildRequires: lilypond = %{version} #BuildRequires: ghostscript-fonts-rus BuildRequires: ghostscript >= 8.60 +BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std BuildRequires: guile1 >= 1.8.2 BuildRequires: gzip +BuildRequires: ifntjapa BuildRequires: libgnutls-devel BuildRequires: libguile1-devel >= 1.8.2 BuildRequires: libtool +BuildRequires: lilypond = %{version} BuildRequires: lndir BuildRequires: mftrace +BuildRequires: netpbm BuildRequires: pango-devel >= 1.12 BuildRequires: perl BuildRequires: python-devel >= 2.4 +BuildRequires: rsync BuildRequires: t1utils BuildRequires: texlive-lh BuildRequires: texlive-metapost +BuildRequires: ttf-wqy-zenhei +BuildRequires: xfntjp +BuildRequires: xorg-x11-fonts BuildRequires: zip - -BuildRequires: ImageMagick-extra -BuildRequires: netpbm -BuildRequires: rsync - +Requires: lilypond = %{version} +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{install_info_prereq} %{_bindir}/touch %{_bindir}/sed +Provides: lilypond-documentation = %{version} +Obsoletes: lilypond-documentation < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if 0%{?suse_version} > 1320 +Patch0: lilypond-doc-texinfo4.patch # 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 +BuildRequires: texlive-filesystem %endif -BuildRequires: fonts-arabic -BuildRequires: ifntjapa -BuildRequires: lilypond = %{version} -BuildRequires: ttf-wqy-zenhei -BuildRequires: xfntjp -BuildRequires: xorg-x11-fonts -Requires: lilypond = %{version} -Provides: lilypond-documentation = %{version} -Obsoletes: lilypond-documentation < %{version} -Summary: Documentation for the LilyPond Typesetter -License: GFDL-1.3 -Group: Documentation/HTML -BuildArch: noarch -Url: http://lilypond.org/ -Source0: http://download.linuxaudio.org/lilypond/sources/v%{ver}/lilypond-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %install_info_prereq /usr/bin/touch /usr/bin/sed - %description Common and english documentation files for the GNU LilyPond music typesetter. %global rlversion %{version} %define usrsrcp %{buildroot} - %define _configure ./smart-configure.sh %package cs @@ -191,7 +188,7 @@ export CFLAGS="$CFLAGS -fno-optimize-sibling-calls" %endif export GUILE_AUTO_COMPILE=0 -export CFLAGS="$RPM_OPT_FLAGS -ggdb -fpermissive -fabi-version=4" +export CFLAGS="%{optflags} -ggdb -fpermissive -fabi-version=4" export CXXFLAGS="$CFLAGS" export LILYPOND_EXTERNAL_BINARY="%{_bindir}/lilypond" export LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY @@ -209,7 +206,7 @@ #|| (lndir -ignorelinks out-www/notation . && \ #LILYPOND_EXTERNAL_BINARY="%%{_bindir}/lilypond" LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY make doc) popd -make out=www WWW-post +make -j1 out=www WWW-post %install mkdir -p "%{buildroot}%{_datadir}/lilypond/%{rlversion}" @@ -226,7 +223,7 @@ then break; else chmod -f 0755 `find %{buildroot}%{_datadir}/lilypond/ -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ fi -LILYPOND_EXTERNAL_BINARY=/usr/bin/lilypond +LILYPOND_EXTERNAL_BINARY=%{_bindir}/lilypond %find_lang lilypond texhash %{buildroot}%{_datadir}/lilypond/%{rlversion} find %{buildroot}%{_docdir}/lilypond/ -type f -empty -delete -print ++++++ lilypond.spec ++++++ --- /var/tmp/diff_new_pack.EJTbU7/_old 2017-03-12 20:02:56.806698917 +0100 +++ /var/tmp/diff_new_pack.EJTbU7/_new 2017-03-12 20:02:56.810698352 +0100 @@ -1,7 +1,7 @@ # # spec file for package lilypond # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,27 +18,18 @@ %define fontdir %{_datadir}/fonts %define ttfdir %{fontdir}/truetype - Name: lilypond -%define ver 2.18 -%define plevel 2 -Version: %{ver}.%{plevel} +Version: 2.18.2 Release: 0 Summary: A typesetting system for music notation License: GPL-3.0+ Group: Productivity/Publishing/Other - Url: http://www.lilypond.org -Source0: http://download.linuxaudio.org/lilypond/sources/v%{ver}/lilypond-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -Requires: ghostscript >= 8.15 -Requires: lilypond-century-schoolbook-l-fonts = %{version} -Requires: lilypond-emmentaler-fonts = %{version} - +Source0: http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-%{version}.tar.gz BuildRequires: ImageMagick BuildRequires: autotrace BuildRequires: bison +BuildRequires: dblatex BuildRequires: flex BuildRequires: fontforge BuildRequires: gcc-c++ @@ -46,36 +37,35 @@ BuildRequires: ghostscript >= 8.15 BuildRequires: ghostscript-fonts-std BuildRequires: libguile1-devel >= 1.8 +BuildRequires: makeinfo BuildRequires: mftrace >= 1.1.19 +# Needed for pngtopnm +BuildRequires: netpbm +BuildRequires: pkgconfig 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 -BuildRequires: texlive-latex -BuildRequires: texlive-metapost -%endif BuildRequires: vim-base BuildRequires: zip BuildRequires: pkgconfig(pango) >= 1.12.0 +Requires(post): %install_info_prereq +Requires(preun): %install_info_prereq +Requires: ghostscript >= 8.15 +Requires: lilypond-century-schoolbook-l-fonts = %{version} +Requires: lilypond-emmentaler-fonts = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Package texi2html was split off from texinfo in current Factory. +%if 0%{?suse_version} > 1320 +BuildRequires: texi2html +%else +BuildRequires: texlive-filesystem +%endif %description LilyPond is an automated music engraving system. It formats music @@ -124,13 +114,15 @@ %setup -q %build -%configure --without-kpathsea --disable-checking \ +%configure --without-kpathsea \ + --disable-checking \ --with-ncsb-dir=%{_datadir}/ghostscript/fonts/ -make +make -j1 %install -make install DESTDIR=%{buildroot} package_infodir=%{_infodir} \ - vimdir=%{_datadir}/vim/vim73 +vimver=$(vim --version | head -n1 | grep -Po "\d\.\d" | sed 's|\.||') +%make_install package_infodir=%{_infodir} \ + vimdir="%{_datadir}/vim/vim$vimver" chmod +x %{buildroot}%{_libdir}/%{name}/%{version}/python/midi.so @@ -156,6 +148,28 @@ rmdir %{buildroot}%{_datadir}/lilypond/%{version}/fonts/otf ln -s %{ttfdir} %{buildroot}%{_datadir}/lilypond/%{version}/fonts/otf +%post +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-changes.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-contributor.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-essay.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-extending.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-internals.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-learning.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-notation.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-usage.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/lilypond-web.info.gz + +%preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-changes.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-contributor.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-essay.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-extending.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-internals.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-learning.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-notation.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-usage.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/lilypond-web.info.gz + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS.txt COPYING DEDICATION HACKING LICENSE* @@ -165,7 +179,7 @@ %{_datadir}/lilypond %{_datadir}/emacs/site-lisp %{_datadir}/vim/vim* -%{_infodir}/*.gz +%{_infodir}/*%{ext_info} %{_mandir}/man1/* %files century-schoolbook-l-fonts
