[mojarra] fix rhbz#992275, fix build deps list
Marek Goldmann
goldmann at fedoraproject.org
Thu Aug 8 06:51:17 UTC 2013
commit 283cb2857aef8baa22accbbc83449c5f30435983
Author: gil <puntogil at libero.it>
Date: Thu Aug 8 06:10:13 2013 +0200
fix rhbz#992275, fix build deps list
mojarra.spec | 83 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 47 insertions(+), 36 deletions(-)
---
diff --git a/mojarra.spec b/mojarra.spec
index 27aeef9..29f2afa 100644
--- a/mojarra.spec
+++ b/mojarra.spec
@@ -1,58 +1,54 @@
-Name: mojarra
-Version: 2.1.7
-Release: 7%{?dist}
-Summary: JSF Reference Implementation
-
-Group: Development/Libraries
-License: CDDL or GPLv2 with exceptions
-URL: http://javaserverfaces.java.net
-
+Name: mojarra
+Version: 2.1.7
+Release: 8%{?dist}
+Summary: JSF Reference Implementation
+License: CDDL or GPLv2 with exceptions
+URL: http://javaserverfaces.java.net
# svn export https://svn.java.net/svn/mojarra~svn/tags/2.1.7/ mojarra-2.1.7
# find mojarra-2.1.7/ -name '*.class' -delete
# find mojarra-2.1.7/ -name '*.jar' -delete
# tar czf mojarra-2.1.7.tgz mojarra-2.1.7
-Source0: %{name}-%{version}.tgz
-Source1: http://repo1.maven.org/maven2/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7.pom
-Source2: http://repo1.maven.org/maven2/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7.pom
-
+Source0: %{name}-%{version}.tgz
+Source1: http://repo1.maven.org/maven2/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7.pom
+Source2: http://repo1.maven.org/maven2/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7.pom
# Don't use the installer builder as it requires additional dependences and it
# is only used to build installers, which we don't use:
-Patch0: %{name}-remove-installer-builder.patch
+Patch0: %{name}-remove-installer-builder.patch
# Fix the classpath for maven ant tasks to include all the needed jar files:
-Patch1: %{name}-fix-maven-ant-tasks-classpath.patch
+Patch1: %{name}-fix-maven-ant-tasks-classpath.patch
# Add the target to deploy test dependencies to the Tomcat 7 container
# configuration:
-Patch2: %{name}-add-tomcat7-deploy-test-dependencies-target.patch
+Patch2: %{name}-add-tomcat7-deploy-test-dependencies-target.patch
# Don't try to download dependencies:
-Patch3: %{name}-dont-download-dependencies.patch
+Patch3: %{name}-dont-download-dependencies.patch
# Fix the ant group id, it should be org.apache.ant instead of just ant:
-Patch4: %{name}-fix-ant-gid.patch
+Patch4: %{name}-fix-ant-gid.patch
# Use "Oracle Corporation" as the name of the Java vendor, otherwise the
# profile that adds tools.jar to the classpath is not activated:
-Patch5: %{name}-jdk7.patch
+Patch5: %{name}-jdk7.patch
# The classpaths were calculated using the maven ant tasks, but we removed
# that, so we need to build fix them:
-Patch6: %{name}-fix-classpaths.patch
+Patch6: %{name}-fix-classpaths.patch
# Don't compres JavaScript using YUI compressor, as we don't have it available
# in the distribution:
-Patch7: %{name}-dont-use-yuicompressor.patch
+Patch7: %{name}-dont-use-yuicompressor.patch
# Don't build the Tomcat 6, Jetty and Glassfish injection providers:
-Patch8: %{name}-dont-build-injection-providers.patch
+Patch8: %{name}-dont-build-injection-providers.patch
# Don't bundle the API inside the implementation:
-Patch9: %{name}-dont-bundle-api.patch
+Patch9: %{name}-dont-bundle-api.patch
# Don't use the namespace-alias XLST element in the stylesheet
# that merges the jsf-ri-runtime.xml file:
-Patch10: %{name}-dont-use-namespace-alias.patch
+Patch10: %{name}-dont-use-namespace-alias.patch
BuildArch: noarch
@@ -68,6 +64,9 @@ BuildRequires: tomcat-el-2.2-api
BuildRequires: tomcat-jsp-2.2-api
BuildRequires: geronimo-annotation
BuildRequires: geronimo-validation
+BuildRequires: maven-install-plugin
+BuildRequires: apache-commons-digester
+BuildRequires: jboss-jstl-1.2-api
Requires: jpackage-utils
Requires: java
@@ -85,12 +84,8 @@ web applications by: assembling reusable UI components in a page; connecting
these components to an application data source; and wiring client-generated
events to server-side event handlers.
-
%package javadoc
-Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
-
+Summary: Javadoc for %{name}
%description javadoc
This package contains the API documentation for %{name}.
@@ -120,6 +115,18 @@ find . -name '*.jar' -delete
mv LICENSE LICENSE.tmp
iconv -f ISO-8859-1 -t UTF-8 LICENSE.tmp > LICENSE
+cp -p %{SOURCE1} jsf-api.pom
+cp -p %{SOURCE2} jsf-impl.pom
+for a in jsf-api.pom jsf-impl.pom; do
+%pom_remove_dep javax.servlet.jsp.jstl:jstl-api ${a}
+%pom_add_dep org.jboss.spec.javax.servlet.jstl:jboss-jstl-api_1.2_spec:1.0.3.Final:provided ${a}
+%pom_remove_dep javax.servlet:javax.servlet-api ${a}
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api:7.0.40:provided ${a}
+%pom_remove_dep javax.servlet.jsp:javax.servlet.jsp-api ${a}
+%pom_add_dep org.apache.tomcat:tomcat-jsp-api:7.0.40:provided ${a}
+%pom_remove_dep javax.el:javax.el-api ${a}
+%pom_add_dep org.apache.tomcat:tomcat-el-api:7.0.40:provided ${a}
+done
%build
@@ -139,7 +146,7 @@ done
# Create links for the jars used for compilation:
mkdir -p lib/compile
names='
-taglibs-core
+jboss-jstl-1.2-api
tomcat-servlet-3.0-api
tomcat-el-2.2-api
tomcat-jsp-2.2-api
@@ -156,13 +163,13 @@ done
mkdir -p common/lib
ln -s `build-classpath aqute-bnd` common/lib/bnd-0.0.249.jar
-
+sed -i 's|<arg line="-f|<arg line="-- -f|' common/ant/maven.xml
# Build it the binaries:
ant \
-Dbuild.sysclasspath=last \
-Djsf.build.home=$PWD \
-Dcontainer.name=tomcat7 \
- -Dmvn.cmd=`which mvn-rpmbuild`
+ -Dmvn.cmd=`which mvn-build`
# Generate the javadocs:
ant \
@@ -189,8 +196,8 @@ install -m 644 jsf-ri/build/lib/javax.faces.jar %{buildroot}%{_javadir}/%{name}/
# POM files:
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-jsf-api.pom
-install -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.%{name}-jsf-impl.pom
+install -m 644 jsf-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jsf-api.pom
+install -m 644 jsf-impl.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jsf-impl.pom
# API javadoc files:
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}/jsf-api
@@ -213,13 +220,17 @@ cp -rp jsf-api/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}/jsf-impl/.
%doc docs/community.html
%doc docs/jsf-2_1-changelog.html
-
%files javadoc
%{_javadocdir}/%{name}
%doc LICENSE
-
%changelog
+* Thu Aug 08 2013 gil cattaneo <puntogil at libero.it> 2.1.7-8
+- fix rhbz#992275
+- fix build deps list
+- used mvn-build instead of mvn-rpmbuild
+- minor changes to adapt to current guideline
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list