packages: ruby-rcairo/ruby-rcairo.spec, ruby-rcairo/ruby-rcairo-hdr.patch (...

[baggins]

Author: baggins                      Date: Sat Jul 31 21:19:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- install header in proper place

---- Files affected:
packages/ruby-rcairo:
   ruby-rcairo.spec (1.23 -> 1.24) , ruby-rcairo-hdr.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ruby-rcairo/ruby-rcairo.spec
diff -u packages/ruby-rcairo/ruby-rcairo.spec:1.23 packages/ruby-rcairo/ruby-rcairo.spec:1.24
--- packages/ruby-rcairo/ruby-rcairo.spec:1.23	Tue Mar  2 13:17:58 2010
+++ packages/ruby-rcairo/ruby-rcairo.spec	Sat Jul 31 23:19:41 2010
@@ -4,11 +4,12 @@
 Summary(pl.UTF-8):	Moduł Cairo dla języka Ruby
 Name:		ruby-%{pkgname}
 Version:	1.8.1
-Release:	1
+Release:	3
 License:	GPL or custom (see COPYING)
 Group:		Development/Languages
 Source0:	http://cairographics.org/releases/rcairo-%{version}.tar.gz
 # Source0-md5:	14efc24f0cbe281b32882d64f1b0d4b9
+Patch0:		%{name}-hdr.patch
 URL:		http://cairographics.org/rcairo
 BuildRequires:	cairo-devel >= 1.8.0
 BuildRequires:	pkgconfig
@@ -21,6 +22,9 @@
 %{?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"]')
+
 %description
 Cairo module for Ruby.
 
@@ -29,6 +33,7 @@
 
 %prep
 %setup -q -n rcairo-%{version}
+%patch0 -p1
 
 %build
 ruby extconf.rb
@@ -37,10 +42,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_archdir},%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{ruby_archdir},%{ruby_hdrdir},%{_examplesdir}/%{name}-%{version}}
 
 %{__make} install \
 	RUBYLIBDIR=$RPM_BUILD_ROOT%{ruby_rubylibdir} \
+	RUBYHDRDIR=$RPM_BUILD_ROOT%{ruby_hdrdir} \
 	sitearchdir=$RPM_BUILD_ROOT%{ruby_archdir}
 
 cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -57,7 +63,7 @@
 %{_examplesdir}/%{name}-%{version}
 
 # devel?
-%{ruby_archdir}/rb_cairo.h
+%{ruby_hdrdir}/rb_cairo.h
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +71,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2010/07/31 21:19:41  baggins
+- rel 3
+- install header in proper place
+
 Revision 1.23  2010/03/02 12:17:58  baggins
 - up to 1.8.1
 

================================================================
Index: packages/ruby-rcairo/ruby-rcairo-hdr.patch
diff -u /dev/null packages/ruby-rcairo/ruby-rcairo-hdr.patch:1.1
--- /dev/null	Sat Jul 31 23:19:46 2010
+++ packages/ruby-rcairo/ruby-rcairo-hdr.patch	Sat Jul 31 23:19:41 2010
@@ -0,0 +1,6 @@
+--- rcairo-1.8.1/src/depend~	2008-06-20 13:56:19.000000000 +0200
++++ rcairo-1.8.1/src/depend	2010-07-31 23:16:15.049916358 +0200
+@@ -1,2 +1,2 @@
+ install-so:
+-	$(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYARCHDIR)
++	$(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYHDRDIR)
================================================================

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