rpms/ikiwiki/F-10 ikiwiki-2.72-libexecdir.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 ikiwiki.spec, 1.11, 1.12 import.log, 1.11, 1.12 sources, 1.11, 1.12 ikiwiki-2.70-libexecdir.patch, 1.1, NONE ikiwiki-2.70-mtn.patch, 1.1, NONE
Thomas Moschny
thm at fedoraproject.org
Fri Jan 2 11:32:57 UTC 2009
Author: thm
Update of /cvs/pkgs/rpms/ikiwiki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17980/F-10
Modified Files:
.cvsignore ikiwiki.spec import.log sources
Added Files:
ikiwiki-2.72-libexecdir.patch
Removed Files:
ikiwiki-2.70-libexecdir.patch ikiwiki-2.70-mtn.patch
Log Message:
Update to 2.72, plus some specfile fixes.
ikiwiki-2.72-libexecdir.patch:
--- NEW FILE ikiwiki-2.72-libexecdir.patch ---
diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
--- ikiwiki/IkiWiki.pm.orig 2008-12-28 21:00:37.000000000 +0100
+++ ikiwiki/IkiWiki.pm 2009-01-02 12:16:43.000000000 +0100
@@ -547,7 +547,7 @@ sub loadplugin ($) {
return if grep { $_ eq $plugin} @{$config{disable_plugins}};
foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
- "$installdir/lib/ikiwiki") {
+ "$installdir/libexec/ikiwiki") {
if (defined $dir && -x "$dir/plugins/$plugin") {
eval { require IkiWiki::Plugin::external };
if ($@) {
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 20 Nov 2008 21:26:51 -0000 1.11
+++ .cvsignore 2 Jan 2009 11:32:26 -0000 1.12
@@ -1 +1 @@
-ikiwiki_2.70.tar.gz
+ikiwiki_2.72.tar.gz
Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/ikiwiki.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ikiwiki.spec 19 Dec 2008 15:44:54 -0000 1.11
+++ ikiwiki.spec 2 Jan 2009 11:32:27 -0000 1.12
@@ -1,14 +1,13 @@
Name: ikiwiki
-Version: 2.70
-Release: 3%{?dist}
+Version: 2.72
+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-2.70-libexecdir.patch
-Patch1: ikiwiki-2.70-mtn.patch
+Patch0: ikiwiki-2.72-libexecdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -50,7 +49,6 @@
%prep
%setup0 -q -n %{name}
%patch0 -p1 -b .libexecdir
-%patch1 -p1
# Filter unwanted Provides:
%{__cat} << \EOF > %{name}-prov
@@ -88,26 +86,14 @@
%install
%{__rm} -rf %{buildroot}
-%{__make} pure_install DESTDIR=%{buildroot}
+%{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin}
%find_lang %{name}
-# cgi script is wrongly installed in a fixed place
-%{__mkdir_p} %{buildroot}%{cgi_bin}
-%{__mv} %{buildroot}%{_prefix}/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \
- %{buildroot}%{cgi_bin}
-
# move external plugins
%{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins
%{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
%{buildroot}%{_libexecdir}/ikiwiki/plugins
-# fix encoding
-iconv -f iso-8859-9 -t utf-8 \
- html/tips/vim_syntax_highlighting/ikiwiki.vim \
- -o html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp
-%{__mv} html/tips/vim_syntax_highlighting/ikiwiki.vim.tmp \
- html/tips/vim_syntax_highlighting/ikiwiki.vim
-
# remove shebang
%{__sed} -e '1{/^#!/d}' -i \
%{buildroot}%{_sysconfdir}/ikiwiki/auto.setup
@@ -157,6 +143,12 @@
%changelog
+* Fri Jan 2 2009 Thomas Moschny <thomas.moschny at gmx.de> - 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 <thomas.moschny at gmx.de> - 2.70-3
- Patch for monotone plugin: Prevent broken pipe message.
- Cosmetic changes to satisfy rpmlint.
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log 19 Dec 2008 15:44:54 -0000 1.11
+++ import.log 2 Jan 2009 11:32:27 -0000 1.12
@@ -9,3 +9,4 @@
ikiwiki-2_64-1_fc9:HEAD:ikiwiki-2.64-1.fc9.src.rpm:1221813107
ikiwiki-2_70-1_fc9:F-10:ikiwiki-2.70-1.fc9.src.rpm:1227216329
ikiwiki-2_70-3_fc10:F-10:ikiwiki-2.70-3.fc10.src.rpm:1229701432
+ikiwiki-2_72-1_fc10:F-10:ikiwiki-2.72-1.fc10.src.rpm:1230895904
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 20 Nov 2008 21:26:51 -0000 1.11
+++ sources 2 Jan 2009 11:32:27 -0000 1.12
@@ -1 +1 @@
-43d9dc1a5e03e38dd829cd4d4a38eeb4 ikiwiki_2.70.tar.gz
+5bebbd85c2ad80ed9c8d730ba4f91e1a ikiwiki_2.72.tar.gz
--- ikiwiki-2.70-libexecdir.patch DELETED ---
--- ikiwiki-2.70-mtn.patch DELETED ---
More information about the scm-commits
mailing list