From 628ed6264818560d00ac34a438ad31d81f4d4460 Mon Sep 17 00:00:00 2001 From: Heikki Junes Date: Mon, 25 Aug 2003 12:11:04 +0000 Subject: [PATCH] sync with Torbjorn Turpeinen. --- ChangeLog | 8 ++ make/lilypond.mandrake.spec.in | 144 +++++++++++++++++++-------------- 2 files changed, 93 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbe8f4a54e..b1984f8daf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-08-25 Heikki Junes + + * make/lilypond.mandrake.spec.in: syncronize the spec file with + Torbjorn Turpeinen (tobbe@nyvalls.se): fix group, update reqs, + package libs separately, fix conflicting php variable out=/dev/vc/ + invoking `unset out', declare menus, use only one icon-file, fix + doc-path in menu. + 2003-08-25 Han-Wen Nienhuys * flower/include/string-handle.icc: formatting cleanups, rename diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index a29e361224..a4b4b59409 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -2,23 +2,24 @@ %define name lilypond %define version @TOPLEVEL_VERSION@ -%define release 1mdk +%define release 3mdk Summary: A program for printing sheet music. Name: %{name} Version: %{version} Release: %{release} License: GPL -Group: Applications/Publishing +Group: Publishing URL: http://www.lilypond.org/ -Source0: ftp.lilypond.org:/pub/LilyPond/development/lilypond-%{version}.tar.gz +Source0: ftp.lilypond.org:/pub/LilyPond/development/lilypond-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-buildroot -BuildRequires: t1utils bison flex texinfo -#There is not a recent rpm provided for the following; compile LilyPond anyway: -#BuildRequires: mftrace -Requires: tetex tetex-latex python chkfontpath info-install XFree86 -#There is not a recent rpm provided for the following: install LilyPond anyway: -#Requires: guile >= 1.6.4-7 +BuildRequires: t1utils bison texinfo t1lib1-devel libstdc++5-devel libguile12-devel >= 1.6.4 +BuildRequires: gcc-c++ glibc-devel flex >= 2.5.4a-22mdk groff netpbm autotrace +BuildRequires: ImageMagick >= 5.5.4.4 libMagick5.5.4-devel >= 5.5.4.4 +BuildRequires: ghostscript >= 7.05-53.2mdk mftrace >= 1.0.19 pfaedit >= 030822 +Requires: tetex tetex-latex chkfontpath XFree86 info-install +PreReq: chkfontpath + %description LilyPond is a music typesetter. It produces beautiful sheet music using a @@ -33,10 +34,19 @@ http://www.mutopiaproject.org for details). If you are new to lilypond, you will almost certainly want to install the "lilypond-documentation" package in addition to the "lilypond" package. + +%package -n liblilypond +Summary: LilyPond libraries. +License: GPL +Group: System/Libraries +Requires: lilypond >= %{version} + +%description -n liblilypond +LilyPond libs %package documentation Summary: LilyPond documentation, examples and Mutopia files. -Group: Applications/Publishing +Group: Publishing Requires: %{name} %description documentation @@ -55,7 +65,10 @@ rm -rf $RPM_BUILD_ROOT ##./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimising --enable-shared ## Add options if needed -./configure --disable-checking --prefix=%{_prefix} --enable-optimising +#Fix conflicting php variable out=/dev/vc/ +unset out + +./configure --disable-checking --prefix=%{_prefix} --libdir=%{_libdir} --enable-optimising %make MAKE_PFA_FILES=1 all make -C mf/ pfa @@ -64,11 +77,14 @@ make -C mf/ pfa make -C Documentation # make html -make web +make web make -C Documentation/user omf %install +#Fix conflicting php variable out=/dev/vc/ +unset out + # Create installation root folders rm -rf $RPM_BUILD_ROOT RPM_DOC_ROOT=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -77,6 +93,7 @@ mkdir -p $RPM_DOC_ROOT strip lily/out/lilypond %makeinstall MAKE_PFA_FILES=1 +local_lilypond_libdir=$RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version} %if %{info} rm -f $RPM_BUILD_ROOT/%{_infodir}/dir @@ -93,45 +110,41 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh -make prefix="$RPM_BUILD_ROOT%{_prefix}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" out=www web-install +make prefix="$RPM_BUILD_ROOT%{_prefix}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/%{name}-documentation-%{version}/" out=www web-install -# Menu is not used. # Menu # Every entry must be changed according package specifications # Pay attention to "section" "command" and "longtitle" -# -# mkdir -p $RPM_BUILD_ROOT%{_menudir} -# cat >$RPM_BUILD_ROOT%{_menudir}/%{name} <$RPM_BUILD_ROOT%{_menudir}/%{name} <$RPM_BUILD_ROOT%{_menudir}/%{name}-documentation <$RPM_BUILD_ROOT%{_menudir}/%{name}-documentation < 1.8.1-3mdk +- Fixed doc-path in menu. + +* Thu Aug 23 2003 Heikki Johannes Junes 1.8.1-1mdk +* Sun Aug 24 2003 Torbjorn Turpeinen 1.8.1-2mdk +- Added Heikki Johannes Junes fix for confilcting PHP variable + out=/dev/vc/ by adding unset out before compiling +- Compiled with recent guile = 1.6.4 and mftrace = 1.0.19 +- Changed icon to lilypond.png +- Added menu and icons again + * Thu Aug 07 2003 Heikki Johannes Junes 1.8.0-1mdk - removed menu and icons, sync with redhat-spec -* Thu Jun 12 2003 Heikki Johannes Junes 1.7.20-1mdk +* Thu Jun 12 2003 Heikki Johannes Junes 1.7.23-1mdk - refreshed dependencies and file list. +* Sat Feb 01 2003 Torbjorn Turpeinen 1.7.12-1mdk +- Built for Mandrake 9.1 + * Fri Dec 01 2002 Heikki Johannes Junes 1.7.9-1mdk - set menu-items to lilypond-info and lilypond-documentation. -- 2.39.2