diff --git a/.gitignore b/.gitignore index aaba641..cbaa37c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /ikiwiki_3.20120115.tar.gz /ikiwiki_3.20120202.tar.gz /ikiwiki_3.20120203.tar.gz +/ikiwiki_3.20120419.tar.gz diff --git a/ikiwiki.spec b/ikiwiki.spec index 1610f52..16b5c6a 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20120203 +Version: 3.20120419 Release: 1%{?dist} Summary: A wiki compiler @@ -66,7 +66,7 @@ array of plugins. %patch0 -p1 -b .libexecdir # goes into the -w3m subpackage -%{__cat} << \EOF > README.fedora +cat << \EOF > README.fedora See http://ikiwiki.info/w3mmode/ for more information. EOF @@ -74,24 +74,24 @@ EOF %build %{__perl} Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} # parallel builds currently don't work -%{__make} +make %install -%{__rm} -rf %{buildroot} -%{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin} +rm -rf %{buildroot} +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 +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 +sed -e '1{/^#!/d}' -i \ + %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup \ + %{buildroot}%{_sysconfdir}/ikiwiki/auto-blog.setup \ + %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py # fix permissions find %{buildroot}%{perl_vendorlib}/IkiWiki -type f \ @@ -99,7 +99,7 @@ find %{buildroot}%{perl_vendorlib}/IkiWiki -type f \ %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %files -f %{name}.lang @@ -140,6 +140,10 @@ meta-wrapper in this package. %changelog +* Mon Apr 30 2012 Thomas Moschny - 3.20120419-1 +- Update to 3.20120419. +- Specfile cleanups. + * Mon Mar 26 2012 Thomas Moschny - 3.20120203-1 - Update to 3.20120203. diff --git a/sources b/sources index a682cd2..972b9c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad12f7b73a889c848b97346b66909633 ikiwiki_3.20120203.tar.gz +0ce3494ebe36cce6e42c53844aae8cca ikiwiki_3.20120419.tar.gz