commit python-moin for openSUSE:Factory

Hello community, here is the log from the commit of package python-moin for openSUSE:Factory checked in at 2014-09-22 09:23:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-moin (Old) and /work/SRC/openSUSE:Factory/.python-moin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-moin" Changes: -------- --- /work/SRC/openSUSE:Factory/python-moin/python-moin.changes 2014-09-17 17:24:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-moin.new/python-moin.changes 2014-09-22 09:23:02.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 17 21:06:20 UTC 2014 - seroton10@gmail.com + +- Reinstate AnyWikiDraw applet in the package (bnc#895361) + + anywikidraw.patch allows it to run as an unsigned applet + +------------------------------------------------------------------- New: ---- anywikidraw.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-moin.spec ++++++ --- /var/tmp/diff_new_pack.pk0lj8/_old 2014-09-22 09:23:03.000000000 +0200 +++ /var/tmp/diff_new_pack.pk0lj8/_new 2014-09-22 09:23:03.000000000 +0200 @@ -32,6 +32,7 @@ Source91: moin.1 Source92: mkwiki.moin.8 Source99: python-moin.rpmlintrc +Patch0: anywikidraw.patch BuildRequires: ant >= 1.5.4 BuildRequires: apache2 BuildRequires: dos2unix @@ -60,6 +61,10 @@ # remove pre-built JARs find . -type f -name "*.jar" -print -delete +# prepare rebuild of AnyWikiDraw applet JAR +cd contrib/AnyWikiDraw +tar -xjf src.tar.bz +%patch0 %build @@ -75,6 +80,9 @@ (cd contrib/TWikiDrawPlugin; ant) ln contrib/TWikiDrawPlugin/build/twikidraw.jar MoinMoin/web/static/htdocs/applets/TWikiDrawPlugin/twikidraw.jar +(cd contrib/AnyWikiDraw/AnyWikiDraw; ant -f build-for-moinmoin.xml applet.jar) +ln contrib/AnyWikiDraw/AnyWikiDraw/dist/AnyWikiDraw\ 0.14/anywikidraw/moinmoin/AnyWikiDrawForMoinMoin.jar MoinMoin/web/static/htdocs/applets/anywikidraw/lib/AnyWikiDrawForMoinMoin.jar + %install python setup.py install --root=%{buildroot} --prefix=%{_prefix} ++++++ README-openSUSE.txt ++++++ --- /var/tmp/diff_new_pack.pk0lj8/_old 2014-09-22 09:23:04.000000000 +0200 +++ /var/tmp/diff_new_pack.pk0lj8/_new 2014-09-22 09:23:04.000000000 +0200 @@ -88,11 +88,27 @@ ------------------- MoinMoin ships with two different editors for drawings, both of which are -implemented as Java applets (see http://moinmo.in/HelpOnDrawings). The -TWikiDraw applet (for .tdraw drawings) is provided by this package. The -AnyWikiDraw applet (for .adraw drawings) can not be packaged, unfortunately, -because the implementation contains proprietary code. +implemented as pre-built Java applets (see http://moinmo.in/HelpOnDrawings): +TWikiDraw and AnyWikiDraw. Due to the requirement that openSUSE packages cannot +ship pre-built binaries, both applets contained in this package have been +rebuilt from source. -Wiki pages containing drawings, regardless what kind, will display correctly in -the browser, but only .tdraw drawings can be edited. +The TWikiDraw applet is not affected by this, it preserves all functionality of +the pre-built applet. + +The AnyWikiDraw applet, however, is not signed, unlike the pre-built one. This +causes a loss of the ability to embed images within drawings because the +browser sandbox in which the applet runs does not allow AnyWikiDraw to read +images from the filesystem. Other than that, all functionality is preserved. + +If you use JRE 8 or later to run the applets, you need a ~/.java.policy file +with an entry like this to make AnyWikiDraw work: + +grant { + permission java.net.URLPermission "http://SERVER/moin_static197/applets/anywikidraw/lib/AnyWikiDrawForMoinMoin....", "*:*"; +}; + +where SERVER should be replaced with a specification of the name of the server +hosting the wiki; for more details, see +http://docs.oracle.com/javase/8/docs/api/java/net/URLPermission.html. ++++++ anywikidraw.patch ++++++ diff -ur AnyWikiDraw-orig/build-for-moinmoin.xml AnyWikiDraw/build-for-moinmoin.xml --- AnyWikiDraw-orig/build-for-moinmoin.xml 2009-10-18 21:40:22.000000000 +0200 +++ AnyWikiDraw/build-for-moinmoin.xml 2014-08-31 19:50:52.720961122 +0200 @@ -32,6 +32,7 @@ srcdir="${src.main}:${src.jhotdraw}" debug="${debug}" source="1.5" + target="1.5" optimize="true" encoding="UTF-8" diff -ur AnyWikiDraw-orig/src/jhotdraw7/java/org/jhotdraw/geom/BezierPath.java AnyWikiDraw/src/jhotdraw7/java/org/jhotdraw/geom/BezierPath.java --- AnyWikiDraw-orig/src/jhotdraw7/java/org/jhotdraw/geom/BezierPath.java 2009-10-18 20:50:38.000000000 +0200 +++ AnyWikiDraw/src/jhotdraw7/java/org/jhotdraw/geom/BezierPath.java 2014-08-31 14:42:12.148555716 +0200 @@ -264,7 +264,7 @@ * Convenience method for adding multiple control points with a single * coordinate C0. */ - public void addAll(Collection points) { + public void addPolyline(Collection points) { for (Point2D.Double c0 : points) { add(new Node(0, c0, c0, c0)); } @@ -1282,4 +1282,4 @@ public int getWindingRule() { return windingRule; } -} \ No newline at end of file +} diff -ur AnyWikiDraw-orig/src/jhotdraw7/java/org/jhotdraw/io/ExtensionFileFilter.java AnyWikiDraw/src/jhotdraw7/java/org/jhotdraw/io/ExtensionFileFilter.java --- AnyWikiDraw-orig/src/jhotdraw7/java/org/jhotdraw/io/ExtensionFileFilter.java 2009-10-18 20:50:48.000000000 +0200 +++ AnyWikiDraw/src/jhotdraw7/java/org/jhotdraw/io/ExtensionFileFilter.java 2014-08-31 18:39:25.469542318 +0200 @@ -68,16 +68,17 @@ } public boolean accept(File pathname) { - if (pathname.isDirectory()) { - return true; + try { + if (pathname.isDirectory()) return true; + } catch (java.security.AccessControlException e) { + // ignore + } + String name = pathname.getName(); + int p = name.lastIndexOf('.'); + if (p == -1 || p == name.length() - 1) { + return extensions.contains(""); } else { - String name = pathname.getName(); - int p = name.lastIndexOf('.'); - if (p == -1 || p == name.length() - 1) { - return extensions.contains(""); - } else { - return extensions.contains(name.substring(p + 1).toLowerCase()); - } + return extensions.contains(name.substring(p + 1).toLowerCase()); } } diff -ur AnyWikiDraw-orig/src/main/java/org/anywikidraw/any/AbstractDrawingApplet.java AnyWikiDraw/src/main/java/org/anywikidraw/any/AbstractDrawingApplet.java --- AnyWikiDraw-orig/src/main/java/org/anywikidraw/any/AbstractDrawingApplet.java 2009-10-11 20:32:29.000000000 +0200 +++ AnyWikiDraw/src/main/java/org/anywikidraw/any/AbstractDrawingApplet.java 2014-08-31 17:56:56.686428594 +0200 @@ -116,7 +116,12 @@ public final void init() { // set the language of the applet if (getParameter("Locale") != null) { - Locale.setDefault(new Locale(getParameter("Locale"))); + try { + Locale.setDefault(new Locale(getParameter("Locale"))); + } catch (Throwable e) { + // Do nothing + // If we can't set the desired language, just use the default + } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org