diff --git a/.gitignore b/.gitignore index f9eb91c..ff003c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /apache-cxf-2.4.8-src.tar.gz +/apache-cxf-2.4.9-src.tar.gz diff --git a/cxf.spec b/cxf.spec index 516cdae..d21209e 100644 --- a/cxf.spec +++ b/cxf.spec @@ -3,7 +3,7 @@ Name: cxf Version: 2.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache CXF License: ASL 2.0 Group: Development/Libraries @@ -221,8 +221,9 @@ mvn-rpmbuild \ install_pom_file () { local pom_file=${1} + local module=${2} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/${pom_file} - %add_maven_depmap ${pom_file} + %add_maven_depmap ${pom_file} -f ${module} } install_jar_file () @@ -230,10 +231,11 @@ install_jar_file () local pom_file=${1} local source=${2} local target=${3} + local module=${4} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/${pom_file} install -pm 644 ${source} %{buildroot}%{_javadir}/${target} - %add_maven_depmap ${pom_file} ${target} + %add_maven_depmap ${pom_file} ${target} -f ${module} } guess_jar_file_and_target () @@ -288,9 +290,9 @@ do guess_jar_file_and_target if $jar_found; then - install_jar_file ${pom_file} ${jar_file} ${jar_target} + install_jar_file ${pom_file} ${jar_file} ${jar_target} ${module} else - install_pom_file ${pom_file} + install_pom_file ${pom_file} ${module} fi popd @@ -301,7 +303,6 @@ maven-plugins maven-plugins codegen-plugin common common common utilities -parent rt rt bindings rt bindings/coloc @@ -334,6 +335,13 @@ tools wsdlto/databinding/jaxb tools wsdlto/frontend/jaxws EOM +# parents +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-cxf.pom +install -pm 644 parent/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom + +%add_maven_depmap JPP.%{name}-cxf.pom +%add_maven_depmap JPP.%{name}-parent.pom + # javadoc cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} @@ -341,8 +349,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %files %doc README LICENSE NOTICE %doc licenses +%{_mavenpomdir}/JPP.%{name}-cxf.pom %{_mavenpomdir}/JPP.%{name}-parent.pom -%{_mavendepmapfragdir}/* +%{_mavendepmapfragdir}/%{name} %dir %{_javadir}/%{name} %files javadoc @@ -352,28 +361,40 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %files api %{_mavenpomdir}/JPP.%{name}-api.pom +%{_mavendepmapfragdir}/%{name}-api %{_javadir}/%{name}/api.jar %files common %{_mavenpomdir}/JPP.%{name}-common* +%{_mavendepmapfragdir}/%{name}-common %{_javadir}/%{name}/common-* %files maven-plugins %{_mavenpomdir}/JPP.%{name}-maven-plugins* +%{_mavendepmapfragdir}/%{name}-maven-plugins %{_javadir}/%{name}/maven-plugins-* %files rt %{_mavenpomdir}/JPP.%{name}-rt* +%{_mavendepmapfragdir}/%{name}-rt %{_javadir}/%{name}/rt-* %files tools %{_mavenpomdir}/JPP.%{name}-tools* +%{_mavendepmapfragdir}/%{name}-tools %{_javadir}/%{name}/tools-* %changelog +* Tue Oct 02 2012 Marek Goldmann - 2.4.9-2 +- Place depmap fragments in subpackages +- Add parent of parent POM file + * Tue Sep 25 2012 Patryk Obara 2.4.9-1 - Update to latest release +- CVE-2012-2379, RHBZ#846247 +- CVE-2012-2378, RHBZ#846242 +- CVE-2012-3451, RHBZ#858781 * Mon Aug 13 2012 Patryk Obara 2.4.8-5 - Enabled modules: databinding/aegis, databinding/jibx, frontend/js diff --git a/sources b/sources index e451029..2b6ce53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -592b93ee7a63c532e85bd7f4424c7a5a apache-cxf-2.4.8-src.tar.gz +cf9f498895db4f2a5e8e282f740846b0 apache-cxf-2.4.9-src.tar.gz