[openwsman/f19] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0

Vít Ondruch vondruch at fedoraproject.org
Tue Mar 19 16:01:30 UTC 2013


commit 5e3887e0b9756f4fae4075d34297062821632662
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Mar 19 14:27:24 2013 +0100

    Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0

 .gitignore                         |    1 +
 openwsman-2.2.3-initscript.patch   |   81 ------------------------------------
 openwsman-2.2.7-disable-ruby.patch |   12 -----
 openwsman-sitelibdir.patch         |   29 -------------
 openwsman.spec                     |   21 ++++-----
 openwsmand.8.gz                    |  Bin 412 -> 0 bytes
 sources                            |    1 +
 7 files changed, 11 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index afa3613..92abbfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ openwsman-2.2.3.tar.bz2
 /openwsman-2.3.0.tar.bz2
 /openwsman-2.3.5.tar.bz2
 /openwsman-2.3.6.tar.bz2
+/openwsmand.8.gz
diff --git a/openwsman.spec b/openwsman.spec
index 8c1f1e9..064fe5a 100644
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -3,8 +3,6 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'vd = RbConfig::CONFIG["vendorlibdir"]; print(vd ? vd : RbConfig::CONFIG["sitelibdir"])')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = RbConfig::CONFIG["vendorarchdir"]; print(vad ? vad : RbConfig::CONFIG["sitearchdir"])')}
 
 
 Name:           openwsman
@@ -29,7 +27,6 @@ Source1:        openwsmand.8.gz
 Source2:        openwsmand.service
 # script for testing presence of the certificates in ExecStartPre
 Source3:        owsmantestcert.sh
-Patch0:         %{name}-sitelibdir.patch
 Patch1:         openwsman-2.2.7-libssl.patch
 
 %description
@@ -117,7 +114,7 @@ API.
 License:        BSD
 Group:          Development/Libraries
 Requires:       ruby
-Requires:       ruby(abi) >= 2.0.0
+Requires:       ruby(release)
 Summary:        Ruby bindings for openwsman client API
 
 %description ruby
@@ -147,8 +144,6 @@ This package provides Perl bindings to access the openwsman client API.
 
 %prep
 %setup -q
-# don't make backup of file patched by patch0, it'll be installed...
-%patch0 -p1
 %patch1 -p1 -b .libssl
 
 %build
@@ -182,9 +177,8 @@ cd ..
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la
 rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la
-[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsmanplugin.rb
-[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsman.rb
-[ -d %{buildroot/}%{ruby_vendorlib} ] && rm -f %{buildroot}/%{ruby_vendorlib}/openwsmanplugin.rb
+[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsmanplugin.rb
+[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsman.rb
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
 install -m 644 etc/openwsman.conf %{buildroot}/%{_sysconfdir}/openwsman
 install -m 644 etc/openwsman_client.conf %{buildroot}/%{_sysconfdir}/openwsman
@@ -240,9 +234,9 @@ rm -f /var/log/wsmand.log
 %doc AUTHORS COPYING ChangeLog README.md
 
 %files ruby
-%{ruby_sitearch}/_openwsman.so
-%dir %{ruby_sitelib}/openwsman
-%{ruby_sitelib}/openwsman/*.rb
+%{ruby_vendorarchdir}/_openwsman.so
+%dir %{ruby_vendorlibdir}/openwsman
+%{ruby_vendorlibdir}/openwsman/*.rb
 %doc AUTHORS COPYING ChangeLog README.md
 
 
@@ -284,6 +278,9 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
+* Tue Mar 19 2013 Vít Ondruch <vondruch at redhat.com> - 2.3.6-5
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
 * Mon Mar 18 2013 Praveen K Paladugu <praveen_paladugu at dell.com>-2.3.6-5
 - Disabling the java binding for now. 
 
diff --git a/sources b/sources
index de5d449..56c6960 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 54eb12ce88c7750b240d6185df2d6716  openwsman-2.3.6.tar.bz2
+57979ad828cabf969adac186642f69bc  openwsmand.8.gz


More information about the scm-commits mailing list