packages: OpenCASCADE/OpenCASCADE.spec - more PLD-ization, verified patch[0...

gotar gotar at pld-linux.org
Fri May 28 23:18:15 CEST 2010


Author: gotar                        Date: Fri May 28 21:18:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more PLD-ization, verified patch[01], don't chmod files (using defattr) 18:34:15

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

---- Diffs:

================================================================
Index: packages/OpenCASCADE/OpenCASCADE.spec
diff -u packages/OpenCASCADE/OpenCASCADE.spec:1.3 packages/OpenCASCADE/OpenCASCADE.spec:1.4
--- packages/OpenCASCADE/OpenCASCADE.spec:1.3	Fri May 28 13:22:29 2010
+++ packages/OpenCASCADE/OpenCASCADE.spec	Fri May 28 23:18:09 2010
@@ -11,8 +11,8 @@
 
 %define _prefix /opt/OpenCASCADE
 
-Name:		OpenCASCADE
 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
@@ -23,8 +23,8 @@
 # Source0-md5:	52778127974cb3141c2827f9d40d1f11
 Source1:	 %name.conf
 Source2:	 OpenCASCADE-rpmlintrc
-Patch0:          OpenCASCADE6.3.0-obs-check.patch
-Patch1:          OpenCASCADE6.3.0-strcmp.patch
+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
@@ -51,7 +51,7 @@
 %endif
 BuildRequires:   java-1_5_0-gcj-compat-devel
 Requires:        tcsh
-BuildRoot:       %{_tmppath}/%{name}-%{version}-build
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
@@ -91,6 +91,13 @@
 %patch16 -p1
 
 %build
+cd ros
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__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
@@ -104,7 +111,6 @@
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
-autoreconf -f -i
 LDFLAGS=-lpthread %configure \
    --with-gl-include=/usr/include \
    --with-gl-library=/usr/%{_lib} \
@@ -126,26 +132,10 @@
 cd ros
 %makeinstall
 
-`for i in $(find %{buildroot}%{_prefix}/inc/ -name '*.h'); do chmod -x $i; done`
-`for i in $(find %{buildroot}%{_prefix}/inc/ -name '*.hxx'); do chmod -x $i; done`
-`for i in $(find %{buildroot}%{_prefix}/inc/ -name '*.lxx'); do chmod -x $i; done`
-`for i in $(find %{buildroot}%{_prefix}/inc/ -name '*.gxx'); do chmod -x $i; done`
-
-chmod -x %{buildroot}%{_prefix}/wok/lib/config.h
-chmod -x %{buildroot}%{_libdir}/*.la
-chmod -x %{buildroot}%{_libdir}/opencas/*.la
-chmod -x %{buildroot}%{_prefix}/src/UnitsAPI/UnitsAPI.cxx
-chmod -x %{buildroot}%{_prefix}/src/DrawResources/Filtre.c
-chmod -x %{buildroot}%{_prefix}/src/DrawResources/TestDraw.cxx
-chmod -x %{buildroot}%{_prefix}/src/DrawResources/DIFF.c
-
 cd ..
 cp -a data %{buildroot}%{_prefix}/
 cp -a doc %{buildroot}%{_prefix}/
 cp -a samples %{buildroot}%{_prefix}/
-find %{buildroot}%{_prefix}/data -type f -print0 |xargs -0 chmod a-x
-find %{buildroot}%{_prefix}/doc -type f -print0 |xargs -0 chmod a-x
-find %{buildroot}%{_prefix}/samples -type f -print0 |xargs -0 chmod a-x
 
 %ifarch x86_64
 %__ln_s %{_libdir} %{buildroot}/%{_prefix}/Linux/lib
@@ -228,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+
 Revision 1.3  2010/05/28 11:22:29  gotar
 - more PLD-ization, don't break --short-circuit on %install
 
================================================================

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



More information about the pld-cvs-commit mailing list