- use %java_home, bison/flex magic in %setup, s/$RPM_OPT_FLAGS/%rpmcflags,

- separated libs, doc, examples (see dx.spec), adjusted Groups,
- cleanup: not used rpmlintrc, tcl-devel, compat?, tcsh, symlinks from /opt

Changed files:
    OpenCASCADE.spec -> 1.7

diff --git a/OpenCASCADE.spec b/OpenCASCADE.spec
index b1c6f48922ea98c6d2472b0189ab9fe05ca09b94..ce3b14ee7497a01d57284bd5cd06982c7eac7d3f 100644 (file)
--- a/OpenCASCADE.spec
+++ b/OpenCASCADE.spec
@@ -10,16 +10,14 @@
 
 Summary:       OpenCASCADE CAE platform
 Name:          OpenCASCADE
-Group:           Productivity/Other
 # The 6.3.1 is a maintenance release, only available for OCC customers
 Version:       6.3.0
 Release:         40.3
 License:       LGPL-like, see http://www.opencascade.org/occ/license/
-Packager:        Andrea Florio <andrea@opensuse.org>
+Group:         Applications/Engineering
 Source0:       http://files.opencascade.com/OCC_6.3_release/%{name}_src.tgz
 # Source0-md5: 52778127974cb3141c2827f9d40d1f11
 Source1:        %name.conf
-Source2:        OpenCASCADE-rpmlintrc
 Patch0:                %{name}6.3.0-obs-check.patch
 Patch1:                %{name}6.3.0-strcmp.patch
 Patch2:          OpenCASCADE6.3.0-occ6.3.0.patch
@@ -40,21 +38,16 @@ Patch16:         OpenCASCADE6.3.0-WOKUnix_FDescr.patch
 URL:           http://www.opencascade.org/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: bison
+BuildRequires: flex
 BuildRequires: java-sun-jdk-base
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: Mesa-libGLU-devel
 BuildRequires: tk-devel
-BuildRequires:  bison flex tcl-devel tk-devel
-%ifarch i586
-BuildRequires:   compat
-%else
-BuildRequires:   compat-32bit
-%endif
 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)
 
 %description
@@ -63,16 +56,34 @@ exchange and rapid application development.  It is an excellent platform for
 development of numerical simulation software including CAD/CAM/CAE, AEC and
 GIS, as well as PDM applications.
 
+%package libs
+Summary:       OpenCASCADE shared libraries
+Group:         Libraries
+
+%description libs
+OpenCASCADE shared libraries.
+
 %package devel
-Group:          Development/Libraries/C and C++
-Summary:        Devel package for %{name}
-Requires:       %{name} = %{version}
+Summary:       OpenCASCADE development files
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
-OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
-exchange and rapid application development.  It is an excellent platform for
-development of numerical simulation software including CAD/CAM/CAE, AEC and
-GIS, as well as PDM applications.
+OpenCASCADE development files.
+
+%package doc
+Summary:       OpenCASCADE documentation
+Group:         Documentation
+
+%description doc
+OpenCASCADE help and html documentation.
+
+%package examples
+Summary:       OpenCASCADE examples
+Group:         Documentation
+
+%description examples
+OpenCASCADE examples.
 
 %prep
 %setup -q -n %{name}%{version}
@@ -93,6 +104,11 @@ GIS, as well as PDM applications.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+cd ros/src/ExprIntrp
+bison -d -p ExprIntrp -o ExprIntrp.tab.c ExprIntrp.yacc
+flex -L -8 -Cf -Cr -P ExprIntrp -o lex.ExprIntrp.c ExprIntrp.lex
+mv ExprIntrp.tab.h ../../inc/
+cp ExprIntrp.tab.c lex.ExprIntrp.c ../../drv/ExprIntrp/
 
 %build
 cd ros
@@ -102,18 +118,12 @@ cd ros
 %{__autoheader}
 %{__automake}
 
-cd ros/src/ExprIntrp
-bison -d -p ExprIntrp -o ExprIntrp.tab.c ExprIntrp.yacc
-flex -L -8 -Cf -Cr -P ExprIntrp -o lex.ExprIntrp.c ExprIntrp.lex
-mv ExprIntrp.tab.h ../../inc/
-cp ExprIntrp.tab.c lex.ExprIntrp.c ../../drv/ExprIntrp/
-cd ../..
 %ifarch x86_64 ppc64
-export CFLAGS="$RPM_OPT_FLAGS -D_OCC64 -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -D_OCC64 -fno-strict-aliasing"
+export CFLAGS="%{rpmcflags} -D_OCC64 -fno-strict-aliasing"
+export CXXFLAGS="%{rpmcflags} -D_OCC64 -fno-strict-aliasing"
 %else
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="%{rpmcflags} -fno-strict-aliasing"
+export CXXFLAGS="%{rpmcflags} -fno-strict-aliasing"
 %endif
 LDFLAGS=-lpthread %configure \
    --disable-static \
@@ -122,7 +132,7 @@ LDFLAGS=-lpthread %configure \
    --enable-draw \
    --enable-wok \
    --enable-wrappers \
-       --with-java-include=/usr/lib64/jvm/java/include
+       --with-java-include="%{java_home}"/include
 
 %{__make}
 
@@ -132,31 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 cd ros
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
-
 cd ..
-cp -a data %{buildroot}%{_prefix}/
+
+cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a doc %{buildroot}%{_prefix}/
 cp -a samples %{buildroot}%{_prefix}/
 
-%ifarch x86_64
-%__ln_s %{_libdir} %{buildroot}/%{_prefix}/Linux/lib
-%__ln_s %{_libdir} %{buildroot}/%{_prefix}/lin/lib
-%endif
-
-# add symlinks for compatibility resons
-%__mkdir -p %{buildroot}/usr/share/opencascade/
-%__mkdir -p %{buildroot}/usr/include/
-%__mkdir -p %{buildroot}/usr/share/doc/packages/
-%__mkdir -p %{buildroot}/usr/%{_lib}
-
-%__ln_s %{_prefix} %{buildroot}/usr/share/opencascade/%{version}
-%__ln_s %{_prefix}/inc  %{buildroot}/usr/include/opencascade
-%__ln_s %{_prefix}/doc  %{buildroot}/usr/share/doc/packages/opencascade
-`for i in $(ls  %{buildroot}/%{_libdir}); do %__ln_s %{_libdir}/$i %{buildroot}/usr/%{_lib}/$i; done`
-
-%__mkdir -p %buildroot/etc/ld.so.conf.d/
-%__cp %SOURCE1 %buildroot/etc/ld.so.conf.d/
-
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig