packages: OpenCASCADE/OpenCASCADE.spec - more PLD-ization, don't break --sh...

[gotar]

Author: gotar                        Date: Fri May 28 11:22:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more PLD-ization, don't break --short-circuit on %install

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

---- Diffs:

================================================================
Index: packages/OpenCASCADE/OpenCASCADE.spec
diff -u packages/OpenCASCADE/OpenCASCADE.spec:1.2 packages/OpenCASCADE/OpenCASCADE.spec:1.3
--- packages/OpenCASCADE/OpenCASCADE.spec:1.2	Fri May 28 13:08:39 2010
+++ packages/OpenCASCADE/OpenCASCADE.spec	Fri May 28 13:22:29 2010
@@ -49,11 +49,7 @@
 %else
 BuildRequires:   compat-32bit
 %endif
-%if %suse_version >= 1100
 BuildRequires:   java-1_5_0-gcj-compat-devel
-%else
-BuildRequires:   java-1_4_2-gcj-compat-devel
-%endif
 Requires:        tcsh
 BuildRoot:       %{_tmppath}/%{name}-%{version}-build
 
@@ -64,7 +60,6 @@
 GIS, as well as PDM applications.
 
 %package devel
-
 Group:          Development/Libraries/C and C++
 Summary:        Devel package for %{name}
 Requires:       %{name} = %{version}
@@ -77,7 +72,6 @@
 
 %prep
 %setup -q -n %{name}%{version}
-# all patches must applied in that order or some of them could fail
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -125,9 +119,10 @@
    --enable-wrappers \
    --enable-draw
 
-%__make %{?jobs:-j%{jobs}}
+%{__make}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd ros
 %makeinstall
 
@@ -145,9 +140,9 @@
 chmod -x %{buildroot}%{_prefix}/src/DrawResources/DIFF.c
 
 cd ..
-mv data %{buildroot}%{_prefix}/
-mv doc %{buildroot}%{_prefix}/
-mv samples %{buildroot}%{_prefix}/
+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
@@ -157,7 +152,7 @@
 %__ln_s %{_libdir} %{buildroot}/%{_prefix}/lin/lib
 %endif
 
-# add synlinks for compatibility resons
+# add symlinks for compatibility resons
 %__mkdir -p %{buildroot}/usr/share/opencascade/
 %__mkdir -p %{buildroot}/usr/include/
 %__mkdir -p %{buildroot}/usr/share/doc/packages/
@@ -171,18 +166,14 @@
 %__mkdir -p %buildroot/etc/ld.so.conf.d/
 %__cp %SOURCE1 %buildroot/etc/ld.so.conf.d/
 
-%fdupes -s %{buildroot}
-
-
-%post -p /sbin/ldconfig
-
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(644,root,root,755)
 %dir %{_prefix}
 %dir %{_bindir}
 %dir %{_prefix}/lin
@@ -219,7 +210,7 @@
 %{_prefix}/src/UnitsAPI/*.dat
 
 %files devel
-%defattr(-,root,root)
+%defattr(644,root,root,755)
 %dir /usr/include/opencascade/
 %{_libdir}/*.la
 %{_libdir}/opencas/*.la
@@ -237,6 +228,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/05/28 11:22:29  gotar
+- more PLD-ization, don't break --short-circuit on %install
+
 Revision 1.2  2010/05/28 11:08:39  gotar
 - MD5 for Source0, initial PLD-ization
 
================================================================

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