rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.4,1.5
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Sun Aug 28 07:27:20 UTC 2005
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10319
Modified Files:
OpenSceneGraph.spec
Log Message:
- Propagate %%_libdir to pkgconfig files.
- Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH
Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSceneGraph.spec 28 Aug 2005 05:10:12 -0000 1.4
+++ OpenSceneGraph.spec 28 Aug 2005 07:27:18 -0000 1.5
@@ -83,11 +83,15 @@
sed -i \
-e 's, DOF=$(OPTF) , "DOF=$(OPTF)" ,g' \
$dir/Make/makerules
+
+# Fix libdir
+ sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+ $dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
done
%build
rm -rf $RPM_BUILD_ROOT
-%ifarch x64_86
+%ifarch x86_64
export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
%else
export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
@@ -120,7 +124,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-%ifarch x64_86
+%ifarch x86_64
export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux64:$PWD/OpenThreads/lib/Linux64"
%else
export LD_LIBRARY_PATH="$PWD/Producer/lib/Linux32:$PWD/OpenThreads/lib/Linux32"
@@ -363,6 +367,8 @@
%changelog
* Sun Aug 28 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.9.9-4
+- Propagate %%_libdir to pkgconfig files.
+- Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH
- Move configuration to %%build.
- Spec file cosmetics.
More information about the fedora-extras-commits
mailing list