X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=make%2Flilypond.fedora.spec.in;h=d83a1de2ce735ba962430f58c7d1fd2d9a82d047;hb=a2b44b35df1110681fcb096ae1df74c2a47150f1;hp=c2f8e61c8b86cbede34089e95b663fb7e32c7c83;hpb=dedea139e5db0f2ee57fdb78303ab6c7c7f8ecb8;p=lilypond.git

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index c2f8e61c8b..d83a1de2ce 100644
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -8,9 +8,9 @@ Version: @TOPLEVEL_VERSION@
 Release: 1
 License: GPL
 Group: Applications/Publishing
-Source0: ftp.lilypond.org:/pub/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
+Source0: http://lilypond.org/download/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: Create and print music notation 
-URL: http://www.lilypond.org/
+URL: http://lilypond.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
@@ -18,14 +18,19 @@ Buildrequires: t1utils bison flex mftrace ImageMagick
 Buildrequires: texinfo >= 4.7
 Buildrequires: guile-devel >= 1.6.4-8 
 Buildrequires: freetype-devel >= 2.1
-#Buildrequires: fontforge >= 20041211
 
-Requires: tetex  tetex-latex libstdc++ python  tetex-dvips tetex-latex
+Buildrequires: fontforge
+#fontforge must be >= 20041211 urg. 0.0.0-fdr.1.20041211
+
+Buildrequires: pango-devel >= 1.6.0
+Buildrequires: fontconfig-devel
+
+Requires: libstdc++ python 
 Requires: guile >= 1.6.4-8 ghostscript >= 8.15
 
 %description
 LilyPond lets you create music notation.  It produces
-beautiful sheet music from  a high-level description file.
+beautiful sheet music from a high-level description file.
 
 %package documentation
 Summary:  All LilyPond documentation, in HTML
@@ -33,7 +38,7 @@ Group: Applications/Publishing
 # BuildArchitectures: noarch
 
 %description documentation
-Documentation and example files of LilyPond. An index is available at
+Documentation and example files of LilyPond.  An index is available at
 %{docdir}/web/Documentation/out-www/index.html
 
 %prep
@@ -47,7 +52,7 @@ Documentation and example files of LilyPond. An index is available at
 # In fact, do not take out the spaces between % and { in the above comment,
 # because RPM will gladly do a substitution anyway.
 
-./configure --disable-checking --prefix=%{_prefix} --enable-optimising
+./configure --without-kpathsea --disable-checking --prefix=%{_prefix} --enable-optimising
 
 
 make all
@@ -73,9 +78,7 @@ gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 
 # profile scripts.
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
-cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
+
 
 # web doc
 make prefix="$RPM_BUILD_ROOT%{_prefix}" \
@@ -95,7 +98,6 @@ gzip -9fn `find $RPM_BUILD_ROOT%{_infodir}/ -name '*.info'`
 %post
 
 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
 
 %if %{info}
 /sbin/install-info %{_infodir}/lilypond/lilypond.info.gz %{_infodir}/dir 
@@ -113,10 +115,6 @@ if [ -d /usr/share/vim ]; then
 fi
 
 
-# chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
-
-echo 'Logout first before using LilyPond.'
-
 %preun
 if [ -f /usr/share/lilypond/%{version}/ls-R ]; then
   rm -f /usr/share/lilypond/%{version}/ls-R
@@ -157,8 +155,8 @@ scrollkeeper-update
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
-%{_bindir}/ps2png
-%{_bindir}/lilypond-pdfpc-helper
+%{_bindir}/lilypond-ps2png
+%{_bindir}/lilypond-invoke-editor
 
 %doc THANKS
 %doc COPYING
@@ -179,16 +177,14 @@ scrollkeeper-update
 %{_mandir}/man1/midi2ly.1.gz
 %{_mandir}/man1/lilypond-book.1.gz
 %{_mandir}/man1/mup2ly.1.gz
-%{_mandir}/man1/ps2png.1.gz
-%{_mandir}/man1/lilypond-pdfpc-helper.1.gz
+%{_mandir}/man1/lilypond-ps2png.1.gz
+%{_mandir}/man1/lilypond-invoke-editor.1.gz
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo
 
 %{_libdir}/lilypond/
 
-/etc/profile.d/lilypond.*
-
 
 %files documentation
 
@@ -196,5 +192,3 @@ scrollkeeper-update
 
 %{docdir}
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@
-
-