Remember to run all the tests before committing!

[git.ikiwiki.info.git] / ikiwiki.spec

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 4805cc36103038cbf19a3adf4addc235d4adf65c..0c7f435d934a81fb9dfb9056453caa9c25242f57 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,12 +1,13 @@
 Name:           ikiwiki
 Name:           ikiwiki

-Version: 3.20091024
+Version: 3.20120202

 Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://ikiwiki.info/

-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
 
 BuildRequires:  perl(Text::Markdown)
 BuildArch:      noarch
 
 BuildRequires:  perl(Text::Markdown)


@@ -30,7 +31,6 @@ Requires:       perl(HTML::Scrubber)
 Requires:       perl(XML::Simple)
 Requires:       perl(CGI::FormBuilder)
 Requires:       perl(CGI::Session)
 Requires:       perl(XML::Simple)
 Requires:       perl(CGI::FormBuilder)
 Requires:       perl(CGI::Session)

-Requires:       perl(Digest::SHA1)

 
 Requires:       python-docutils
 
 
 Requires:       python-docutils
 


@@ -47,7 +47,6 @@ array of plugins.
 
 %prep
 %setup0 -q -n %{name}
 
 %prep
 %setup0 -q -n %{name}

-%patch0 -p1 -b .libexecdir

 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov


@@ -88,18 +87,6 @@ EOF
 %{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin}
 %find_lang %{name}
 
 %{__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}
 
 %clean
 %{__rm} -rf %{buildroot}
 


@@ -117,7 +104,7 @@ EOF
 %exclude %{perl_vendorarch}
 %{perl_vendorlib}/IkiWiki*
 %exclude %{perl_vendorlib}/IkiWiki*/Plugin/skeleton.pm.example
 %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
 
 %doc README debian/changelog debian/NEWS html
 %doc IkiWiki/Plugin/skeleton.pm.example