rpms/maven-doxia/devel .cvsignore, 1.2, 1.3 maven-doxia.spec, 1.14, 1.15 sources, 1.2, 1.3

Fri Aug 28 21:36:27 UTC 2009

Author: overholt

Update of /cvs/pkgs/rpms/maven-doxia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11454

Modified Files:
	.cvsignore maven-doxia.spec sources 
Log Message:
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.5.a10
- Update to 1.0 alpha 10 courtesy of Deepak Bhole
- Remove gcj support
- Add patch to build against iText 2.x (with back-ported XML classes)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	13 Mar 2007 23:31:24 -0000	1.2
+++ .cvsignore	28 Aug 2009 21:36:26 -0000	1.3
@@ -1,2 +1,2 @@
-maven-doxia-1.0a7.tar.gz
 maven-doxia-autogenerated-files.tar.gz
+maven-doxia-1.0-a10-src.tar.gz


Index: maven-doxia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/maven-doxia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- maven-doxia.spec	25 Jul 2009 11:50:36 -0000	1.14
+++ maven-doxia.spec	28 Aug 2009 21:36:26 -0000	1.15
@@ -28,32 +28,23 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define with_maven 1
 
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define _without_maven 1
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
-%define namedversion 1.0-alpha-7
+%define namedversion 1.0-alpha-10
 
 Name:           maven-doxia
 Version:        1.0
-Release:        0.4.a7.2.10%{?dist}
+Release:        0.5.a10%{?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/tags/doxia-1.0-alpha-7/
+# 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.a7-src.tar.gz maven-doxia/
-Source0:        %{name}-%{version}a7.tar.gz
+# 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
@@ -64,14 +55,15 @@ Source4:        %{name}-site-renderer-bu
 # To regenerate, build above tarball with upstream maven
 Source5:        %{name}-autogenerated-files.tar.gz
 
-Patch0:         %{name}-1.4compile.patch
+# Build against iText 2.x
+# http://jira.codehaus.org/browse/DOXIA-53
+Patch0:         %{name}-itext2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
+BuildRequires:  java >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant, ant-nodeps
 %if %{with_maven}
@@ -111,15 +103,11 @@ Requires:       plexus-utils
 Requires:       plexus-velocity
 Requires:       velocity
 
+Requires:         java >= 1:1.6.0
+Requires:         jpackage-utils
 Requires(post):   jpackage-utils >= 0:1.7.2
 Requires(postun): jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
 %description
 Doxia is a content generation framework which aims to provide its
 users with powerful techniques for generating static and dynamic
@@ -133,20 +121,21 @@ Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 %endif
 
 %prep
 %setup -q -n %{name}
+%patch0 -p0
+
+%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
-
-%patch0 -b .sav
+%endif
 
 %build
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -194,83 +183,59 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 # jars/poms
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 
-for project in decoration-model \
-                sink-api \
-                core \
-                site-renderer \
-                module-twiki; do
-
-        if [ -f doxia-$project/target/doxia-$project-%{namedversion}.jar ]; then                  install -pm 644 \
-                  doxia-$project/target/doxia-$project-%{namedversion}.jar \
-                  $RPM_BUILD_ROOT%{_javadir}/%{name}/$project-%{namedversion}.jar
-                  %add_to_maven_depmap org.apache.maven.doxia doxia-$project %{namedversion} JPP/maven-doxia $project
-
-        fi
-
-        # Install pom to groupid-artifactid
-        install -pm 644 doxia-$project/pom.xml \
-          $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-$project.pom
+for targetdir in `find -type d -name target`; do
+
+    targetdir=`echo $targetdir | sed -e s:^\./::g`
+
+    modulename=`echo $targetdir | awk -F / '{print $(NF-1)}'`
+    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
+    fi
+
+
+    # Skip parent pom
+    if [ ! -z $strippedmodulename ]; then
+        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
+    fi
+    
 done
 
-install -pm 644 pom.xml \
-  $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.pom
+# 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
 
+# Install parent javadocs
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
   do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
 
-%if %{with_maven}
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-for p in doxia-decoration-model \
-                doxia-sink-api \
-                doxia-core \
-                doxia-site-renderer; do
-
-        project=`basename $p`
-        install -d -m 755 \
-          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
-        cp -pr $project/target/site/apidocs/* \
-          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$project
-
-done
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%endif
+# 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}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/%{name}
 %{_datadir}/maven2
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/core-1.0-alpha-7.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/decoration-model-1.0-alpha-7.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/sink-api-1.0-alpha-7.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/site-renderer-1.0-alpha-7.jar.*
-%endif
-
 %if %{with_maven}
 %files javadoc
 %defattr(-,root,root,-)
@@ -278,6 +243,11 @@ fi
 %endif
 
 %changelog
+* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 0:1.0-0.5.a10
+- Update to 1.0 alpha 10 courtesy of Deepak Bhole
+- Remove gcj support
+- Add patch to build against iText 2.x (with back-ported XML classes)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a7.2.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-doxia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Mar 2007 23:31:24 -0000	1.2
+++ sources	28 Aug 2009 21:36:26 -0000	1.3
@@ -1,2 +1,2 @@
-1a0133387395089625236b3ae18e200a  maven-doxia-1.0a7.tar.gz
 f7d26f91c7a093e94dfb051248aab6c6  maven-doxia-autogenerated-files.tar.gz
+50ab7d300005b658a2d3ca5b24fb3317  maven-doxia-1.0-a10-src.tar.gz


