rpms/maven-doxia/devel .cvsignore, 1.3, 1.4 maven-doxia-itext2.patch, 1.1, 1.2 maven-doxia.spec, 1.23, 1.24 sources, 1.3, 1.4 maven-doxia-1.4compile.patch, 1.1, NONE maven-doxia-core-build.xml, 1.1, NONE maven-doxia-decoration-model-build.xml, 1.1, NONE maven-doxia-sink-api-build.xml, 1.1, NONE maven-doxia-site-renderer-build.xml, 1.1, NONE
mef
mef at fedoraproject.org
Wed May 5 14:01:41 UTC 2010
Author: mef
Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23802
Modified Files:
.cvsignore maven-doxia-itext2.patch maven-doxia.spec sources
Removed Files:
maven-doxia-1.4compile.patch maven-doxia-core-build.xml
maven-doxia-decoration-model-build.xml
maven-doxia-sink-api-build.xml
maven-doxia-site-renderer-build.xml
Log Message:
Update to 1.1.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 28 Aug 2009 21:36:26 -0000 1.3
+++ .cvsignore 5 May 2010 14:01:38 -0000 1.4
@@ -1,2 +1 @@
-maven-doxia-autogenerated-files.tar.gz
-maven-doxia-1.0-a10-src.tar.gz
+maven-doxia-1.1.2.tar.gz
maven-doxia-itext2.patch:
ITextFont.java | 6 +++---
ITextSink.java | 6 +++---
ITextUtil.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
Index: maven-doxia-itext2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia-itext2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-doxia-itext2.patch 31 Aug 2009 19:40:43 -0000 1.1
+++ maven-doxia-itext2.patch 5 May 2010 14:01:40 -0000 1.2
@@ -1,40 +1,7 @@
-### Eclipse Workspace Patch 1.0
-#P maven-doxia
-Index: doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
-===================================================================
---- doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java (revision 808629)
-+++ doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java (working copy)
-@@ -68,7 +68,7 @@
- */
- public static String getPageSize( Rectangle rect )
- {
-- if ( ( rect.width() == PageSize.LETTER.width() ) && ( rect.height() == PageSize.LETTER.height() ) )
-+ if ( ( rect.getWidth() == PageSize.LETTER.getWidth() ) && ( rect.getHeight() == PageSize.LETTER.getHeight() ) )
- {
- return "LETTER";
- }
-Index: doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
-===================================================================
---- doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java (revision 808629)
-+++ doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java (working copy)
-@@ -1172,9 +1172,9 @@
- 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.getHeight();
- }
- catch ( BadElementException e )
- {
-Index: doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
-===================================================================
---- doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java (revision 808629)
-+++ doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java (working copy)
-@@ -258,7 +258,7 @@
+diff -ur maven-doxia-1.1.2.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java maven-doxia-1.1.2/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+--- maven-doxia-1.1.2.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java 2010-02-12 14:09:50.427027936 +0000
++++ maven-doxia-1.1.2/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java 2010-02-12 14:11:16.302030202 +0000
+@@ -262,7 +262,7 @@
{
Font font = getCurrentFont();
@@ -43,7 +10,7 @@ Index: doxia-modules/doxia-module-itext/
}
/**
-@@ -270,7 +270,7 @@
+@@ -274,7 +274,7 @@
{
Font font = getCurrentFont();
@@ -52,7 +19,7 @@ Index: doxia-modules/doxia-module-itext/
}
/**
-@@ -282,7 +282,7 @@
+@@ -286,7 +286,7 @@
{
Font font = getCurrentFont();
@@ -61,3 +28,31 @@ Index: doxia-modules/doxia-module-itext/
}
/**
+diff -ur maven-doxia-1.1.2.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java maven-doxia-1.1.2/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+--- maven-doxia-1.1.2.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java 2010-02-12 14:09:50.427027936 +0000
++++ maven-doxia-1.1.2/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java 2010-02-12 14:11:06.927457042 +0000
+@@ -1241,9 +1241,9 @@
+ 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 )
+ {
+diff -ur maven-doxia-1.1.2.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java maven-doxia-1.1.2/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+--- maven-doxia-1.1.2.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java 2010-02-12 14:09:50.427027936 +0000
++++ maven-doxia-1.1.2/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java 2010-02-12 14:10:39.501533511 +0000
+@@ -77,7 +77,7 @@
+ 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();
+ }
Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- maven-doxia.spec 21 Dec 2009 16:49:55 -0000 1.23
+++ maven-doxia.spec 5 May 2010 14:01:40 -0000 1.24
@@ -28,37 +28,33 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with_maven 1
-
-%define namedversion 1.0-alpha-10
-
Name: maven-doxia
-Version: 1.0
-Release: 0.8.a10.4%{?dist}
+Version: 1.1.2
+Release: 2%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
Group: Development/Java
URL: http://maven.apache.org/doxia/
-# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0-alpha-10 \
-# maven-doxia/
-# tar czf maven-doxia-1.0-a10-src.tar.gz maven-doxia/
-Source0: %{name}-%{version}-a10-src.tar.gz
-
-Source1: %{name}-decoration-model-build.xml
-Source2: %{name}-core-build.xml
-Source3: %{name}-sink-api-build.xml
-Source4: %{name}-site-renderer-build.xml
-
-# These files are taken from the doxia build itself, done with maven2
-# To regenerate, build above tarball with upstream maven
-Source5: %{name}-autogenerated-files.tar.gz
+# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.2
+# tar czf maven-doxia-1.1.2-tar.gz maven-doxia-1.1.2/
+Source0: %{name}-%{version}.tar.gz
+
+# Point it at the correct plexus-container-default
+Source1: %{name}-depmap.xml
# Build against iText 2.x
# http://jira.codehaus.org/browse/DOXIA-53
Patch0: %{name}-itext2.patch
+Patch1: %{name}-remove-clirr.patch
+Patch2: %{name}-modello-1.0.patch
+Patch3: %{name}-assert.patch
+# Patch4: %{name}-xdoc.patch
+Patch5: %{name}-helpmojo.patch
+Patch6: %{name}-skip-plugin.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -68,13 +64,12 @@ BuildRequires: jpackage-utils >= 0:1.7.
BuildRequires: ant, ant-nodeps
BuildRequires: itext >= 2.1.7-4
BuildRequires: plexus-cli >= 1.2-8
-%if %{with_maven}
BuildRequires: maven2 >= 0:2.0.4-9
BuildRequires: maven2-plugin-assembly
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
+# BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-site
BuildRequires: maven2-plugin-plugin
@@ -85,18 +80,19 @@ BuildRequires: modello-maven-plugin >=
BuildRequires: plexus-xmlrpc >= 0:1.0-0.b4.3
BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: tomcat5
-%endif
BuildRequires: classworlds
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-validator
+BuildRequires: jakarta-commons-configuration
BuildRequires: junit
BuildRequires: oro
BuildRequires: plexus-container-default
BuildRequires: plexus-i18n
-BuildRequires: plexus-utils
+BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
BuildRequires: velocity
+BuildRequires: fop
Requires: classworlds
Requires: jakarta-commons-collections
@@ -106,9 +102,10 @@ Requires: junit
Requires: oro
Requires: plexus-container-default
Requires: plexus-i18n
-Requires: plexus-utils
+Requires: plexus-utils >= 1.5.7
Requires: plexus-velocity
Requires: velocity
+Requires: fop
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -122,71 +119,37 @@ content. Doxia can be used to generate s
being incorporated into dynamic content generation systems like blogs,
wikis and content management systems.
-%if %{with_maven}
-%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Documentation
-
-%description javadoc
-API documentation for %{name}.
-%endif
+# %package javadoc
+# Summary: Javadoc for %{name}
+# Group: Development/Documentation
+#
+# %description javadoc
+# API documentation for %{name}.
%prep
-%setup -q -n %{name}
-%patch0 -p0
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+# %patch4 -p1
+# rm -rf doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc
+# rm -f doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
-%if ! %{with_maven}
-cp -p %{SOURCE1} doxia-decoration-model/build.xml
-cp -p %{SOURCE2} doxia-core/build.xml
-cp -p %{SOURCE3} doxia-sink-api/build.xml
-cp -p %{SOURCE4} doxia-site-renderer/build.xml
-%endif
+%patch5 -p1
+%patch6 -p1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-%if %{with_maven}
-
- mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
-
-%else
-
-mkdir lib
-build-jar-repository -s -p lib/ \
- commons-collections \
- commons-logging-api \
- classworlds \
- junit \
- oro \
- plexus/container-default \
- plexus/i18n \
- plexus/utils \
- plexus/velocity \
- velocity
-
-# Extract autogenerated (by maven) files
-tar xzf %{SOURCE5}
-
-for project in doxia-decoration-model \
- doxia-sink-api \
- doxia-core \
- doxia-site-renderer; do
-
- pushd $project
-
- ant -Dmaven.mode.offline=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL
-
- # Copy over the jar
- cp -p target/*jar ../lib/$project.jar
- popd
-done
-
-%endif
+mvn-jpp \
+ -e \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven.test.skip=true \
+ -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ install
%install
rm -rf $RPM_BUILD_ROOT
@@ -203,9 +166,9 @@ for targetdir in `find -type d -name tar
strippedmodulename=`echo $modulename | sed -e s:^doxia-::g`
# Does the module have a jar?
- if [ -f $targetdir/$modulename-%{namedversion}.jar ]; then
- cp -p $targetdir/$modulename-%{namedversion}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename-%{namedversion}.jar
+ if [ -f $targetdir/$modulename-%{version}.jar ]; then
+ cp -p $targetdir/$modulename-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename-%{version}.jar
fi
@@ -214,42 +177,58 @@ for targetdir in `find -type d -name tar
cp -p $targetdir/../pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-$strippedmodulename.pom
- %add_to_maven_depmap org.apache.maven.doxia $modulename %{namedversion} JPP/maven-doxia $strippedmodulename
+ %add_to_maven_depmap org.apache.maven.doxia $modulename %{version} JPP/maven-doxia $strippedmodulename
fi
done
# Install parent pom
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.pom
-%add_to_maven_depmap org.apache.maven.doxia doxia %{namedversion} JPP/maven-doxia doxia
+%add_to_maven_depmap org.apache.maven.doxia doxia %{version} JPP/maven-doxia doxia
+install -d -m 0755 %{buildroot}/%{_datadir}/maven2/lib
+ln -s %{_javadir}/maven-doxia/logging-api.jar $RPM_BUILD_ROOT/%{_datadir}/maven2/lib/maven-doxia_logging-api.jar
# Install parent javadocs
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
+ do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc (all javadocs are contained in the main module docs dir used below)
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{namedversion}
-cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{namedversion}/
-ln -s %{name}-%{namedversion} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+# cp -pr target/site/apidocs/* \
+# $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
+# ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
-
-%if %{with_maven}
-%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
-%endif
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_datadir}/maven2/lib/*
+
+# %files javadoc
+# %defattr(-,root,root,-)
+# %doc %{_javadocdir}/*
%changelog
+* Wed May 5 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.1.2-2
+- Add BuildRequirement on fop
+
+* Fri Feb 12 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.1.2-1
+- Update to 1.1.2
+- Add update_maven_depmap to post and postun
+- Temporarily disable javadoc until maven2-plugin-javadoc is rebuilt against
+ the new doxia
+
* Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.8.a10.4
- BR maven2-plugin-plugin.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 28 Aug 2009 21:36:26 -0000 1.3
+++ sources 5 May 2010 14:01:40 -0000 1.4
@@ -1,2 +1 @@
-f7d26f91c7a093e94dfb051248aab6c6 maven-doxia-autogenerated-files.tar.gz
-50ab7d300005b658a2d3ca5b24fb3317 maven-doxia-1.0-a10-src.tar.gz
+33317e556d029b173e271c071ddcc4f0 maven-doxia-1.1.2.tar.gz
--- maven-doxia-1.4compile.patch DELETED ---
--- maven-doxia-core-build.xml DELETED ---
--- maven-doxia-decoration-model-build.xml DELETED ---
--- maven-doxia-sink-api-build.xml DELETED ---
--- maven-doxia-site-renderer-build.xml DELETED ---
More information about the scm-commits
mailing list