SPECS: innovation3d.spec - kill usless bconds, more explicit confi...

[pluto]

Author: pluto                        Date: Fri Apr 21 19:28:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill usless bconds, more explicit configure params,
  python detectoion at lib64 nfy, working...

---- Files affected:
SPECS:
   innovation3d.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/innovation3d.spec
diff -u SPECS/innovation3d.spec:1.7 SPECS/innovation3d.spec:1.8
--- SPECS/innovation3d.spec:1.7	Wed Apr 19 09:28:41 2006
+++ SPECS/innovation3d.spec	Fri Apr 21 21:28:13 2006
@@ -1,9 +1,4 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	tiff		# build with tiff support
-%bcond_with	th		# build for TH
-#
 Summary:	Innovation3D - 3D modeling program
 Summary(pl):	Innovation3D - program do modelowania 3D
 Name:		innovation3d
@@ -19,11 +14,7 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	nurbs++-devel
 BuildRequires:	qt-devel
-%if %{with th}
 BuildRequires:	xorg-lib-libXmu-devel
-%else
-BuildRequires:	XFree86-devel
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,23 +41,18 @@
 
 %build
 %configure \
-	%{?with_tiff: --with-tiff-prexix=/usr/ } \
-	--with-python-version=2.4
-
-#    --with-gl-prefix=PFX     Prefix where OpenGL or Mesa is installed
-#    --with-gl-includes=DIR   where the OpenGL or Mesa includes are installed
-#    --with-gl-libraries=DIR  where the OpenGL or Mesa libraries are installed
-#	--with-glut-prefix=PFX     Prefix where GLUT is installed
-#    --with-glut-includes=DIR   where the GLUT includes are installed
-#    --with-glut-libraries=DIR  where the GLUT libraries are installed
-#    --with-tiff-prefix=PFX     Prefix where libtiff is installed
-#  --with-tiff-includes=DIR   where the libtiff includes are installed
-#   --with-tiff-libraries=DIR  where the libtiff libraries are installed
-#    --with-python-version=VER    The version of Python to use, 1.5 is default
-#      --with-python-prefix=PFX    where the root of Python is installed
-#       --with-python-includes=DIR  where the Python includes are installed
-#   --with-python-libraries=DIR where the Python libraries are installed.
-#     --with-dmalloc-cflags=CFLAGS
+	--with-x \
+	--with-qt-includes=%{_includedir}/qt \
+	--with-qt-libraries=%{_libdir} \
+	--with-nurbs-includes=%{_includedir}/nurbs++ \
+	--with-nurbs-libs=%{_libdir} \
+	--with-python-version=%{python_version} \
+	--with-python-includes=%{_includedir}/python%{python_version} \
+	--with-python-libraries=%{_libdir} \
+	--with-tiff-includes=%{_includedir} \
+	--with-tiff-libraries=%{_libdir} \
+	--with-gl-libraries=%{_libdir} \
+	--with-glut-libraries=%{_libdir}
 
 %{__make}
 
@@ -102,6 +88,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/04/21 19:28:13  pluto
+- kill usless bconds, more explicit configure params,
+  python detectoion at lib64 nfy, working...
+
 Revision 1.7  2006/04/19 07:28:41  cieciwa
 - added bcond for TH
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/innovation3d.spec?r1=1.7&r2=1.8&f=u