[rubygem-activeldap] - Update to 1.2.2 - Split out document files
Mamoru Tasaka
mtasaka at fedoraproject.org
Fri Sep 10 18:51:54 UTC 2010
commit 3739f16e0535adf39aed249e242d1fd03fad917f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Sat Sep 11 03:51:58 2010 +0900
- Update to 1.2.2
- Split out document files
rubygem-activeldap.spec | 145 ++++++++++++++++++++++++++++-------------------
sources | 2 +-
2 files changed, 88 insertions(+), 59 deletions(-)
---
diff --git a/rubygem-activeldap.spec b/rubygem-activeldap.spec
index 6d5e2e9..0bf0db2 100644
--- a/rubygem-activeldap.spec
+++ b/rubygem-activeldap.spec
@@ -1,32 +1,31 @@
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname activeldap
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%define installroot %{buildroot}%{geminstdir}
-%define examplesdir %{installroot}/examples
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname activeldap
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global rubyabi 1.8
Summary: Ruby/ActiveLdap is a object-oriented API to LDAP
Name: rubygem-%{gemname}
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Group: Development/Languages
-License: GPLv2+
+# Overall license: GPLv2+ or Ruby
+# test-unit/: GPLv2 or Ruby
+License: (GPLv2+ or Ruby) and (GPLv2 or Ruby)
URL: http://rubyforge.org/projects/ruby-activeldap/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: ruby(abi) = 1.8
+Requires: ruby(abi) = %{rubyabi}
Requires: rubygems
-Requires: rubygem(activerecord) >= 2.3.5
+Requires: rubygem(activerecord) >= 2.3.8
Requires: rubygem(locale) >= 2.0.5
Requires: rubygem(gettext) >= 2.1.0
Requires: rubygem(gettext_activerecord) >= 2.1.0
-Requires: rubygem(hoe) >= 2.4.0
Requires: ruby-ldap
+BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: rubygems
BuildRequires: gettext
BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gemname}) = %{version}-%{name}
%description
'Ruby/ActiveLdap' is a ruby extension library which provides a clean objected
@@ -34,68 +33,98 @@ oriented interface to the Ruby/LDAP library. It was inspired by ActiveRecord.
This is not nearly as clean or as flexible as ActiveRecord, but it is still
trivial to define new objects and manipulate them with minimal difficulty.
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+This package contains documentation for %{name}.
+
%prep
+%setup -q -c -T
-%build
+mkdir -p .%{gemdir}
+gem install \
+ --local \
+ --install-dir .%{gemdir} \
+ --force \
+ --rdoc \
+ -V \
+ %{SOURCE0}
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
- --force --rdoc %{SOURCE0}
+find . -name \*.gem | xargs chmod 0644
+%build
# Change the dependency against locale/gettext/active*
# from "strictly equal (=)" to "not less than (>=)"
# (bug 542917)
-pushd %{buildroot}%{geminstdir}
-grep -rl require_gem_if_need . | \
- xargs sed -i -e '/require_gem_if_need/s|"= \([0-9\.][0-9\.]*\)"|">= \1"|'
-popd
-
-rm -f %{examplesdir}/al-admin/public/.htaccess
-rm -f %{examplesdir}/al-admin/public/favicon.ico
-rm -f %{examplesdir}/al-admin/public/stylesheets/welcome.css
-
-
-chmod +x %{installroot}/lib/active_ldap.rb
-chmod +x %{installroot}/test/run-test.rb
-chmod +x %{installroot}/test-unit/bin/testrb
-chmod +x %{installroot}/test-unit/test/run-test.rb
-
-for script in groupadd groupdel groupls groupmod lpasswd ouadd useradd \
-useradd-binary userdel userls usermod usermod-binary-add \
-usermod-binary-add-time usermod-binary-del usermod-lang-add \
-al-admin/script/process/reaper al-admin/script/process/spawner \
-al-admin/script/process/inspector al-admin/script/destroy \
-al-admin/script/plugin al-admin/script/console \
-al-admin/script/performance/profiler al-admin/script/performance/benchmarker \
-al-admin/script/performance/request al-admin/script/server \
-al-admin/script/runner al-admin/script/about al-admin/script/generate \
-al-admin/public/dispatch.fcgi al-admin/public/dispatch.cgi \
-al-admin/public/dispatch.rb al-admin/test/run-test.sh;
+find .%{gemdir} -name \*.gemspec | \
+ xargs sed -i -e '\@add_runtime_dependency at s|"= |">= |'
+grep -rl require_gem_if_need .%{geminstdir} | \
+ xargs sed -i -e '/require_gem_if_need/s|"= \([0-9\.][0-9\.]*\)"|">= \1"|'
+
+%install
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* \
+ %{buildroot}/%{gemdir}/
+
+#locale handling
+## data/locale/en/LC_MESSAGES/active-ldap.mo
+%find_lang active-ldap
+echo "%%defattr(-,root,root,-)" >> active-ldap.lang
+find %{buildroot}%{geminstdir}/data -type d | while read dir
+do
+ echo "%%dir ${dir#%{buildroot}}" >> active-ldap.lang
+done
+
+## examples/al-admin/locale/en/LC_MESSAGES/al-admin.mo
+%find_lang al-admin
+echo "%%defattr(-,root,root,-)" >> al-admin.lang
+find %{buildroot}%{geminstdir}/examples -type d | while read dir
+do
+ echo "%%dir ${dir#%{buildroot}}" >> al-admin.lang
+done
+find %{buildroot}%{geminstdir}/examples -type f | \
+ grep -v /locale/ | \
+ while read file
do
- chmod +x %{examplesdir}/${script}
- sed -i -e 's/\/usr\/bin\/ruby1.8/\/usr\/bin\/ruby/' %{examplesdir}/${script}
+ echo "${file#%{buildroot}}" >> al-admin.lang
done
-%clean
-rm -rf %{buildroot}
+%check
+# Net connection and some setup needed
+exit 0
-%files
+%files -f active-ldap.lang
%defattr(-, root, root, -)
-%{geminstdir}
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/examples/al-admin/public/robots.txt
+%dir %{geminstdir}
+%doc %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
+# listed in lang file
+#%%{geminstdir}/data/
+%{geminstdir}/lib/
+%{geminstdir}/rails*/
+
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%lang(en) %{geminstdir}/data/locale/en/LC_MESSAGES/active-ldap.mo
-%lang(en) %{geminstdir}/examples/al-admin/locale/en/LC_MESSAGES/al-admin.mo
-%lang(ja) %{geminstdir}/data/locale/ja/LC_MESSAGES/active-ldap.mo
-%lang(ja) %{geminstdir}/examples/al-admin/locale/ja/LC_MESSAGES/al-admin.mo
-%lang(nl) %{geminstdir}/examples/al-admin/locale/nl/LC_MESSAGES/al-admin.mo
+
+%files doc -f al-admin.lang
+%defattr(-, root, root, -)
+%{geminstdir}/Rakefile
+%{geminstdir}/benchmark/
+# listed in lang file
+#%%{geminstdir}/examples/
+%{geminstdir}/po/
+%{geminstdir}/test*/
+%{gemdir}/doc/%{gemname}-%{version}/
%changelog
+* Sat Sep 11 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.2-1
+- Update to 1.2.2
+- Split out document files
+
* Mon Feb 15 2010 Darryl L. Pierce <dpierce at redhat.com> - 1.2.1-1
- Upgraded dependency on rubygem-activerecord to >= 2.3.5.
- Upgraded dependency on rubygem-locale to >= 2.0.5.
diff --git a/sources b/sources
index c12d4b6..af51148 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d180d229532c5b825e81c678e613690c activeldap-1.2.1.gem
+a883f4e4863d12b833b8a4489a0a8bd2 activeldap-1.2.2.gem
More information about the scm-commits
mailing list