remove menu, sync with redhat-spec.

diff --git a/ChangeLog b/ChangeLog
index 56d9ea93cf0e79ee938c64a2c22de12ce89c530e..96022a7767c884f5bed5b858bd309c407f0451f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-07  Heikki Junes <hjunes@cc.hut.fi>
+
+       * make/lilypond.mandrake.spec.in: remove menu, sync with redhat-spec.
+
 2003-08-07  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * GNUmakefile.in (local-WWW-post): footify build fix.

diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in
index a37eb2e17dd6c83ff8c0fce75b05178a8144c4f2..cd45ef6f16bbf657545ddf834469cf9da3a7d963 100644 (file)
--- a/make/lilypond.mandrake.spec.in
+++ b/make/lilypond.mandrake.spec.in
@@ -13,8 +13,12 @@ Group:               Applications/Publishing
 URL:           http://www.lilypond.org/
 Source0:       ftp.lilypond.org:/pub/LilyPond/development/lilypond-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-buildroot
-BuildRequires: t1utils bison flex mftrace texinfo
+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
 
 %description
 LilyPond is a music typesetter.  It produces beautiful sheet music using a
@@ -50,7 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 # -- not sure what this comment means; it's a relic from the PPC spec file -- mbrown@fensystems.co.uk
 ##./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimising --enable-shared
 ## Add options if needed
+
 ./configure --disable-checking --prefix=%{_prefix} --enable-optimising
+
 %make MAKE_PFA_FILES=1 all
 make -C mf/ pfa
 
@@ -87,46 +93,45 @@ 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
 
-# again, make sure that main package installs even if doco fails
-mkdir -p web/out
-tar -C web -xzf out/web.tar.gz 
-
+# 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} <<EOF
-?package(%name):\
-  command="info %{name}"\
-  needs="text"\
-  icon="%{name}.xpm"\
-  section="Documentation"\
-  title="%{name}-info"\
-  longtitle="%{name} Info"
-EOF
+#
+# mkdir -p $RPM_BUILD_ROOT%{_menudir}
+# cat >$RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
+# ?package(%name):\
+  # command="info %{name}"\
+  # needs="text"\
+  # icon="%{name}.xpm"\
+  # section="Documentation"\
+  # title="%{name}-info"\
+  # longtitle="%{name} Info"
+# EOF
   
-cat >$RPM_BUILD_ROOT%{_menudir}/%{name}-documentation <<EOF
-?package(%name):\
-  command="\$BROWSER %{_docdir}/%{name}-documentation-%{version}/web/index.html"\
-  needs="X11"\
-  icon="%{name}.xpm"\
-  section="Documentation"\
-  title="%{name}-documentation"\
-  longtitle="%{name} Documentation"
-EOF
-
-# icon
-install -d $RPM_BUILD_ROOT/%{_miconsdir}
-install -d $RPM_BUILD_ROOT/%{_iconsdir}
-install -d $RPM_BUILD_ROOT/%{_liconsdir}
-install -m 644 Documentation/pictures/%{name}-16x16.xpm $RPM_BUILD_ROOT/%{_miconsdir}/%{name}.xpm
-install -m 644 Documentation/pictures/%{name}-32x32.xpm $RPM_BUILD_ROOT/%{_iconsdir}/%{name}.xpm
-install -m 644 Documentation/pictures/%{name}-48x48.xpm $RPM_BUILD_ROOT/%{_liconsdir}/%{name}.xpm
+# cat >$RPM_BUILD_ROOT%{_menudir}/%{name}-documentation <<EOF
+# ?package(%name):\
+  # command="\$BROWSER %{_docdir}/%{name}-documentation-%{version}/web/index.html"\
+  # needs="X11"\
+  # icon="%{name}.xpm"\
+  # section="Documentation"\
+  # title="%{name}-documentation"\
+  # longtitle="%{name} Documentation"
+# EOF
+# # 
+# # icon
+# install -d $RPM_BUILD_ROOT/%{_miconsdir}
+# install -d $RPM_BUILD_ROOT/%{_iconsdir}
+# install -d $RPM_BUILD_ROOT/%{_liconsdir}
+# install -m 644 Documentation/pictures/%{name}-16x16.xpm $RPM_BUILD_ROOT/%{_miconsdir}/%{name}.xpm
+# install -m 644 Documentation/pictures/%{name}-32x32.xpm $RPM_BUILD_ROOT/%{_iconsdir}/%{name}.xpm
+# install -m 644 Documentation/pictures/%{name}-48x48.xpm $RPM_BUILD_ROOT/%{_liconsdir}/%{name}.xpm
 
 %post
-%{update_menus}
+# Menu is not used.
+# %{update_menus}
 
 touch /tmp/.lilypond-install
 rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm' -print` /tmp/.lilypond-install
@@ -138,6 +143,8 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan
 /usr/X11R6/bin/mkfontdir %{_datadir}/lilypond/%{version}/fonts/type1/
 chkfontpath --add=%{_datadir}/lilypond/%{version}/fonts/type1/
 
+echo 'Please logout first before using LilyPond.'
+
 %preun
 
 %if %{info}
@@ -156,14 +163,15 @@ scrollkeeper-update
 scrollkeeper-update
 
 %postun
-%{clean_menus}
+# Menu is not used.
+# %{clean_menus}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc COPYING README.txt INSTALL.txt DEDICATION NEWS AUTHORS.txt THANKS
+%doc COPYING README.txt INSTALL.txt DEDICATION NEWS.txt AUTHORS.txt THANKS
 
 %{_datadir}/emacs/site-lisp/site-start.d/lilypond-*
 %{_datadir}/emacs/site-lisp/lilypond*
@@ -177,22 +185,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/../etc/profile.d/lilypond.*
 %_bindir/*
 %_mandir/*
-%_menudir/*
-%_iconsdir/*
+# Menu is not used.
+# %_menudir/*
+# %_iconsdir/*
 
 %{_libdir}/lilypond/
 
 %doc 
-# % {_docdir}/lilypond-@TOPLEVEL_VERSION@
 
 %files documentation
 %defattr(-, root, root)
 
-%doc web 
-# % {_docdir}/lilypond-documentation-@TOPLEVEL_VERSION@
+%{_docdir}/*
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@
 
 %changelog
+* Thu Aug 07 2003 Heikki Johannes Junes <hjunes@cc.hut.fi> 1.8.0-1mdk
+- removed menu and icons, sync with redhat-spec
+
 * Thu Jun 12 2003 Heikki Johannes Junes <hjunes@cc.hut.fi> 1.7.20-1mdk
 - refreshed dependencies and file list.