[packages/ruby-SyslogLogger] build noarch, to vendorlibdir

glen glen at pld-linux.org
Mon Aug 10 11:23:58 CEST 2015


commit cbbee18410cfd30c68116aed3c77554d90644069
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Aug 10 12:23:49 2015 +0300

    build noarch, to vendorlibdir

 ruby-SyslogLogger.spec | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/ruby-SyslogLogger.spec b/ruby-SyslogLogger.spec
index 70408d9..91c4ae4 100644
--- a/ruby-SyslogLogger.spec
+++ b/ruby-SyslogLogger.spec
@@ -2,22 +2,17 @@
 Summary:	Logger replacement that logs to syslog
 Name:		ruby-%{pkgname}
 Version:	1.4.0
-Release:	2
+Release:	3
 License:	Ruby License
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5:	49979374ba46d3600c9969f2815ba1d0
 Group:		Development/Languages
 URL:		http://seattlerb.rubyforge.org/SyslogLogger/
-BuildRequires:	rpmbuild(macros) >= 1.484
-BuildRequires:	ruby >= 1:1.8.6
-BuildRequires:	ruby-modules
-%{?ruby_mod_ver_requires_eq}
-#BuildArch:	noarch
+BuildRequires:	rpm-rubyprov
+BuildRequires:	rpmbuild(macros) >= 1.665
+BuildArch:	noarch
 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
 SyslogLogger is a Logger replacement that logs to syslog.
 It is almost drop-in with a few caveats.
@@ -47,20 +42,19 @@ ri documentation for %{pkgname}.
 Dokumentacji w formacie ri dla %{pkgname}.
 
 %prep
-%setup -q -c
-%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
-find -newer README.txt -o -print | xargs touch --reference %{SOURCE0}
+%setup -q
 
 %build
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
 rm ri/created.rid
+rm ri/cache.ri
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir}}
 
-cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 
@@ -70,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc History.txt README.txt
-%{ruby_rubylibdir}/*.rb
-%{ruby_rubylibdir}/analyzer_tools
+%{ruby_vendorlibdir}/*.rb
+%{ruby_vendorlibdir}/analyzer_tools
 
 %files rdoc
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-SyslogLogger.git/commitdiff/cbbee18410cfd30c68116aed3c77554d90644069



More information about the pld-cvs-commit mailing list