rpms/Inventor/F-8 .cvsignore, 1.8, 1.9 Inventor.spec, 1.42, 1.43 sources, 1.7, 1.8

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/Inventor/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22078

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
* Mon Nov 19 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-30.1
- Add hard-coded deps on font files (BZ 388761).
- Switch to using liberation-fonts instead of dejavu-fonts.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Inventor/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Aug 2007 12:58:52 -0000	1.8
+++ .cvsignore	19 Nov 2007 04:09:26 -0000	1.9
@@ -1,3 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
-Inventor-2.1.5-27.diff.bz2
 Inventor-2.1.5-30.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Inventor/F-8/Inventor.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Inventor.spec	17 Aug 2007 12:58:52 -0000	1.42
+++ Inventor.spec	19 Nov 2007 04:09:26 -0000	1.43
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        30%{?dist}
+Release:        30%{?dist}.1
 
 Summary:        SGI Open Inventor (TM)
 
@@ -44,8 +44,33 @@
 # Workaround to RH shipping bison with broken package dependencies
 BuildRequires:	m4
 BuildRequires:	/bin/csh
-BuildRequires:  dejavu-fonts
-Requires:	dejavu-fonts
+
+# fonts
+BuildRequires: /usr/share/fonts/liberation/LiberationSerif-Regular.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationSerif-Bold.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationSerif-Italic.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationSerif-BoldItalic.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationSans-Regular.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationSans-Bold.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationSans-Italic.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationSans-BoldItalic.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationMono-Regular.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationMono-Bold.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationMono-Italic.ttf
+BuildRequires: /usr/share/fonts/liberation/LiberationMono-BoldItalic.ttf
+
+Requires: /usr/share/fonts/liberation/LiberationSerif-Regular.ttf
+Requires: /usr/share/fonts/liberation/LiberationSerif-Bold.ttf
+Requires: /usr/share/fonts/liberation/LiberationSerif-Italic.ttf
+Requires: /usr/share/fonts/liberation/LiberationSerif-BoldItalic.ttf
+Requires: /usr/share/fonts/liberation/LiberationSans-Regular.ttf
+Requires: /usr/share/fonts/liberation/LiberationSans-Bold.ttf
+Requires: /usr/share/fonts/liberation/LiberationSans-Italic.ttf
+Requires: /usr/share/fonts/liberation/LiberationSans-BoldItalic.ttf
+Requires: /usr/share/fonts/liberation/LiberationMono-Regular.ttf
+Requires: /usr/share/fonts/liberation/LiberationMono-Bold.ttf
+Requires: /usr/share/fonts/liberation/LiberationMono-Italic.ttf
+Requires: /usr/share/fonts/liberation/LiberationMono-BoldItalic.ttf
 
 %description
 SGI Open Inventor(TM) is an object-oriented 3D toolkit offering a
@@ -218,34 +243,22 @@
 install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
 
 # Map Inventor's standard fonts
-# Utopia, Helvetica and Courier to DejaVu-TTF fonts
+# Utopia, Helvetica and Courier to liberation-TTF fonts
 # Times-Roman is being used by some examples
 pushd ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts > /dev/null
-for font in "Times-Roman" \
-  "Utopia-Regular" "Utopia-Bold" \
-  "Utopia-Italic" "Utopia-BoldItalic" \
-  "Helvetica" "Helvetica-Bold" \
-  "Helvetica-Oblique" "Helvetica-BoldOblique" \
-  "Courier" "Courier-Bold" \
-  "Courier-Oblique" "Courier-BoldOblique"
-do
-case $font in
-Helvetica*) d=DejaVuSans;;
-Courier*)   d=DejaVuSerifCondensed;;
-*)          d=DejaVuSerif;;
-esac
-
-case $font in
-*-Regular);;
-*-Bold) d="$d-Bold";;
-*-Oblique) d="$d-Oblique";;
-*-Italic) d="$d-Oblique";;
-*-BoldItalic) d="$d-BoldOblique"
-esac
-d="$d.ttf"
-rm -f $font
-ln -s "/usr/share/fonts/dejavu-fonts/$d" $font
-done
+ln -s Utopia-Regular Times-Roman
+ln -s /usr/share/fonts/liberation/LiberationSerif-Regular.ttf Utopia-Regular
+ln -s /usr/share/fonts/liberation/LiberationSerif-Bold.ttf Utopia-Bold
+ln -s /usr/share/fonts/liberation/LiberationSerif-Italic.ttf Utopia-Italic
+ln -s /usr/share/fonts/liberation/LiberationSerif-BoldItalic.ttf Utopia-BoldItalic
+ln -s /usr/share/fonts/liberation/LiberationSans-Regular.ttf Helvetica
+ln -s /usr/share/fonts/liberation/LiberationSans-Bold.ttf Helvetica-Bold
+ln -s /usr/share/fonts/liberation/LiberationSans-Italic.ttf Helvetica-Oblique
+ln -s /usr/share/fonts/liberation/LiberationSans-BoldItalic.ttf Helvetica-BoldOblique
+ln -s /usr/share/fonts/liberation/LiberationMono-Regular.ttf Courier
+ln -s /usr/share/fonts/liberation/LiberationMono-Bold.ttf Courier-Bold
+ln -s /usr/share/fonts/liberation/LiberationMono-Italic.ttf Courier-Oblique
+ln -s /usr/share/fonts/liberation/LiberationMono-BoldItalic.ttf Courier-BoldOblique
 popd > /dev/null
 
 
@@ -337,6 +350,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Nov 19 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-30.1
+- Add hard-coded deps on font files (BZ 388761).
+- Switch to using liberation-fonts instead of dejavu-fonts.
+
 * Fri Aug 17 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-30
 - Apply major hacks (*-30.diff) to address BZ: 245192.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Inventor/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Aug 2007 12:58:52 -0000	1.7
+++ sources	19 Nov 2007 04:09:26 -0000	1.8
@@ -1,3 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
-099718cbe9dbb0ce16f268814b07cdee  Inventor-2.1.5-27.diff.bz2
 bc7650c1bf5c57fed469f92cbe9dc2c8  Inventor-2.1.5-30.diff.bz2