aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-10-29 11:44:06 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-10-29 11:44:06 -0400
commitbe895687ca7f83139ddbe519831b6b867788f69b (patch)
tree13157643ef92b1d6b7050665d8beacef1b35e8da
parentd62eeaa4b5540ec927355c00acf76361f73cfe3d (diff)
downloadikiwiki-be895687ca7f83139ddbe519831b6b867788f69b.tar
ikiwiki-be895687ca7f83139ddbe519831b6b867788f69b.tar.gz
remove libexecdir patch
This violates the FHS. (Also removed unnecessary chebang removal code.)
-rw-r--r--ikiwiki.spec16
1 files changed, 1 insertions, 15 deletions
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 4805cc361..69457e154 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -6,7 +6,6 @@ Summary: A wiki compiler
Group: Applications/Internet
License: GPLv2+
URL: http://ikiwiki.info/
-Patch0: ikiwiki-3.00-libexecdir.patch
BuildArch: noarch
BuildRequires: perl(Text::Markdown)
@@ -47,7 +46,6 @@ array of plugins.
%prep
%setup0 -q -n %{name}
-%patch0 -p1 -b .libexecdir
# Filter unwanted Provides:
%{__cat} << \EOF > %{name}-prov
@@ -88,18 +86,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}
@@ -117,7 +103,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