vondruch pushed to rubygem-net-ldap (master). "Update to net-ldap 0.11."

notifications at fedoraproject.org notifications at fedoraproject.org
Wed May 13 12:54:37 UTC 2015


From 6896e2a3fcac6309dfb6dec72efd9b9f41657075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Wed, 13 May 2015 14:54:23 +0200
Subject: Update to net-ldap 0.11.


diff --git a/.gitignore b/.gitignore
index bd3e179..69f807f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /net-ldap-0.2.2.gem
 /net-ldap-0.3.1.gem
 /net-ldap-0.6.1.gem
+/net-ldap-0.11.gem
diff --git a/rubygem-net-ldap-0.3.1-fix-test-encoding.patch b/rubygem-net-ldap-0.3.1-fix-test-encoding.patch
deleted file mode 100644
index b10d8d9..0000000
--- a/rubygem-net-ldap-0.3.1-fix-test-encoding.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 578d1bc2ec7ed18b06a9dc39ebeb7a41b4bf25cd
-Author: Bohuslav Kabrda <bkabrda at redhat.com>
-Date:   Thu Mar 7 14:39:43 2013 +0100
-
-    Update test_snmp.rb
-    
-    In Ruby 2.0, all files are in UTF8 by default, so the SnmpGetRequest* variables get transformed into Unicode sequences and tests fail. This PR simply fixes this by using us-ascii coding for this file.
-
-diff --git a/test/test_snmp.rb b/test/test_snmp.rb
-index 88a619d..b21ec66 100644
---- a/test/test_snmp.rb
-+++ b/test/test_snmp.rb
-@@ -1,3 +1,4 @@
-+# coding: us-ascii
- # $Id: testsnmp.rb 231 2006-12-21 15:09:29Z blackhedd $
- 
- require 'common'
diff --git a/rubygem-net-ldap.spec b/rubygem-net-ldap.spec
index 8705936..2800d2d 100644
--- a/rubygem-net-ldap.spec
+++ b/rubygem-net-ldap.spec
@@ -1,20 +1,21 @@
 # Generated from net-ldap-0.2.2.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name net-ldap
 
-Summary: Net::LDAP for Ruby implements client access LDAP protocol
 Name: rubygem-%{gem_name}
-Version: 0.6.1
+Version: 0.11
 Release: 1%{?dist}
+Summary: Net::LDAP for Ruby implements client access LDAP protocol
 Group: Development/Languages
 License: MIT
-URL: http://rubyldap.com/
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Patch0: %{name}-0.3.1-fix-test-encoding.patch
+URL: http://github.com/ruby-ldap/ruby-net-ldap
+Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
+BuildRequires: ruby >= 1.9.3
 # specs need metaid gem that is not in Fedora yet
 # BuildRequires: rubygem(metaid)
 # BuildRequires: rubygem(rspec-core)
-# BuildRequires: rubygem(flexmock)
+BuildRequires: rubygem(flexmock)
 BuildRequires: rubygem(test-unit)
 BuildArch: noarch
 # this package obsoletes rubygem-ruby-net-ldap
@@ -42,38 +43,31 @@ Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description doc
-Documentation for %{name}
+Documentation for %{name}.
 
 %prep
 %setup -q -c -T
-# Fails due to error during generating documentation.
-# https://github.com/rdoc/rdoc/issues/311
-#%%gem_install -n %%{SOURCE0}
-gem install -V --local \
-  --install-dir .%{gem_dir} \
-  --bindir .%{bindir} \
-  --force --document=ri,rdoc \
-  %{SOURCE0} || :
-
-pushd .%{gem_instdir}
-%patch0 -p1
-popd
+%gem_install -n %{SOURCE0}
 
 %build
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+
+# Remove meaningless shebang.
+# https://github.com/ruby-ldap/ruby-net-ldap/pull/200
+sed -i "/#!/ d" %{buildroot}%{gem_instdir}/Rakefile
 
 %check
 pushd .%{gem_instdir}
 ruby -Ilib:test -e 'Dir.glob "./test/**/test_*.rb", &method(:require)'
-#rspec spec
 popd
 
 %files
 %dir %{gem_instdir}
-%doc %{gem_instdir}/License.rdoc
+%license %{gem_instdir}/License.rdoc
 %exclude %{gem_instdir}/.*
 %{gem_libdir}
 %exclude %{gem_cache}
@@ -81,20 +75,23 @@ popd
 
 %files doc
 %doc %{gem_docdir}
-%doc %{gem_instdir}/Manifest.txt
+%doc %{gem_instdir}/CONTRIBUTING.md
 %doc %{gem_instdir}/Contributors.rdoc
 %doc %{gem_instdir}/Hacking.rdoc
 %doc %{gem_instdir}/History.rdoc
 %doc %{gem_instdir}/README.rdoc
-%{gem_instdir}/autotest
 %{gem_instdir}/%{gem_name}.gemspec
 %{gem_instdir}/Gemfile
 %{gem_instdir}/Rakefile
-%{gem_instdir}/spec
+%{gem_instdir}/script
 %{gem_instdir}/test
+%exclude %{gem_instdir}/test/support/vm/openldap/.gitignore
 %{gem_instdir}/testserver
 
 %changelog
+* Wed May 13 2015 Vít Ondruch <vondruch at redhat.com> - 0.11-1
+- Update to net-ldap 0.11.
+
 * Tue Jun 17 2014 Vít Ondruch <vondruch at redhat.com> - 0.6.1-1
 - Update to net-ldap 0.6.1.
 
diff --git a/sources b/sources
index f25fc3c..d28aee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c0593505a4d562cc70f86c3ade2ab1f  net-ldap-0.6.1.gem
+6ec04db8d78b296c04e528e37b5fea6b  net-ldap-0.11.gem
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rubygem-net-ldap.git/commit/?h=master&id=6896e2a3fcac6309dfb6dec72efd9b9f41657075


More information about the scm-commits mailing list