From 0da61c06efa5c940e64cb2a4111c26a0e4d30777 Mon Sep 17 00:00:00 2001 From: Tomasz Pala Date: Mon, 7 Jun 2010 11:36:04 +0000 Subject: [PATCH] - no %doc in main package (breaks doc subpackage shortcut), - restored private libs in opencas (less clutter in %_libdir), - fixed %post(un) Changed files: OpenCASCADE.spec -> 1.16 OpenCASCADE6.3.0-make-draw-libs-private.patch -> 1.3 OpenCASCADE6.3.0-make-wok-libs-private.patch -> 1.3 --- OpenCASCADE.spec | 18 +++- OpenCASCADE6.3.0-make-draw-libs-private.patch | 92 +++++++++++++++++++ OpenCASCADE6.3.0-make-wok-libs-private.patch | 12 +++ 3 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 OpenCASCADE6.3.0-make-draw-libs-private.patch create mode 100644 OpenCASCADE6.3.0-make-wok-libs-private.patch diff --git a/OpenCASCADE.spec b/OpenCASCADE.spec index 49e79aa..31b683d 100644 --- a/OpenCASCADE.spec +++ b/OpenCASCADE.spec @@ -8,6 +8,8 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. +# TODO: separate libs-x (80% of libraries) + Summary: OpenCASCADE CAE platform Name: OpenCASCADE # The 6.3.1 is a maintenance release, only available for OCC customers @@ -28,6 +30,8 @@ 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: %{name}6.3.0-make-wok-libs-private.patch +Patch13: %{name}6.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 @@ -94,6 +98,8 @@ OpenCASCADE samples. %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 @@ -147,15 +153,14 @@ 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 +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ros/README.txt %attr(755,root,root) %{_bindir}/DRAWEXE %attr(755,root,root) %{_bindir}/wok* %dir %{_datadir}/%{name} @@ -166,17 +171,22 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/%{name}/src/UnitsAPI %{_datadir}/%{name}/src/UnitsAPI/*.dat %{_datadir}/%{name}/wok +%dir %{_libdir}/opencas +%attr(755,root,root) %{_libdir}/opencas/*.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/opencas/*.so.0 %files libs %defattr(644,root,root,755) -%doc LICENSE +%doc LICENSE ros/README.txt %attr(755,root,root) %{_libdir}/*.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/*.so.0 %files devel %defattr(644,root,root,755) %{_includedir}/%{name} +%{_libdir}/opencas/*.la %{_libdir}/*.la +%attr(755,root,root) %{_libdir}/opencas/*.so %attr(755,root,root) %{_libdir}/*.so %{_datadir}/%{name}/src/* %exclude %{_datadir}/%{name}/src/UnitsAPI/*.dat diff --git a/OpenCASCADE6.3.0-make-draw-libs-private.patch b/OpenCASCADE6.3.0-make-draw-libs-private.patch new file mode 100644 index 0000000..7037876 --- /dev/null +++ b/OpenCASCADE6.3.0-make-draw-libs-private.patch @@ -0,0 +1,92 @@ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/DRAWEXE/Makefile.am OpenCASCADE6.3.0/ros/adm/make/DRAWEXE/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/DRAWEXE/Makefile.am 2008-10-02 23:57:07.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/DRAWEXE/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -23,3 +23,4 @@ + ../TKG3d/libTKG3d.la \ + ../TKernel/libTKernel.la \ + $(STLPort_LIB) $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) $(CSF_gdi32_LIB) $(CSF_advapi32_LIB) $(CSF_user32_LIB) $(CSF_SOCKETLibs_LIB) $(CSF_FPELibs_LIB) $(CSF_ThreadLibs_LIB) $(CSF_kernel32_LIB) ++ DRAWEXE_LDFLAGS = -rpath /usr/lib/opencas +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKDCAF/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKDCAF/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/TKDCAF/Makefile.am 2008-10-02 23:57:07.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/TKDCAF/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -26,7 +26,7 @@ + -I@top_srcdir@/drv/DrawDim -I@top_srcdir@/src/DrawDim + + +-lib_LTLIBRARIES=libTKDCAF.la ++pkglib_LTLIBRARIES=libTKDCAF.la + + libTKDCAF_la_LIBADD = \ + ../TKernel/libTKernel.la \ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKDraw/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKDraw/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/TKDraw/Makefile.am 2008-10-02 23:57:07.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/TKDraw/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -20,7 +20,7 @@ + -I@top_srcdir@/drv/DrawTrSurf -I@top_srcdir@/src/DrawTrSurf + + +-lib_LTLIBRARIES=libTKDraw.la ++pkglib_LTLIBRARIES=libTKDraw.la + + libTKDraw_la_LIBADD = \ + ../TKernel/libTKernel.la \ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKTObjDRAW/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKTObjDRAW/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/TKTObjDRAW/Makefile.am 2008-10-02 23:57:07.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/TKTObjDRAW/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -16,7 +16,7 @@ + -I@top_srcdir@/drv/TObjDRAW -I@top_srcdir@/src/TObjDRAW + + +-lib_LTLIBRARIES=libTKTObjDRAW.la ++pkglib_LTLIBRARIES=libTKTObjDRAW.la + + libTKTObjDRAW_la_LIBADD = \ + ../TKTObj/libTKTObj.la \ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKTopTest/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKTopTest/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/TKTopTest/Makefile.am 2008-10-02 23:57:07.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/TKTopTest/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -34,7 +34,7 @@ + -I@top_srcdir@/drv/BOPTest -I@top_srcdir@/src/BOPTest + + +-lib_LTLIBRARIES=libTKTopTest.la ++pkglib_LTLIBRARIES=libTKTopTest.la + + libTKTopTest_la_LIBADD = \ + ../TKernel/libTKernel.la \ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKViewerTest/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKViewerTest/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/TKViewerTest/Makefile.am 2008-10-02 23:57:07.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/TKViewerTest/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -18,7 +18,7 @@ + -I@top_srcdir@/drv/ViewerTest -I@top_srcdir@/src/ViewerTest + + +-lib_LTLIBRARIES=libTKViewerTest.la ++pkglib_LTLIBRARIES=libTKViewerTest.la + + libTKViewerTest_la_LIBADD = \ + ../TKernel/libTKernel.la \ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKXDEDRAW/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKXDEDRAW/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/TKXDEDRAW/Makefile.am 2008-10-02 23:57:08.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/TKXDEDRAW/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -16,7 +16,7 @@ + -I@top_srcdir@/drv/XDEDRAW -I@top_srcdir@/src/XDEDRAW + + +-lib_LTLIBRARIES=libTKXDEDRAW.la ++pkglib_LTLIBRARIES=libTKXDEDRAW.la + + libTKXDEDRAW_la_LIBADD = \ + ../TKernel/libTKernel.la \ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/TKXSDRAW/Makefile.am OpenCASCADE6.3.0/ros/adm/make/TKXSDRAW/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/TKXSDRAW/Makefile.am 2008-10-02 23:57:08.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/TKXSDRAW/Makefile.am 2008-10-02 23:58:25.000000000 +0200 +@@ -24,7 +24,7 @@ + -I@top_srcdir@/drv/XSDRAWSTLVRML -I@top_srcdir@/src/XSDRAWSTLVRML + + +-lib_LTLIBRARIES=libTKXSDRAW.la ++pkglib_LTLIBRARIES=libTKXSDRAW.la + + libTKXSDRAW_la_LIBADD = \ + ../TKernel/libTKernel.la \ diff --git a/OpenCASCADE6.3.0-make-wok-libs-private.patch b/OpenCASCADE6.3.0-make-wok-libs-private.patch new file mode 100644 index 0000000..d88e03a --- /dev/null +++ b/OpenCASCADE6.3.0-make-wok-libs-private.patch @@ -0,0 +1,12 @@ +diff -uNr OpenCASCADE6.3.0-old/ros/adm/make/WOKLibs/Makefile.am OpenCASCADE6.3.0/ros/adm/make/WOKLibs/Makefile.am +--- OpenCASCADE6.3.0-old/ros/adm/make/WOKLibs/Makefile.am 2008-10-02 23:56:22.000000000 +0200 ++++ OpenCASCADE6.3.0/ros/adm/make/WOKLibs/Makefile.am 2008-10-02 23:57:31.000000000 +0200 +@@ -9,7 +9,7 @@ + -I@top_srcdir@/src/WOKLibs + + +-lib_LTLIBRARIES= libwokcmd.la libwoktoolscmd.la libwokutilscmd.la libwoksteps.la libwokobjssteps.la libwokdfltsteps.la libwokdeliverysteps.la libwokorbixsteps.la libmscmd.la ++pkglib_LTLIBRARIES= libwokcmd.la libwoktoolscmd.la libwokutilscmd.la libwoksteps.la libwokobjssteps.la libwokdfltsteps.la libwokdeliverysteps.la libwokorbixsteps.la libmscmd.la + libwokcmd_la_SOURCES = @top_srcdir@/src/WOKLibs/wokcmd.cxx + libwoktoolscmd_la_SOURCES = @top_srcdir@/src/WOKLibs/woktoolscmd.cxx + libwokutilscmd_la_SOURCES = @top_srcdir@/src/WOKLibs/wokutilscmd.cxx -- 2.44.0