X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f4c4b3b45f70764f56a7c29c4d29928f4280a5df..7481329bdd11d81c4b3e85a446ab1e4bfcc298c8:/ikiwiki.spec?ds=sidebyside diff --git a/ikiwiki.spec b/ikiwiki.spec index 9294586df..534c3a001 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,13 +1,12 @@ Name: ikiwiki -Version: 3.20091024 +Version: 3.20100915 Release: 1%{?dist} Summary: A wiki compiler Group: Applications/Internet License: GPLv2+ URL: http://ikiwiki.info/ -Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz -Patch0: ikiwiki-3.00-libexecdir.patch +Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -32,7 +31,6 @@ Requires: perl(HTML::Scrubber) Requires: perl(XML::Simple) Requires: perl(CGI::FormBuilder) Requires: perl(CGI::Session) -Requires: perl(Digest::SHA1) Requires: python-docutils @@ -49,7 +47,6 @@ array of plugins. %prep %setup0 -q -n %{name} -%patch0 -p1 -b .libexecdir # Filter unwanted Provides: %{__cat} << \EOF > %{name}-prov @@ -90,18 +87,6 @@ EOF %{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin} %find_lang %{name} -# move external plugins -%{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins -%{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \ - %{buildroot}%{_libexecdir}/ikiwiki/plugins - -# remove shebang -%{__sed} -e '1{/^#!/d}' -i \ - %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup \ - %{buildroot}%{_sysconfdir}/ikiwiki/auto-blog.setup \ - %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py - - %clean %{__rm} -rf %{buildroot} @@ -119,7 +104,7 @@ EOF %exclude %{perl_vendorarch} %{perl_vendorlib}/IkiWiki* %exclude %{perl_vendorlib}/IkiWiki*/Plugin/skeleton.pm.example -%{_libexecdir}/ikiwiki +%{_libdir}/ikiwiki %doc README debian/changelog debian/NEWS html %doc IkiWiki/Plugin/skeleton.pm.example @@ -141,130 +126,3 @@ meta-wrapper in this package. %defattr(-,root,root,-) %doc README.fedora %{cgi_bin}/ikiwiki-w3m.cgi - - -%changelog -* Thu Oct 8 2009 Thomas Moschny - 3.14159265-1 -- Update to 3.14159265. - -* Tue Sep 1 2009 Thomas Moschny - 3.1415926-1 -- Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543). - -* Wed Aug 12 2009 Thomas Moschny - 3.141592-1 -- Update to 3.141592. -- po4a is needed now. - -* Fri Jul 24 2009 Fedora Release Engineering - 3.1415-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Jul 17 2009 Thomas Moschny - 3.1415-1 -- Update to 3.1415. - -* Thu Jun 11 2009 Thomas Moschny - 3.14-1 -- Update to 3.14. - -* Fri May 15 2009 Thomas Moschny - 3.12-1 -- Update to 3.12. - -* Tue May 5 2009 Thomas Moschny - 3.11-1 -- Update to 3.11. - -* Sat Apr 25 2009 Thomas Moschny - 3.10-1 -- Update to 3.10. - -* Tue Apr 7 2009 Thomas Moschny - 3.09-1 -- Update to 3.09. - -* Fri Mar 27 2009 Thomas Moschny - 3.08-1 -- Update to 3.08. - -* Mon Mar 9 2009 Thomas Moschny - 3.07-1 -- Update to 3.07. - -* Thu Mar 5 2009 Thomas Moschny - 3.06-1 -- Update to 3.06. - -* Tue Feb 24 2009 Fedora Release Engineering - 3.04-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 18 2009 Thomas Moschny - 3.04-1 -- Update to 3.04. - -* Mon Feb 9 2009 Thomas Moschny - 3.03-1 -- Update to 3.03. - -* Sat Jan 10 2009 Thomas Moschny - 3.01-1 -- Update to 3.01. - -* Fri Jan 2 2009 Thomas Moschny - 3.00-1 -- Update to 3.00. - -* Fri Jan 2 2009 Thomas Moschny - 2.72-1 -- Update to 2.72. -- Patch for mtn plugin has been applied upstream. -- Encoding of ikiwiki.vim has been changed to utf-8 upstream. -- Use new W3M_CGI_BIN option in %%install. - -* Tue Dec 16 2008 Thomas Moschny - 2.70-3 -- Patch for monotone plugin: Prevent broken pipe message. -- Cosmetic changes to satisfy rpmlint. - -* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 2.70-2 -- Rebuild for Python 2.6 - -* Thu Nov 20 2008 Thomas Moschny - 2.70-1 -- Update to 2.70. -- Install and enable the external rst plugin. -- Stop filtering perl(RPC::XML*) requires. - -* Fri Oct 10 2008 Thomas Moschny - 2.66-1 -- Update to 2.66. - -* Fri Sep 19 2008 Thomas Moschny - 2.64-1 -- Update to 2.64. - -* Thu Sep 11 2008 Thomas Moschny - 2.63-1 -- Update to 2.63. - -* Sat Aug 30 2008 Thomas Moschny - 2.62.1-1 -- Update to 2.62.1. Add /etc/ikiwiki. - -* Thu Aug 7 2008 Thomas Moschny - 2.56-1 -- Update to 2.56. -- Stop filtering perl(Net::Amazon::S3), has been approved (bz436481). - -* Thu Jul 31 2008 Thomas Moschny - 2.55-1 -- Update to 2.55. - -* Thu Jul 24 2008 Thomas Moschny - 2.54-1 -- Update to 2.54. -- Move example plugin file to doc. - -* Sat Jul 12 2008 Thomas Moschny - 2.53-1 -- Update to 2.53. - -* Thu Jul 10 2008 Thomas Moschny - 2.52-1 -- Update to 2.52. - -* Sun Jul 6 2008 Thomas Moschny - 2.51-1 -- Update to 2.51. -- Save iconv output to a temporary file. - -* Sun Jun 15 2008 Thomas Moschny - 2.50-1 -- Update to 2.50. -- Move ikiwiki-w3m.cgi into a subpackage. -- Add ikiwiki's own documentation. -- Remove duplicate requirement perl(File::MimeInfo). -- Minor cleanups. - -* Mon Jun 2 2008 Thomas Moschny - 2.48-1 -- Update to 2.48. - -* Wed May 28 2008 Thomas Moschny - 2.47-1 -- Update to 2.47. - -* Tue May 13 2008 Thomas Moschny - 2.46-1 -- Update to 2.46. - -* Sat May 10 2008 Thomas Moschny - 2.45-1 -- New package.