commit a88d550a7fa9b459f8e77be71d3e27de0a9ee83c
Author: Iain Arnell <iarnell@xxxxxxxxx>
Date: Fri Sep 20 08:36:20 2013 -0600
remove bundled swfupload binaries (RHBZ#1000256)
mojomojo-no-swfupload.patch | 34 ++++++++++++++++++++++++++++++++++
mojomojo.spec | 11 ++++++++++-
2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/mojomojo-no-swfupload.patch b/mojomojo-no-swfupload.patch
new file mode 100644
index 0000000..640aa6d
--- /dev/null
+++ b/mojomojo-no-swfupload.patch
@@ -0,0 +1,34 @@
+diff -up MojoMojo-1.10/root/base/page/attachments.tt.orig MojoMojo-1.10/root/base/page/attachments.tt
+--- MojoMojo-1.10/root/base/page/attachments.tt.orig 2010-11-03 04:16:24.000000000 -0600
++++ MojoMojo-1.10/root/base/page/attachments.tt 2013-09-20 08:30:34.304132600 -0600
+@@ -1,9 +1,8 @@
+ [% WRAPPER page/wrapper.tt title=loc('Attachments for') _ " " _ page.name %]
+ <div id="content">
+
+- [% IF c.req.params.plain || ! c.user.obj %]
+ [% IF c.user.obj %]
+- <p>(<a href="[% c.uri_for('attachments', {plain=>0}) %]">[% loc('Switch to flash uploader') %]</a>)
++ <p>
+
+ <form action="[% c.uri_for('plain_upload') %]" enctype="multipart/form-data" method="post">
+ <input type="hidden" name="plain" value="1"/>
+@@ -14,19 +13,6 @@
+ [% END %]
+ <br />
+
+- [% ELSE %]
+- <a href="#" id="do_upload">[% loc('Choose attachments') %]</a>
+- <p>[% loc('Please select a file to attach to this page. To upload multiple files, hold CTRL while selecting multiple files in the file selection pop up window.') %] </p>
+- <p>[% loc('If the flash uploader gives you problems, switch to the')%] <a href="[%c.uri_for('attachments',{plain=>1}) %]">[%loc('plain uploader')%]</a></p>
+-
+- <a href="[% c.uri_for('attachment/list') %]" id="list_link"></a>
+- <a href="[% c.uri_for('attachment/flash_upload', {id => c.user.obj.id, verify => c.user.obj.hashed(c.pref('entropy'))}) %]" id="upload_link"></a>
+-
+- <div id="progressbar"><div id="progress"></div></div>
+-
+- <h3 id="progress_status"></h3>
+-
+- [% END -%]
+
+ <div id="attachments">
+ [%+ PROCESS attachments/list.tt | indent 4 IF page.attachments.size %]
diff --git a/mojomojo.spec b/mojomojo.spec
index d981591..d7a06d5 100644
--- a/mojomojo.spec
+++ b/mojomojo.spec
@@ -1,6 +1,6 @@
Name: mojomojo
Version: 1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Wiki with a tree
License: GPL+ or Artistic
Group: Applications/Internet
@@ -12,6 +12,8 @@ Source1: mojomojo-httpd.conf
Patch0: formatter-docbook.patch
# adjust paths
Patch2: mojomojo-paths.patch
+# remove precompiled swfupload binaries (RHBZ#1000256)
+Patch3: mojomojo-no-swfupload.patch
BuildArch: noarch
@@ -205,6 +207,10 @@ wiki page.
%setup -q -n MojoMojo-%{version}
%patch0 -p 1
%patch2 -p 1
+%patch3 -p 1
+
+# remove precomplied swfupload
+rm -rf root/static/flash/
# update the scripts for current catalyst
rm script/mojomojo_fastcgi_manage.pl
@@ -283,6 +289,9 @@ CATALYST_CONFIG=t/var/mojomojo.yml make test
%changelog
+* Fri Sep 20 2013 Iain Arnell <iarnell@xxxxxxxxx> 1.10-2
+- remove bundled swfupload binaries (RHBZ#1000256)
+
* Sat Aug 10 2013 Iain Arnell <iarnell@xxxxxxxxx> 1.10-1
- update to latest upstream version
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
