X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby-rcairo.spec;h=dc58d281504e32c8ecda26f2149c9fd4d232f326;hb=27a4fd39889cf0bdbaa813ff04cd5035599e8b35;hp=dc4b21c65e631df1bd57dbd39c19f096b3bc8c73;hpb=696bee574068ca2adcb41d97ce128d07c78e84ed;p=packages%2Fruby-rcairo.git

diff --git a/ruby-rcairo.spec b/ruby-rcairo.spec
index dc4b21c..dc58d28 100644
--- a/ruby-rcairo.spec
+++ b/ruby-rcairo.spec
@@ -2,28 +2,28 @@
 Summary:	Cairo module for Ruby
 Summary(pl.UTF-8):	Moduł Cairo dla języka Ruby
 Name:		ruby-%{pkgname}
-Version:	1.12.1
+Version:	1.15.10
 Release:	1
 License:	GPL or custom (see COPYING)
 Group:		Development/Languages
 Source0:	http://cairographics.org/releases/rcairo-%{version}.tar.gz
-# Source0-md5:	dae99e1159c6791b7671fe8f43c0ca26
+# Source0-md5:	2812e9e9d61759acff3fa35839f52606
 Patch0:		%{name}-hdr.patch
+Patch1:		no-native-packages.patch
 URL:		http://cairographics.org/rcairo/
-BuildRequires:	cairo-devel >= 1.12.0
+BuildRequires:	cairo-devel >= 1.14.0
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.277
+BuildRequires:	rpmbuild(macros) >= 1.410
 BuildRequires:	ruby-devel >= 1:1.8
 BuildRequires:	ruby-pkg-config
-Requires:	cairo >= 1.12.0
+Requires:	cairo >= 1.14.0
 Requires:	ruby >= 1:1.8
 # dropped?
 Obsoletes:	ruby-rcairo-gtkcairo
-%{?ruby_mod_ver_requires_eq}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # TODO: move this to rpm macros.build
-%define 	ruby_hdrdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubyhdrdir"]')
+%define		ruby_hdrdir	%(%{__ruby} -r rbconfig -e 'print RbConfig::CONFIG["rubyhdrdir"]')
 
 %description
 Cairo module for Ruby.
@@ -35,7 +35,8 @@ Moduł Cairo dla języka Ruby.
 Summary:	Header file for Ruby rcairo extension
 Summary(pl.UTF-8):	Plik nagłówkowy rozszerzenia rcairo dla języka Ruby
 Group:		Development/Libraries
-Requires:	cairo-devel >= 1.12.0
+Requires:	%{name} = %{version}-%{release}
+Requires:	cairo-devel >= 1.14.0
 Requires:	ruby-devel >= 1:1.8
 
 %description devel
@@ -47,6 +48,7 @@ Plik nagłówkowy rozszerzenia rcairo dla języka Ruby.
 %prep
 %setup -q -n rcairo-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 ruby extconf.rb
@@ -57,10 +59,10 @@ ruby extconf.rb
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{ruby_hdrdir},%{_examplesdir}/%{name}-%{version}}
 
-%{__make} install \
-	RUBYLIBDIR=$RPM_BUILD_ROOT%{ruby_rubylibdir} \
+%{__make} -j1 install \
+	RUBYLIBDIR=$RPM_BUILD_ROOT%{ruby_vendorlibdir} \
 	RUBYHDRDIR=$RPM_BUILD_ROOT%{ruby_hdrdir} \
-	sitearchdir=$RPM_BUILD_ROOT%{ruby_archdir}
+	sitearchdir=$RPM_BUILD_ROOT%{ruby_vendorarchdir}
 
 cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -70,9 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING NEWS README.rdoc
-%attr(755,root,root) %{ruby_archdir}/cairo.so
-%{ruby_rubylibdir}/cairo
-%{ruby_rubylibdir}/cairo.rb
+%attr(755,root,root) %{ruby_vendorarchdir}/cairo.so
+%{ruby_vendorlibdir}/cairo
+%{ruby_vendorlibdir}/cairo.rb
 %{_examplesdir}/%{name}-%{version}
 
 %files devel