[rubygem-stomp/epel7: 5/8] Merge branch 'master' into epel7

[stevetraylen]

commit ce70867211bb3c5ed2d650805333a05bca22c301
Merge: 2fae042 e2df706
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Mar 23 12:23:07 2015 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	rubygem-stomp.spec
    	sources

 .gitignore         |   1 +
 rubygem-stomp.spec | 104 ++++++++++++++++++++++++++++++++++++++++-------------
 sources            |   2 +-
 3 files changed, 82 insertions(+), 25 deletions(-)
---
diff --cc .gitignore
index 0b73d67,74ba0f3..2b90b83
--- a/.gitignore
+++ b/.gitignore
@@@ -3,4 -3,4 +3,5 @@@ stomp-1.1.6.ge
  /stomp-1.1.9.gem
  /stomp-1.2.2.gem
  /stomp-1.2.8.gem
 +/stomp-1.3.2.gem
+ /stomp-1.3.4.gem
diff --cc rubygem-stomp.spec
index c8661b2,7f9b635..a7374a3
--- a/rubygem-stomp.spec
+++ b/rubygem-stomp.spec
@@@ -11,14 -9,15 +11,17 @@@ License: ASL 2.
  URL: http://stomp.codehaus.org/
  Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- Requires: ruby(rubygems)
+ %if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
  Requires: ruby(release)
+ %endif
  BuildRequires: rubygems-devel
 +%if 0%{?enable_test}
  BuildRequires: rubygem(rspec)
 +%endif
  BuildArch: noarch
+ %if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
  Provides: rubygem(%{gem_name}) = %{version}
+ %endif
  
  %description
  Ruby client for the Stomp messaging protocol
@@@ -59,35 -65,77 +70,80 @@@ rspec spe
  # Rake test requires a stomp server
  # rake test
  popd
 +%endif
  
  %files
- %defattr(-, root, root, -)
+ %dir %{gem_instdir}
  %{_bindir}/catstomp
  %{_bindir}/stompcat
- %dir %{gem_instdir}
- %{gem_libdir}
  %{gem_instdir}/bin
- %{gem_cache}
+ %{gem_libdir}
+ %exclude %{gem_cache}
+ %exclude %{gem_instdir}/Rakefile
+ %exclude %{gem_instdir}/stomp.gemspec
  %{gem_spec}
+ 
+ 
+ %files doc
+ %doc %{gem_docdir}
  %doc %{gem_instdir}/CHANGELOG.rdoc
  %doc %{gem_instdir}/LICENSE
  %doc %{gem_instdir}/README.rdoc
- 
- %files doc
- %defattr(-, root, root, -)
- %{gem_instdir}/spec
- %{gem_instdir}/test
- %{gem_instdir}/notes
- %{gem_instdir}/examples
- %{gem_instdir}/Rakefile
- %{gem_docdir}
+ %doc %{gem_instdir}/spec
+ %doc %{gem_instdir}/notes
+ %doc %{gem_instdir}/examples/client11_ex1.rb
+ %doc %{gem_instdir}/examples/client11_putget1.rb
+ %doc %{gem_instdir}/examples/conn11_ex1.rb
+ %doc %{gem_instdir}/examples/conn11_ex2.rb
+ %doc %{gem_instdir}/examples/conn11_hb1.rb
+ %doc %{gem_instdir}/examples/consumer.rb
+ %doc %{gem_instdir}/examples/examplogger.rb
+ %doc %{gem_instdir}/examples/get11conn_ex1.rb
+ %doc %{gem_instdir}/examples/get11conn_ex2.rb
+ %doc %{gem_instdir}/examples/logexamp.rb
+ %doc %{gem_instdir}/examples/logexamp_ssl.rb
+ %doc %{gem_instdir}/examples/publisher.rb
+ %doc %{gem_instdir}/examples/put11conn_ex1.rb
+ %doc %{gem_instdir}/examples/putget11_rh1.rb
+ %doc %{gem_instdir}/examples/ssl_ctxoptions.rb
+ %doc %{gem_instdir}/examples/ssl_newparm.rb
+ %doc %{gem_instdir}/examples/ssl_uc1.rb
+ %doc %{gem_instdir}/examples/ssl_uc1_ciphers.rb
+ %doc %{gem_instdir}/examples/ssl_uc2.rb
+ %doc %{gem_instdir}/examples/ssl_uc2_ciphers.rb
+ %doc %{gem_instdir}/examples/ssl_uc3.rb
+ %doc %{gem_instdir}/examples/ssl_uc3_ciphers.rb
+ %doc %{gem_instdir}/examples/ssl_uc4.rb
+ %doc %{gem_instdir}/examples/ssl_uc4_ciphers.rb
+ %doc %{gem_instdir}/examples/ssl_ucx_default_ciphers.rb
+ %doc %{gem_instdir}/examples/stomp11_common.rb
+ %doc %{gem_instdir}/examples/topic_consumer.rb
+ %doc %{gem_instdir}/examples/topic_publisher.rb
+ %doc %{gem_instdir}/test/test_anonymous.rb
+ %doc %{gem_instdir}/test/test_client.rb
+ %doc %{gem_instdir}/test/test_codec.rb
+ %doc %{gem_instdir}/test/test_connection.rb
+ %doc %{gem_instdir}/test/test_connection1p.rb
+ %doc %{gem_instdir}/test/test_helper.rb
+ %doc %{gem_instdir}/test/test_message.rb
+ %doc %{gem_instdir}/test/test_ssl.rb
+ %doc %{gem_instdir}/test/test_urlogin.rb
+ %doc %{gem_instdir}/test/tlogger.rb
  
 -
 -
  %changelog
+ * Wed Mar 11 2015 Steve Traylen  <steve.traylen at cern.ch> - 1.3.4-1
+ - Upstream 1.3.4 release
+ 
 +* Thu Jun 19 2014 Steve Traylen <steve.traylen at cern.ch> - 1.3.2-1
 +- Disable tests on epel7 for now, no rspec.
 +- Updated to version 1.3.2.
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Mon Mar 18 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1.2.8-2
  - BR: rubygem(rspec), not rubygem(rspec-core).