rpms/jakarta-commons-digester/devel sources, 1.4, 1.5 jakarta-commons-digester.spec, 1.42, 1.43 .cvsignore, 1.6, 1.7 commons-digester-1.7-component-info.xml, 1.2, NONE

Sun Nov 8 16:32:59 UTC 2009

Author: mbooth

Update of /cvs/pkgs/rpms/jakarta-commons-digester/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24374/jakarta-commons-digester/devel

Modified Files:
	sources jakarta-commons-digester.spec .cvsignore 
Removed Files:
	commons-digester-1.7-component-info.xml 
Log Message:
* Sun Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> - 1.8.1-1
- Update to 1.8.1
- Rewrite spec file to build using upstream-preferred maven instead of ant
- Install pom and add to maven dep-map
- Fix javadoc package requires



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- sources	22 Feb 2006 03:47:00 -0000	1.4
+++ sources	8 Nov 2009 16:32:59 -0000	1.5
@@ -1 +1 @@
-718f91f6958da865826bca455f644076  commons-digester-1.7-src.tar.gz
+bf069f1d8908a66cb732a5c4260c86b7  commons-digester-1.8.1-src.tar.gz


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- jakarta-commons-digester.spec	10 Aug 2009 09:09:29 -0000	1.42
+++ jakarta-commons-digester.spec	8 Nov 2009 16:32:59 -0000	1.43
@@ -1,206 +1,113 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%define _with_gcj_support 1
-
-# If you want repolib package to be built,
-# issue the following: 'rpmbuild --with repolib'
-
-%define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
-%define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
-
-%define repodir /apache-digester/1.7brew
-%define repodirlib %{repodir}/lib
-%define repodirsrc %{repodir}/src
-
-%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 base_name       digester
-%define short_name      commons-%{base_name}
-%define section         free
-
-Name:           jakarta-%{short_name}
-Version:        1.7
-Release:        10.3%{?dist}
-Epoch:          0
-Summary:        Jakarta Commons Digester Package
-License:        ASL 2.0
-Group:          Development/Libraries/Java
-Source0:        http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz
-Source1:        commons-digester-1.7-component-info.xml
-URL:            http://jakarta.apache.org/commons/digester/
-BuildRequires:  ant
-BuildRequires:  jakarta-commons-beanutils >= 0:1.7
-BuildRequires:  jakarta-commons-logging >= 0:1.0
-BuildRequires:  jpackage-utils > 0:1.5
-Requires:       jakarta-commons-beanutils >= 0:1.7
-Requires:       jakarta-commons-logging >= 0:1.0
-%if ! %{gcj_support}
-BuildArch:      noarch
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:       %{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
-
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
+%global short_name commons-digester
+
+# TODO - Drop "jakarta-" from the package name
+Name:          jakarta-%{short_name}
+Version:       1.8.1
+Release:       1%{?dist}
+Summary:       XML to Java object mapping module
+Group:         Development/Libraries/Java
+License:       ASL 2.0
+URL:           http://commons.apache.org/digester/
+
+Source0:       http://archive.apache.org/dist/commons/digester/source/%{short_name}-%{version}-src.tar.gz
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:     noarch
+
+# TODO - ideally we should require beanutils 1.8 and logging 1.1.1 but they're not in fedora yet
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: jakarta-commons-beanutils >= 1.7
+BuildRequires: jakarta-commons-logging >= 1.0
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-idea
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+Requires:      java
+Requires:      jpackage-utils
+Requires:      jakarta-commons-beanutils >= 1.7
+Requires:      jakarta-commons-logging >= 1.0
+
+Provides:      %{short_name} = %{version}-%{release}
+Obsoletes:     %{short_name} < %{version}-%{release}
 
 %description
-The goal of Digester project is to create and maintain a XML -> Java
-object mapping package written in the Java language to be distributed
-under the ASF license.
-
-%if %{with_repolib}
-%package        repolib
-Summary:        Artifacts to be uploaded to a repository library.
-Group:          Development/Libraries/Java
-
-%description     repolib
-Artifacts to be uploaded to a repository library.
-This package is not meant to be installed but so its contents
-can be extracted through rpm2cpio
-%endif
+Many projects read XML configuration files to provide initialization of
+various Java objects within the system. There are several ways of doing this,
+and the Digester component was designed to provide a common implementation
+that can be used in many different projects
 
 %package javadoc
-Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
+Summary:       Javadocs for %{name}
+Group:         Development/Documentation
+Requires:      %{name} = %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
-
-tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
-sed -i "s/@TAG@/$tag/g" %{SOURCE1}
-
 %build
-cp LICENSE.txt ../LICENSE
-
-export CLASSPATH=%(build-classpath commons-logging commons-beanutils junit)
-ant dist
-
-# Build rss -- needed by struts
-export CLASSPATH=$CLASSPATH:`pwd`/dist/%{short_name}.jar
-(cd src/examples/rss; ant dist)
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
 
-rm ../LICENSE
+mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p src/examples/rss/dist/%{short_name}-rss.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-rss.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-
-%if %{with_repolib}
-        install -d -m 755 $RPM_BUILD_ROOT%{repodir}
-        install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
-        install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml
-        install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
-        install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
-        cp $RPM_BUILD_ROOT%{_javadir}/commons-digester.jar $RPM_BUILD_ROOT%{repodirlib}
-%endif
+install -pD -T target/%{short_name}-%{version}.jar \
+  %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# javadocs
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+
+# pom
+install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
+rm -rf %{buildroot}
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+%defattr(-,root,root,-)
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES*
+%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7-rss.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7.jar.*
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
-
-
-%if %{with_repolib}
-%files repolib
-%defattr(-,root,root)
-%{repodir}
-%endif
+%{_javadocdir}/%{name}
 
 %changelog
+* Sun Nov 8 2009 Mat Booth <fedora at matbooth.co.uk> - 1.8.1-1
+- Update to 1.8.1
+- Rewrite spec file to build using upstream-preferred maven instead of ant
+- Install pom and add to maven dep-map
+- Fix javadoc package requires
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 0:1.7-10.3
 - Convert specfile to UTF-8.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-digester/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	22 Feb 2006 03:47:00 -0000	1.6
+++ .cvsignore	8 Nov 2009 16:32:59 -0000	1.7
@@ -1 +1 @@
-commons-digester-1.7-src.tar.gz
+commons-digester-1.8.1-src.tar.gz


--- commons-digester-1.7-component-info.xml DELETED ---


