rpms/Inventor/devel Inventor.spec,1.7,1.8
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Sun May 22 16:57:53 UTC 2005
Author: corsepiu
Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5271
Modified Files:
Inventor.spec
Log Message:
Update
Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Inventor.spec 6 Apr 2005 22:10:46 -0000 1.7
+++ Inventor.spec 22 May 2005 16:57:51 -0000 1.8
@@ -1,6 +1,12 @@
+#
+# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
Name: Inventor
Version: 2.1.5
-Release: 8
+Release: 8%{?dist}
Summary: SGI Open Inventor (TM)
@@ -27,7 +33,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libGL.so.1 XFree86-devel
+BuildRequires: xorg-x11-Mesa-libGL
+BuildRequires: xorg-x11-devel
BuildRequires: openmotif-devel freetype-devel libjpeg-devel
BuildRequires: bison
# Workaround to RH shipping bison with broken package dependencies
@@ -49,7 +56,8 @@
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: libGL.so.1 freetype-devel libjpeg-devel
+Requires: xorg-x11-devel
+Requires: freetype-devel libjpeg-devel
%description devel
SGI Open Inventor (TM) development files.
@@ -59,10 +67,9 @@
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: libGL.so.1
%description -n InventorXt
-SGI Open Inventor development files.
+SGI Open Inventor (TM) development files.
%package -n InventorXt-devel
Summary: SGI Open Inventor (TM) Motif bindings.
@@ -74,7 +81,7 @@
Requires: openmotif-devel
%description -n InventorXt-devel
-SGI Open Inventor development files.
+SGI Open Inventor (TM) development files.
%package demos
Summary: SGI Open Inventor (TM) Demos
@@ -112,8 +119,7 @@
%patch6 -p0 -b .orig
%patch7 -p0
-mv make/ivcommondefs make/ivcommondefs~
-sed \
+sed -i \
-e 's,^IVPREFIX =.*$,IVPREFIX = %{_prefix},' \
-e 's,^_BINDIR =.*$,_BINDIR = %{_bindir},' \
-e 's,^_LIBDIR =.*$,_LIBDIR = %{_libdir},' \
@@ -129,14 +135,13 @@
-e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
-e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
-e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
-< make/ivcommondefs~ > make/ivcommondefs
+make/ivcommondefs
for i in apps/demos/*/*.RUNME; do \
- mv $i $i~
- sed \
+ sed -i \
-e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
-e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
- < $i~ > $i
+ $i
done
for i in *.pc.in; do
@@ -178,17 +183,14 @@
find \( -name '*~' -o -name '*.debian' \) -exec rm -f {} \;
find -name 'GNUmakefile*' | while read a; do \
b=`echo $a | sed 's,GNUmakefile.*$,,;s,^\./,,;s,[^/]*/,../,g;s,\/$,,;s,^$,.,'`
- sed -e "s,^IVDEPTH = .*$,IVDEPTH = $b," < $a > $a~;
- mv $a~ $a;
+ sed -i -e "s,^IVDEPTH = .*$,IVDEPTH = $b," $a
done
find -name '*.c++' | while read a; do \
- sed -e "s,/usr/share/src/Inventor/examples/data,%{_libdir}/Inventor/examples/data,g" < $a > $a~
- mv $a~ $a;
+ sed -i -e "s,/usr/share/src/Inventor/examples/data,%{_libdir}/Inventor/examples/data,g" $a
done
-sed -e '/^IVLIBHDRDIRS.*/,/libSoXt\/include/c\
+sed -i -e '/^IVLIBHDRDIRS.*/,/libSoXt\/include/c\
IVLIBHDRS = `pkg-config --cflags libInventorXt`' \
-< make/ivcommondefs > make/ivcommondefs~
-mv make/ivcommondefs~ make/ivcommondefs
+make/ivcommondefs
make clean
popd > /dev/null
@@ -285,6 +287,12 @@
%{_libdir}/Inventor/examples
%changelog
+* Sun May 22 2005 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-8
+- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead
+ SONAME handling.
+- Add %%dist.
+- Use sed -i to avoid temporary files.
+
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
More information about the fedora-extras-commits
mailing list