rpms/Inventor/devel Inventor.spec,1.34,1.35

Ralf Corsépius (corsepiu) fedora-extras-commits at redhat.com
Tue Oct 3 11:39:41 UTC 2006


Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13688

Modified Files:
	Inventor.spec 
Log Message:
* Tue Oct 03 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-24
- Specfile cosmetics.
- Use %{_datadir}/Inventor instead of %{_datadir}/%{name}
- Fix dep on xmessage for FC4.
- Add %{_datadir}/Inventor/data/materials.
- Add %{_datadir}/Inventor/fonts.



Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Inventor.spec	2 Oct 2006 04:05:04 -0000	1.34
+++ Inventor.spec	3 Oct 2006 11:39:41 -0000	1.35
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -68,7 +68,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "4"
+%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
 %else
 Requires:	/usr/X11R6/bin/xmessage
@@ -137,20 +137,20 @@
 -e 's,^_HDRTOP =.*$,_HDRTOP = %{_includedir}/Inventor,' \
 -e 's,^_MAN1DIR =.*$,_MAN1DIR = %{_mandir}/man1,' \
 -e 's,^_MAN3DIR =.*$,_MAN3DIR = %{_mandir}/man3,' \
--e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/%{name}/fonts,' \
--e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/%{name}/help,' \
--e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
--e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
--e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
+-e 's,^_FONTPATH =.*$,_FONTPATH = %{_datadir}/Inventor/fonts,' \
+-e 's,^_HELPDIR =.*$,_HELPDIR = %{_datadir}/Inventor/help,' \
+-e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/Inventor/data/models,' \
+-e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/Inventor/data/materials,' \
+-e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/Inventor/data/textures,' \
 -e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
--e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
+-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/Inventor/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
 make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
   sed -i \
-    -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
+    -e 's,/usr/share/inventor/,%{_datadir}/Inventor/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     $i
 done
@@ -216,6 +216,10 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/materials
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/data/textures
+install -d m755 ${RPM_BUILD_ROOT}%{_datadir}/Inventor/fonts
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -235,6 +239,8 @@
 %{_bindir}/ivnorm
 %{_bindir}/ivAddVP
 %{_libdir}/libInventor.so.*
+%dir %{_datadir}/Inventor
+%{_datadir}/Inventor/fonts
 %{_mandir}/man1/inventor.*
 %{_mandir}/man1/iv2toiv1.*
 %{_mandir}/man1/ivcat.*
@@ -264,7 +270,13 @@
 %{_mandir}/man1/SceneViewer.*
 %{_mandir}/man1/ivview.*
 %{_libdir}/libInventorXt.so.*
-%{_datadir}/%{name}
+%dir %{_datadir}/Inventor
+# Used by libInventorXt
+%{_datadir}/Inventor/help
+# Used by SceneViewer
+%dir %{_datadir}/Inventor/data
+%dir %{_datadir}/Inventor/data/materials
+%dir %{_datadir}/Inventor/data/textures
 
 %files -n InventorXt-devel
 %defattr(-,root,root,-)
@@ -276,15 +288,17 @@
 
 %files data
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/models
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/models
+%{_datadir}/Inventor/data/materials
+%{_datadir}/Inventor/data/textures
 
 %files demos
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/data
-%{_datadir}/%{name}/data/demos
+%dir %{_datadir}/Inventor
+%dir %{_datadir}/Inventor/data
+%{_datadir}/Inventor/data/demos
 %dir %{_libdir}/Inventor
 %{_libdir}/Inventor/[^e]*
 
@@ -294,6 +308,13 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Tue Oct 03 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-24
+- Specfile cosmetics.
+- Use %%{_datadir}/Inventor instead of %%{_datadir}/%{name}
+- Fix dep on xmessage for FC4.
+- Add %%{_datadir}/Inventor/data/materials.
+- Add %%{_datadir}/Inventor/fonts.
+
 * Mon Oct 02 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-23
 - Add make-var _PDFVIEWER.
 - Backport to FC4.
@@ -375,7 +396,7 @@
 * Thu Jul 1 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.2
 - Adopt portions of Michael Schwendt's patch.
 - Fix hard-coded paths in apps/demos/*.RUNMEs.
-- Use %{_prefix}/lib instead of %{_libdir} to install the demos into.
+- Use %%{_prefix}/lib instead of %%{_libdir} to install the demos into.
 - Add make/ to devel docs.
 - Hack devel docs to be buildable.
 




More information about the fedora-extras-commits mailing list