- ruby 2.0 rebuild

[packages/flashpolicyd.git] / flashpolicyd.spec

diff --git a/flashpolicyd.spec b/flashpolicyd.spec
index de517e13f404ffaeee2a8fcf987f2e1f32d0be6f..aadbce3e74f142c1d94a01ea8eebb052bca3b45f 100644 (file)
--- a/flashpolicyd.spec
+++ b/flashpolicyd.spec
@@ -1,16 +1,16 @@
 %define                plugin  check_flashpolicyd
 Summary:       Daemon to serve Adobe Flash socket policy XML
 Name:          flashpolicyd
-Version:       2.1
-Release:       3
-License:       GPL v2
+Version:       2.2
+Release:       2
+License:       ASL 2.0
 Group:         Networking/Daemons
-URL:           http://code.google.com/p/flashpolicyd/
-Source0:       http://flashpolicyd.googlecode.com/files/%{name}-%{version}.tgz
-# Source0-md5: 0ad1ed0b130cf5850d77600fab90a7c2
+Source0:       https://github.com/ripienaar/flashpolicyd/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 0113f5ca4a2b5677da37a0a66d48bc34
 Source1:       %{name}.init
-Patch0:                %{name}-runas-user.patch
+URL:           http://code.google.com/p/flashpolicyd/
 BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: ruby-modules
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
 Requires:      ruby-modules
@@ -31,6 +31,18 @@ Requires:    ruby >= 1:1.8.7-4
 %description rdoc
 Documentation files for flashpolicyd.
 
+%package ri
+Summary:       ri documentation for flashpolicyd
+Summary(pl.UTF-8):     Dokumentacja w formacie ri dla flashpolicyd
+Group:         Documentation
+Requires:      ruby
+
+%description ri
+ri documentation for flashpolicyd.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla flashpolicyd.
+
 %package -n nagios-plugin-%{plugin}
 Summary:       Nagios plugin to check flashpolicyd
 Group:         Networking
@@ -41,9 +53,6 @@ Nagios plugin to check flashpolicyd.
 
 %prep
 %setup -q
-%patch0 -p1
-mv doc rdoc
-rm rdoc/created.rid
 
 cat > nagios.cfg <<'EOF'
 # Usage:
@@ -66,6 +75,16 @@ define service {
 }
 EOF
 
+%build
+rdoc --ri --op ri --title 'Flash Policy Daemon version %{version}' flashpolicyd.rb check_flashpolicyd.rb
+rdoc --op rdoc --title 'Flash Policy Daemon version %{version}' flashpolicyd.rb check_flashpolicyd.rb
+rm ri/Object/cdesc-Object.ri
+rm ri/Object/run_server-i.ri
+rm ri/Object/sec2dhms-i.ri
+rm ri/Object/showhelp-i.ri
+rm ri/cache.ri
+rm ri/created.rid
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
@@ -73,9 +92,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/flashpolicyd
 install -p flashpolicyd.rb $RPM_BUILD_ROOT%{_sbindir}/flashpolicyd
 cp -a flashpolicy.xml $RPM_BUILD_ROOT%{_sysconfdir}/flashpolicy.xml
 
-# rdoc
-install -d $RPM_BUILD_ROOT%{ruby_rdocdir}
+# rdoc/ri
+install -d $RPM_BUILD_ROOT{%{ruby_ridir},%{ruby_rdocdir}}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
+cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 
 install -d $RPM_BUILD_ROOT{%{pluginconf},%{plugindir}}
 cp -a nagios.cfg $RPM_BUILD_ROOT%{pluginconf}/%{plugin}.cfg
@@ -105,6 +125,10 @@ fi
 %defattr(644,root,root,755)
 %{ruby_rdocdir}/%{name}-%{version}
 
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/PolicyServer
+
 %files -n nagios-plugin-%{plugin}
 %defattr(644,root,root,755)
 %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{pluginconf}/%{plugin}.cfg