- packaged samples, with no unnecessary cp; don't break

[packages/OpenCASCADE.git] / OpenCASCADE.spec

diff --git a/OpenCASCADE.spec b/OpenCASCADE.spec
index 8b7aa8c9c5fee3c5e12ba157e565dfb6c9a0cac4..8bbb6351ba9597f0c2f64ee9f346c2a0616bf9a5 100644 (file)
--- a/OpenCASCADE.spec
+++ b/OpenCASCADE.spec
@@ -17,12 +17,10 @@ License:    LGPL-like, see http://www.opencascade.org/occ/license/
 Group:         Applications/Engineering
 Source0:       http://files.opencascade.com/OCC_6.3_release/%{name}_src.tgz
 # Source0-md5: 52778127974cb3141c2827f9d40d1f11
-Source1:        %name.conf
 Patch0:                %{name}6.3.0-obs-check.patch
 Patch1:                %{name}6.3.0-strcmp.patch
 Patch2:          OpenCASCADE6.3.0-occ6.3.0.patch
-Patch3:          OpenCASCADE6.3.0-casroot.patch
-Patch4:          OpenCASCADE6.3.0-lib-release.patch
+Patch3:                %{name}6.3.0-casroot.patch
 Patch5:          OpenCASCADE6.3.0-tkernel-ld.patch
 Patch6:          OpenCASCADE6.3.0-mft-disable-mmap.patch
 Patch7:          OpenCASCADE6.3.0-no-bitmaps-icon.patch
@@ -30,8 +28,6 @@ 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
-Patch12:         OpenCASCADE6.3.0-make-wok-libs-private.patch
-Patch13:         OpenCASCADE6.3.0-make-draw-libs-private.patch
 Patch14:         OpenCASCADE6.3.0-wok-install.patch
 Patch15:         OpenCASCADE6.3.0-udlist.patch
 Patch16:         OpenCASCADE6.3.0-WOKUnix_FDescr.patch
@@ -78,12 +74,12 @@ Group:              Documentation
 %description doc
 OpenCASCADE help and html documentation.
 
-%package examples
-Summary:       OpenCASCADE examples
+%package samples
+Summary:       OpenCASCADE samples
 Group:         Documentation
 
-%description examples
-OpenCASCADE examples.
+%description samples
+OpenCASCADE samples.
 
 %prep
 %setup -q -n %{name}%{version}
@@ -91,7 +87,6 @@ OpenCASCADE examples.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -99,8 +94,6 @@ OpenCASCADE examples.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -113,7 +106,7 @@ cp ExprIntrp.tab.c lex.ExprIntrp.c ../../drv/ExprIntrp/
 %build
 cd ros
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -126,19 +119,15 @@ export CFLAGS="%{rpmcflags} -fno-strict-aliasing"
 export CXXFLAGS="%{rpmcflags} -fno-strict-aliasing"
 %endif
 LDFLAGS=-lpthread %configure \
-   --disable-static \
-   --disable-debug \
-   --enable-production \
-   --enable-draw \
-   --enable-wok \
-   --enable-wrappers \
+       %{?debug:--disable-production  --enable-debug} \
+       %{!?debug:--enable-production --disable-debug} \
        --with-java-include="%{java_home}"/include
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_includedir}
+install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir},%{_usrsrc}}
 
 cd ros
 %{__make} install \
@@ -146,12 +135,17 @@ cd ros
 cd ..
 
 cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -a doc %{buildroot}%{_prefix}/
-cp -a samples %{buildroot}%{_prefix}/
-
+mv $RPM_BUILD_ROOT{%{_prefix}/src,%{_datadir}/%{name}}
 mv $RPM_BUILD_ROOT{%{_prefix}/inc,%{_includedir}/%{name}}
 rm -r $RPM_BUILD_ROOT%{_prefix}/{Linux,lin}
 
+for i in doc samples; do
+mkdir -p $i-i
+[ -d $i ] && mv $i $i-i/%{name}-%{version} || :
+done
+ln -s %{_builddir}/%{name}%{version}/doc-i   $RPM_BUILD_ROOT%{_defaultdocdir}
+ln -s %{_builddir}/%{name}%{version}/samples-i $RPM_BUILD_ROOT%{_examplesdir}
+
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -162,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/DRAWEXE
 %attr(755,root,root) %{_bindir}/wok*
+%{_datadir}/%{name}
 
 %files libs
 %defattr(644,root,root,755)
@@ -172,20 +167,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/wok/lib/
 %dir %{_prefix}/wok/site/
 %dir %{_prefix}/data
-%dir %{_prefix}/doc
-%dir %{_libdir}/
-%dir %{_libdir}/opencas/
-%dir /usr/share/opencascade/
 %{_prefix}/data/*
-%{_prefix}/doc/*
 %{_prefix}/wok/lib/*
 %{_prefix}/wok/site/*
 %{_prefix}/config.h
 %{_prefix}/env_DRAW.sh
-%{_libdir}/opencas/*.so
-/usr/share/opencascade/%{version}
-/usr/share/doc/packages/opencascade
-%config /etc/ld.so.conf.d/%name.conf
 %dir %{_prefix}/src/UnitsAPI
 %dir %{_prefix}/src
 %{_prefix}/src/UnitsAPI/*.dat
@@ -196,11 +182,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.la
 %attr(755,root,root) %{_libdir}/*.so
 
-%{_libdir}/opencas/*.la
 %dir %{_prefix}/src/
 %{_prefix}/src/*
-%dir %{_prefix}/inc/
-%{_prefix}/inc/*
-%dir %{_prefix}/samples
-%{_prefix}/samples/*
 %exclude %{_prefix}/src/UnitsAPI/*.dat
+
+%files doc
+%{_docdir}/%{name}-%{version}
+
+%files samples
+%{_examplesdir}/%{name}-%{version}