[maven-doxia/f19] Update to upstream version 1.4
Michal Srb
msrb at fedoraproject.org
Mon Apr 29 13:25:10 UTC 2013
commit f156e6386a68e7f046a4926daf11fe3d636e6d3a
Author: Michal Srb <msrb at redhat.com>
Date: Mon Apr 29 13:22:43 2013 +0200
Update to upstream version 1.4
- Enable markdown module
- Remove unneeded patch
.gitignore | 1 +
0001-Use-plexus-component-metadata.patch | 153 --------------------
...a-core-remove-plexus-component-annotation.patch | 24 +++
...a-core-remove-plexus-component-annotation.patch | 24 ---
0004-Fix-itext-dependency.patch | 92 ++++++------
maven-doxia.spec | 38 ++++--
sources | 2 +-
7 files changed, 100 insertions(+), 234 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e47c52..1a0b595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ maven-doxia-1.1.2.tar.gz
/maven-doxia-1.1.4.tar.gz
/doxia-1.2-source-release.zip
/doxia-1.3-source-release.zip
+/doxia-1.4-source-release.zip
diff --git a/0001-doxia-core-remove-plexus-component-annotation.patch b/0001-doxia-core-remove-plexus-component-annotation.patch
new file mode 100644
index 0000000..eb5360a
--- /dev/null
+++ b/0001-doxia-core-remove-plexus-component-annotation.patch
@@ -0,0 +1,24 @@
+From 5e24b4a0049ea437f8eb9bae0de46977a7387a10 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb at redhat.com>
+Date: Mon, 29 Apr 2013 13:16:27 +0200
+Subject: [PATCH] doxia-core remove plexus component annotation
+
+---
+ .../src/main/java/org/apache/maven/doxia/parser/AbstractParser.java | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
+index ff6ea29..8d0b314 100644
+--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
++++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
+@@ -45,7 +45,6 @@ import org.codehaus.plexus.component.annotations.Requirement;
+ * @version $Id: AbstractParser.java 1345590 2012-06-02 21:36:10Z hboutemy $
+ * @since 1.0
+ */
+- at Component( role = Parser.class )
+ public abstract class AbstractParser
+ implements Parser
+ {
+--
+1.8.1.4
+
diff --git a/0004-Fix-itext-dependency.patch b/0004-Fix-itext-dependency.patch
index cd42890..a07bd57 100644
--- a/0004-Fix-itext-dependency.patch
+++ b/0004-Fix-itext-dependency.patch
@@ -1,75 +1,75 @@
-From 1c8937d712617f2ea13c2bfe1e38b6a616e17c8f Mon Sep 17 00:00:00 2001
+From 11ee2edcb1e391a94e37b85d2667a2a4648d847a Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Mon, 9 Jan 2012 10:13:16 +0100
+Date: Mon, 29 Apr 2013 11:37:12 +0200
Subject: [PATCH 4/4] Fix itext dependency
---
- .../apache/maven/doxia/module/itext/ITextFont.java | 6 +++---
- .../apache/maven/doxia/module/itext/ITextSink.java | 6 +++---
- .../apache/maven/doxia/module/itext/ITextUtil.java | 2 +-
+ .../main/java/org/apache/maven/doxia/module/itext/ITextFont.java | 6 +++---
+ .../main/java/org/apache/maven/doxia/module/itext/ITextSink.java | 6 +++---
+ .../main/java/org/apache/maven/doxia/module/itext/ITextUtil.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
-index 8882f98..019f3a8 100644
+index 2cc8ef1..b6980fb 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
@@ -262,7 +262,7 @@ public class ITextFont
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getBlue() );
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getBlue() );
+ return String.valueOf( font.getColor().getBlue() );
- }
-
- /**
+ }
+
+ /**
@@ -274,7 +274,7 @@ public class ITextFont
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getGreen() );
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getGreen() );
+ return String.valueOf( font.getColor().getGreen() );
- }
-
- /**
+ }
+
+ /**
@@ -286,7 +286,7 @@ public class ITextFont
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getRed() );
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getRed() );
+ return String.valueOf( font.getColor().getRed() );
- }
-
- /**
+ }
+
+ /**
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
-index d87f149..9c576cc 100644
+index 7c1da55..49acc5a 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
@@ -1231,9 +1231,9 @@ public class ITextSink
- try
- {
- Image image = Image.getInstance( new URL( urlName ) );
-- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
-- width = image.plainWidth();
-- height = image.plainHeight();
+ try
+ {
+ Image image = Image.getInstance( new URL( urlName ) );
+- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
+- width = image.plainWidth();
+- height = image.plainHeight();
+ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
+ width = image.getPlainWidth();
+ height = image.getPlainHeight();
- }
- catch ( BadElementException e )
- {
+ }
+ catch ( BadElementException e )
+ {
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
-index 76770e4..d6b8d8a 100644
+index 4363413..65bab32 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
@@ -77,7 +77,7 @@ public class ITextUtil
- if ( currentField.getType().equals( Rectangle.class ) )
- {
- Rectangle fPageSize = (Rectangle) currentField.get( null );
-- if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) )
+ if ( currentField.getType().equals( Rectangle.class ) )
+ {
+ Rectangle fPageSize = (Rectangle) currentField.get( null );
+- if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) )
+ if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) )
- {
- return currentField.getName();
- }
+ {
+ return currentField.getName();
+ }
--
-1.7.7.4
+1.8.1.4
diff --git a/maven-doxia.spec b/maven-doxia.spec
index ae31eb2..c8d5fa0 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -30,11 +30,12 @@
%if 0%{?fedora}
%bcond_without itext
+%bcond_without markdown
%endif
Name: maven-doxia
-Version: 1.3
-Release: 3%{?dist}
+Version: 1.4
+Release: 1%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
@@ -45,15 +46,13 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{ver
# TODO: push upstream
-Patch0: 0001-Use-plexus-component-metadata.patch
-# TODO: push upstream
# abstract class should not be annotated as component because maven
# will pick it up and try to instantiate
-Patch1: 0002-doxia-core-remove-plexus-component-annotation.patch
+Patch1: 0001-doxia-core-remove-plexus-component-annotation.patch
# Build against iText 2.x
# http://jira.codehaus.org/browse/DOXIA-53
-Patch3: 0004-Fix-itext-dependency.patch
+Patch2: 0004-Fix-itext-dependency.patch
BuildArch: noarch
@@ -103,6 +102,9 @@ BuildRequires: javamail
%if %{with itext}
BuildRequires: itext
%endif
+%if %{with markdown}
+BuildRequires: pegdown
+%endif
Obsoletes: maven-doxia-book < %{epoch}:%{version}-%{release}
Obsoletes: maven-doxia-maven-plugin < %{epoch}:%{version}-%{release}
@@ -166,6 +168,14 @@ Summary: iText module for %{name}
This package provides %{summary}.
%endif
+%if %{with markdown}
+%package module-markdown
+Summary: Markdown module for %{name}
+
+%description module-markdown
+This package provides %{summary}.
+%endif
+
%package module-latex
Summary: Latex module for %{name}
@@ -224,9 +234,8 @@ API documentation for %{name}.
%prep
%setup -q -n doxia-%{version}
-%patch0 -p1
%patch1 -p1
-%patch3 -p1
+%patch2 -p1
# we don't have clirr-maven-plugin
%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
@@ -236,11 +245,12 @@ API documentation for %{name}.
"/pom:executions/pom:execution/pom:configuration" \
"<useJava5>true</useJava5>" doxia-modules/doxia-module-fml/pom.xml
-# markdown module requires older version (1.0.2) of the pegdown library
-%pom_disable_module doxia-module-markdown doxia-modules
%if %{without itext}
%pom_disable_module doxia-module-itext doxia-modules
%endif
+%if %{without markdown}
+%pom_disable_module doxia-module-markdown doxia-modules
+%endif
%build
# tests disabled because some use old plexus-container and don't work
@@ -264,6 +274,9 @@ API documentation for %{name}.
%if %{with itext}
%files module-itext -f .mfiles-doxia-module-itext
%endif
+%if %{with markdown}
+%files module-markdown -f .mfiles-doxia-module-markdown
+%endif
%files module-latex -f .mfiles-doxia-module-latex
%files module-rtf -f .mfiles-doxia-module-rtf
%files modules -f .mfiles-doxia-modules
@@ -278,6 +291,11 @@ API documentation for %{name}.
%changelog
+* Mon Apr 29 2013 Michal Srb <msrb at redhat.com> - 0:1.4-1
+- Update to upstream version 1.4
+- Enable markdown module
+- Remove unneeded patch
+
* Tue Apr 23 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.3-3
- Remove ant-nodeps BuildRequires
diff --git a/sources b/sources
index 82b0364..ca752f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c6b311a3e4cd070e1b15681d76991aa doxia-1.3-source-release.zip
+b7ebf0fc2678710dcf4b45a6991732d0 doxia-1.4-source-release.zip
More information about the scm-commits
mailing list