packages: OpenCASCADE/OpenCASCADE.spec - packaged samples, with no unnecess...

[gotar]

Author: gotar                        Date: Sun Jun  6 19:50:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- packaged samples, with no unnecessary cp; don't break

---- Files affected:
packages/OpenCASCADE:
   OpenCASCADE.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/OpenCASCADE/OpenCASCADE.spec
diff -u packages/OpenCASCADE/OpenCASCADE.spec:1.12 packages/OpenCASCADE/OpenCASCADE.spec:1.13
--- packages/OpenCASCADE/OpenCASCADE.spec:1.12	Sun Jun  6 20:55:22 2010
+++ packages/OpenCASCADE/OpenCASCADE.spec	Sun Jun  6 21:50:20 2010
@@ -75,6 +75,13 @@
 %description doc
 OpenCASCADE help and html documentation.
 
+%package samples
+Summary:	OpenCASCADE samples
+Group:		Documentation
+
+%description samples
+OpenCASCADE samples.
+
 %prep
 %setup -q -n %{name}%{version}
 %patch0 -p1
@@ -121,7 +128,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir}}
+install -d $RPM_BUILD_ROOT{%{_datadir},%{_includedir},%{_usrsrc}}
 
 cd ros
 %{__make} install \
@@ -129,15 +136,17 @@
 cd ..
 
 cp -a data $RPM_BUILD_ROOT%{_datadir}/%{name}
-mkdir -p doc-i
-[ -d doc ] && mv doc doc-i/%{name}-%{version}
-ln -s %{_builddir}/%{name}%{version}/doc-i $RPM_BUILD_ROOT%{_defaultdocdir}
-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
 
@@ -159,9 +168,7 @@
 %dir %{_prefix}/wok/lib/
 %dir %{_prefix}/wok/site/
 %dir %{_prefix}/data
-%dir %{_prefix}/doc
 %{_prefix}/data/*
-%{_prefix}/doc/*
 %{_prefix}/wok/lib/*
 %{_prefix}/wok/site/*
 %{_prefix}/config.h
@@ -176,21 +183,25 @@
 %{_libdir}/*.la
 %attr(755,root,root) %{_libdir}/*.so
 
-%files doc
-%{_docdir}/%{name}-%{version}
-
 %dir %{_prefix}/src/
 %{_prefix}/src/*
-%dir %{_prefix}/samples
-%{_prefix}/samples/*
 %exclude %{_prefix}/src/UnitsAPI/*.dat
 
+%files doc
+%{_docdir}/%{name}-%{version}
+
+%files samples
+%{_examplesdir}/%{name}-%{version}
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/06/06 19:50:20  gotar
+- packaged samples, with no unnecessary cp; don't break
+
 Revision 1.12  2010/06/06 18:55:22  gotar
 - avoid copying 50+k doc files for packaging
 
================================================================

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