*** empty log message ***

[lilypond.git] / make / lilypond.fedora.spec.in

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index 6df1069fbcba0929c51ef2ba227720fb623159e8..2d9294955d9e38ac06684d591bf845f1ce51562f 100644 (file)
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -18,10 +18,14 @@ Buildrequires: t1utils bison flex mftrace ImageMagick
 Buildrequires: texinfo >= 4.7
 Buildrequires: guile-devel >= 1.6.4-8 
 Buildrequires: freetype-devel >= 2.1
+
 Buildrequires: fontforge
 #fontforge must be >= 20041211 urg. 0.0.0-fdr.1.20041211
 
-Requires: tetex  tetex-latex libstdc++ python  tetex-dvips tetex-latex
+Buildrequires: pango-devel >= 1.6.0
+Buildrequires: fontconfig-devel
+
+Requires: libstdc++ python 
 Requires: guile >= 1.6.4-8 ghostscript >= 8.15
 
 %description
@@ -48,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
@@ -74,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}" \
@@ -96,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 
@@ -114,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
@@ -158,7 +155,7 @@ scrollkeeper-update
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
-%{_bindir}/ps2png
+%{_bindir}/lilypond-ps2png
 %{_bindir}/lilypond-pdfpc-helper
 
 %doc THANKS
@@ -180,7 +177,7 @@ 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-ps2png.1.gz
 %{_mandir}/man1/lilypond-pdfpc-helper.1.gz
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
@@ -188,8 +185,6 @@ scrollkeeper-update
 
 %{_libdir}/lilypond/
 
-/etc/profile.d/lilypond.*
-
 
 %files documentation