X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmysql-ruby.git;a=blobdiff_plain;f=mysql-ruby.spec;h=bb5446776bc8d84cd26a649b76d9742ad9c2f317;hp=b1cd36610cce12960d28b2ed587bbadfa9303e74;hb=41efb61;hpb=258f795b25ea7af6e800185ade753067d637796d

diff --git a/mysql-ruby.spec b/mysql-ruby.spec
index b1cd366..bb54467 100644
--- a/mysql-ruby.spec
+++ b/mysql-ruby.spec
@@ -1,60 +1,118 @@
+#
+# Conditional build:
+%bcond_without	doc			# don't build ri/rdoc
+
 Summary:	MySQL module for Ruby
-Summary(pl):	Modu³ MySQL dla jêzyka Ruby
+Summary(pl.UTF-8):	Moduł MySQL dla języka Ruby
 Name:		mysql-ruby
-Version:	2.7
-Release:	4
+Version:	2.8.2
+Release:	10
 License:	GPL
 Group:		Development/Languages
 Source0:	http://tmtm.org/downloads/mysql/ruby/%{name}-%{version}.tar.gz
-# Source0-md5:	c6668900e68f0d6a137612c818d5fd01
+# Source0-md5:	eb998b89b7e391cffe0a1f84bd426f9b
 Patch0:		%{name}-amd64.patch
-URL:		http://www.tmtm.org/mysql/ruby/
+Patch1:		%{name}-encoding.patch
+Patch2:		rbconfig-deprecation.patch
+URL:		http://www.tmtm.org/mysql/ruby/README.html
 BuildRequires:	mysql-devel
-BuildRequires:	rpmbuild(macros) >= 1.277
+BuildRequires:	rpm-rubyprov
+BuildRequires:	rpmbuild(macros) >= 1.665
+BuildRequires:	ruby >= 1:1.8.6
 BuildRequires:	ruby-devel
-%{?ruby_mod_ver_requires_eq}
+BuildRequires:	ruby-modules
 Provides:	ruby-mysql-library
-Obsoletes:	ruby-Mysql
-# FIXME: obsolete or conflict, not both
-Obsoletes:	ruby-mysql
 Conflicts:	ruby-mysql
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 MySQL module for Ruby.
 
-%description -l pl
-Modu³ MySQL dla jêzyka Ruby.
+%description -l pl.UTF-8
+Moduł MySQL dla języka Ruby.
+
+%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
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%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
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description ri
+ri documentation for %{name}.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{name}.
 
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
+
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
 ruby extconf.rb \
-	--with-mysql-dir=%{_prefix}
+	--with-mysql-config
+
 %{__make} \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -fPIC"
 
-rdoc -o rdoc
-rdoc --ri -o ri
+%if %{with doc}
+rdoc --ri --op ri
+rdoc --op rdoc
+rm -r ri/Object
+rm ri/created.rid
+rm ri/cache.ri
+rm ri/page-*.ri
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_archdir},%{ruby_ridir}}
-
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir}}
 %{__make} install \
-	archdir=$RPM_BUILD_ROOT%{ruby_archdir} \
-	sitearchdir=$RPM_BUILD_ROOT%{ruby_archdir}
+	archdir=$RPM_BUILD_ROOT%{ruby_vendorarchdir} \
+	sitearchdir=$RPM_BUILD_ROOT%{ruby_vendorarchdir}
 
-cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+%if %{with doc}
+cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README* rdoc
-%attr(755,root,root) %{ruby_archdir}/mysql.so
-%{ruby_ridir}/*
+%doc README*
+%attr(755,root,root) %{ruby_vendorarchdir}/mysql.so
+
+%if %{with doc}
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/Mysql
+%{ruby_ridir}/TC_Mysql*
+%endif