packages: OpenCASCADE/OpenCASCADE.spec - DESTDIR patch verified; added X BRs

[gotar]

Author: gotar                        Date: Fri May 28 21:43:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- DESTDIR patch verified; added X BRs

---- Files affected:
packages/OpenCASCADE:
   OpenCASCADE.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/OpenCASCADE/OpenCASCADE.spec
diff -u packages/OpenCASCADE/OpenCASCADE.spec:1.4 packages/OpenCASCADE/OpenCASCADE.spec:1.5
--- packages/OpenCASCADE/OpenCASCADE.spec:1.4	Fri May 28 23:18:09 2010
+++ packages/OpenCASCADE/OpenCASCADE.spec	Fri May 28 23:43:26 2010
@@ -9,8 +9,6 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-%define _prefix /opt/OpenCASCADE
-
 Summary:	OpenCASCADE CAE platform
 Name:		OpenCASCADE
 Group:           Productivity/Other
@@ -31,7 +29,7 @@
 Patch5:          OpenCASCADE6.3.0-tkernel-ld.patch
 Patch6:          OpenCASCADE6.3.0-mft-disable-mmap.patch
 Patch7:          OpenCASCADE6.3.0-no-bitmaps-icon.patch
-Patch8:          OpenCASCADE6.3.0-DESTDIR.patch
+Patch8:		%{name}6.3.0-DESTDIR.patch
 Patch9:          OpenCASCADE6.3.0-maint-mode.patch
 Patch10:         OpenCASCADE6.3.0-dep-libs.patch
 Patch11:         OpenCASCADE6.3.0-move-vrml-vis.patch
@@ -41,15 +39,21 @@
 Patch15:         OpenCASCADE6.3.0-udlist.patch
 Patch16:         OpenCASCADE6.3.0-WOKUnix_FDescr.patch
 URL:		http://www.opencascade.org/
-
-BuildRequires:   Mesa-devel autoconf automake bison gcc-c++ xorg-x11-devel
-BuildRequires:   flex libtool tcl-devel tk-devel xorg-x11-libXmu-devel fdupes
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
+BuildRequires:	Mesa-libGLU-devel
+BuildRequires:  bison flex tcl-devel tk-devel
 %ifarch i586
 BuildRequires:   compat
 %else
 BuildRequires:   compat-32bit
 %endif
 BuildRequires:   java-1_5_0-gcj-compat-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-proto-xproto-devel
 Requires:        tcsh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -129,8 +133,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 cd ros
-%makeinstall
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 cd ..
 cp -a data %{buildroot}%{_prefix}/
@@ -218,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/05/28 21:43:26  gotar
+- DESTDIR patch verified; added X BRs
+
 Revision 1.4  2010/05/28 21:18:09  gotar
 - more PLD-ization, verified patch[01], don't chmod files (using defattr) 18:34:15
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenCASCADE/OpenCASCADE.spec?r1=1.4&r2=1.5&f=u