Author: sparky Date: Sat May 26 22:28:51 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- without cg bcond and disabled for non-pc archs
---- Files affected:
SPECS:
ogre.spec (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SPECS/ogre.spec
diff -u SPECS/ogre.spec:1.20 SPECS/ogre.spec:1.21
--- SPECS/ogre.spec:1.20 Sat May 26 23:37:11 2007
+++ SPECS/ogre.spec Sun May 27 00:28:46 2007
@@ -2,6 +2,13 @@
# TODO:
# - better fix for --as-needed (im too stupid to fix this in a correct way:/)
#
+# Conditional build:
+%bcond_without cg # don't build with cg
+
+%ifnarch %{ix86} %{x8664}
+%undefine with_cg
+%endif
+
%define _ver %(echo %{version} | tr . -)
Summary: Object-oriented Graphics Rendering Engine
Summary(pl.UTF-8): OGRE - zorientowany obiektowo silnik renderowania
grafiki
@@ -19,7 +26,7 @@
BuildRequires: OpenGL-GLU-devel
BuildRequires: autoconf >= 2.50
BuildRequires: automake
-BuildRequires: cg-devel
+%{?with_cg:BuildRequires: cg-devel}
BuildRequires: cppunit-devel >= 1.10.0
BuildRequires: freetype-devel >= 2.1.0
BuildRequires: libstdc++-devel
@@ -85,6 +92,7 @@
%{__autoheader}
%{__automake}
%configure \
+ %{!?with_cg:--disable-cg} \
--disable-devil \
--enable-openexr
@@ -112,19 +120,19 @@
%doc AUTHORS BUGS README INSTALL
%attr(755,root,root) %{_bindir}/Ogre*
%attr(755,root,root) %{_libdir}/libOgre*.so
-%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so
+%{?with_cg:%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so}
%dir %{_libdir}/OGRE
%attr(755,root,root) %{_libdir}/OGRE/*.so
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libOgre*.so
-%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so
+%{?with_cg:%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so}
%{_libdir}/libOgreMain.la
-%{_libdir}/libCEGUIOgreRenderer.la
+%{?with_cg:%{_libdir}/libCEGUIOgreRenderer.la}
%{_includedir}/OGRE
%{_pkgconfigdir}/OGRE.pc
-%{_pkgconfigdir}/CEGUI-OGRE.pc
+%{?with_cg:%{_pkgconfigdir}/CEGUI-OGRE.pc}
%files examples
%defattr(644,root,root,755)
@@ -136,6 +144,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2007/05/26 22:28:46 sparky
+- without cg bcond and disabled for non-pc archs
+
Revision 1.20 2007/05/26 21:37:11 arvenil
- up to 1.4.1
- build with cg and CEGUI
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ogre.spec?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
