Author: baggins                      Date: Tue Mar  9 12:05:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.9.2
- added rdoc and ri packages

---- Files affected:
packages/ruby-mysql:
   ruby-mysql.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/ruby-mysql/ruby-mysql.spec
diff -u packages/ruby-mysql/ruby-mysql.spec:1.28 
packages/ruby-mysql/ruby-mysql.spec:1.29
--- packages/ruby-mysql/ruby-mysql.spec:1.28    Thu Mar  8 07:40:05 2007
+++ packages/ruby-mysql/ruby-mysql.spec Tue Mar  9 13:05:15 2010
@@ -2,62 +2,91 @@
 Summary:       Pure Ruby MySQL library
 Summary(pl.UTF-8):     Biblioteka MySQL napisana w czystym Rubym
 Name:          ruby-mysql
-Version:       0.2.6
-Release:       2
+Version:       2.9.2
+Release:       1
 License:       GPL
 Group:         Development/Languages
-Source0:       http://www.tmtm.org/ruby/mysql/%{name}-%{version}.tar.gz
-# Source0-md5: 90e139a042294ed66338f369346249f1
-Source1:       setup.rb
+Source0:       http://rubygems.org/downloads/%{name}-%{version}.gem
+# Source0-md5: d0fc9e635a0f343b441ea8c0c30c2eb7
 Patch0:                %{name}-socketpath.patch
 URL:           http://www.tmtm.org/ruby/mysql/
-BuildRequires: rpmbuild(macros) >= 1.277
-BuildRequires: ruby-devel
+BuildRequires: rpmbuild(macros) >= 1.484
+BuildRequires: ruby >= 1:1.8.6
+BuildRequires: ruby-modules
 %{?ruby_mod_ver_requires_eq}
-Obsoletes:     mysql-ruby
 Obsoletes:     ruby-Mysql
-Conflicts:     mysql-ruby
-Conflicts:     ruby-Mysql
 Provides:      ruby-mysql-library
+Conflicts:     mysql-ruby
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# nothing to be placed there. we're not noarch only because of ruby packaging
+%define                _enable_debug_packages  0
+
 %description
 Pure Ruby MySQL library.
 
 %description -l pl.UTF-8
 Biblioteka MySQL napisana w czystym Rubym.
 
+%package rdoc
+Summary:       HTML documentation for %{name}
+Summary(pl.UTF-8):     Dokumentacja w formacie HTML dla %{name}
+Group:         Documentation
+Requires:      ruby >= 1:1.8.7-4
+
+%description rdoc
+HTML documentation for %{name}.
+
+%description rdoc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{name}.
+
+%package ri
+Summary:       ri documentation for %{name}
+Summary(pl.UTF-8):     Dokumentacja w formacie ri dla %{name}
+Group:         Documentation
+Requires:      ruby
+
+%description ri
+ri documentation for %{name}.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{name}.
+
 %prep
-%setup -q
+%setup -q -c
+%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README.rdoc -o -print | xargs touch --reference %{SOURCE0}
 %patch0 -p1
-cp %{SOURCE1} .
-mkdir lib
-mv mysql.rb lib/
 
 %build
-ruby setup.rb config \
-       --siterubyver=%{ruby_rubylibdir}
-ruby setup.rb setup
-
-rdoc -o rdoc lib --inline-source
-rdoc --ri lib -o ri
+rdoc --ri --op ri lib
+rdoc --op rdoc lib
+rm ri/created.rid
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir}}
-
-ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
 
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README* rdoc
+%doc README*
 %{ruby_rubylibdir}/mysql.rb
-%{ruby_ridir}/*
+%{ruby_rubylibdir}/mysql
+
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/Mysql
 
 %define        date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +94,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2010/03/09 12:05:15  baggins
+- up to 2.9.2
+- added rdoc and ri packages
+
 Revision 1.28  2007/03/08 06:40:05  aredridel
 - massive attack: correct ri output path for ruby 1.8.6
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-mysql/ruby-mysql.spec?r1=1.28&r2=1.29&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to