[erlang/f14/master: 2/2] Merge branch 'f13-conditional-doc-builds-single' into f14

[Hans Ulrich Niedermann]

commit 76f2f7ffaa36426182e15735a2c38f2123b19182
Merge: f474a9a 270c2dc
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Mon Aug 2 17:18:29 2010 +0200

    Merge branch 'f13-conditional-doc-builds-single' into f14
    
    * f13-conditional-doc-builds-single:
      Add '--without doc' conditional for faster test builds
    
    Conflicts:
    	erlang.spec

 erlang.spec |  121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 120 insertions(+), 1 deletions(-)
---
diff --cc erlang.spec
index d9d4485,1982700..9648be8
--- a/erlang.spec
+++ b/erlang.spec
@@@ -1,12 -1,14 +1,14 @@@
 -%global upstream_ver R13B
 +%global upstream_ver R14A
  # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it!
 -%global upstream_rel 04
 +%global upstream_rel 0
  
+ %bcond_without doc
+ 
  %global n_uvr %{name}-%{upstream_ver}-%{upstream_rel}
  
  Name:		erlang
  Version:	%{upstream_ver}
- Release:	%{upstream_rel}.5%{?dist}
 -Release:	%{upstream_rel}.15%{?dist}
++Release:	%{upstream_rel}.6%{?dist}
  Summary:	General-purpose programming language and runtime environment
  
  Group:		Development/Languages
@@@ -1005,14 -986,21 +1009,17 @@@ rm -f "$RPM_BUILD_ROOT%{_xemacs_sitelis
  install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/"
  
  make DESTDIR=$RPM_BUILD_ROOT install
+ %if %{with doc}
  make DESTDIR=$RPM_BUILD_ROOT install-docs
+ %endif
  
  # fix 0775 permission on some directories
 -find $RPM_BUILD_ROOT%{_libdir}/erlang -type d -perm 0775 | xargs chmod 755
 -
 -# Fix 664 file mode
 -chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/Makefile
 -chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Makefile
 -chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile
 -chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile
 +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/ -type d -perm 0775 | xargs chmod 755
 +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -perm 0775 | xargs chmod 755
 +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin
  
  # Relocate doc-files into the proper directory
+ %if %{with doc}
  mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/lib
  pushd .
  cd $RPM_BUILD_ROOT%{_libdir}/erlang
@@@ -1025,11 -1013,42 +1032,12 @@@ cp -av AUTHORS EPLICENCE README.md $RPM
  mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
  mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
  mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}
+ %endif
  
 -# Win32-specific functionality
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/etop.bat
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/observer-*/priv/bin/getop.bat
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/nteventlog.beam
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/webtool-*/priv/bin/start_webtool.bat
 +# Win32-specific man-pages
  rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/erlsrv.*
  rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man1/werl.*
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.*
  rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.*
 -# Do not mention nteventlog in os_mon.app, see rhbz #592251
 -sed -i "s,\,\s*nteventlog,," $RPM_BUILD_ROOT%{_libdir}/erlang/lib/os_mon-*/ebin/os_mon.app
 -
 -# VxWorks specific
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.*
 -
 -# Remove old txt files
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/otpCA/index.txt.old
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/etc/erlangCA/index.txt.old
 -
 -# remove unneeded Erlang sources, but keep *.hrl files
 -for d in $RPM_BUILD_ROOT%{_libdir}/erlang/lib/* ; do find $d/src -type f ! -name "*.hrl" -print -delete || true ; done
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/hipe-*/{cerl,flow,icode,main,misc,util}/*.erl
 -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/orber-*/COSS/CosNaming/*.erl
 -find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*/src -type d -empty -delete
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/cosFileTransfer-*/src
 -
 -# remove C and Java sources
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/asn1-*/c_src
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/erl_interface-*/src
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/c_src
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/java_src
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/java_src
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/c_src
 -rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/tools-*/c_src
  
  # remove empty directory
  rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man
@@@ -1679,11 -1794,15 +1775,13 @@@ rm -rf $RPM_BUILD_ROO
  %defattr(-,root,root)
  %dir %{_libdir}/erlang/lib/ssl-*/
  %{_libdir}/erlang/lib/ssl-*/ebin
 -%{_libdir}/erlang/lib/ssl-*/include
 -%{_libdir}/erlang/lib/ssl-*/pkix
  %{_libdir}/erlang/lib/ssl-*/priv
  %{_libdir}/erlang/lib/ssl-*/src
+ %if %{with doc}
 -%{_libdir}/erlang/man/man3/new_ssl.*
 +%{_libdir}/erlang/man/man3/old_ssl.*
  %{_libdir}/erlang/man/man3/ssl.*
  %{_libdir}/erlang/man/man6/ssl.*
+ %endif
  
  %files stdlib
  %defattr(-,root,root)
@@@ -2073,10 -2209,13 +2189,13 @@@
  
  
  %changelog
 -* Sun Aug  1 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R13B-04.15
++* Mon Aug  2 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14A-0.6
+ - Implement '--without doc' conditional for faster test builds (#618245).
+ 
 -* Fri Jul 30 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R13B-04.14
 +* Fri Jul 30 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14A-0.5
  - Properly hook up (X)Emacs erlang-mode (#491165)
  
 -* Mon Jul 29 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R13B-04.13
 +* Mon Jul 26 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - R14A-0.4
  - Spec file cleanups:
    - Avoid accidental %%rel increments by rpmdev-bumpspec.
    - Use %%global for our spec file macros.