rpms/apache-commons-jexl/EL-6 apache-commons-jexl-2.0.1-bsf.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 apache-commons-jexl.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3 apache-commons-jexl-1.1-level.patch, 1.1, NONE pom.xml, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Thu Jul 1 17:40:31 UTC 2010
Author: orion
Update of /cvs/pkgs/rpms/apache-commons-jexl/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25388/EL-6
Modified Files:
.cvsignore apache-commons-jexl.spec import.log sources
Added Files:
apache-commons-jexl-2.0.1-bsf.patch
Removed Files:
apache-commons-jexl-1.1-level.patch pom.xml
Log Message:
Update to 2.0.1 from devel
apache-commons-jexl-2.0.1-bsf.patch:
pom.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
--- NEW FILE apache-commons-jexl-2.0.1-bsf.patch ---
--- commons-jexl-2.0.1-src/pom.xml.bsf 2010-03-31 12:05:13.000000000 -0600
+++ commons-jexl-2.0.1-src/pom.xml 2010-05-26 13:29:00.614309865 -0600
@@ -102,13 +102,6 @@
<version>3.8.2</version>
<scope>test</scope>
</dependency>
- <!-- For JSR-223 API -->
- <dependency>
- <groupId>org.apache.bsf</groupId>
- <artifactId>bsf-api</artifactId>
- <version>3.0-beta3</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<properties>
@@ -301,4 +294,4 @@
-->
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-jexl/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 12 Jan 2010 15:39:13 -0000 1.2
+++ .cvsignore 1 Jul 2010 17:40:31 -0000 1.3
@@ -1 +1 @@
-commons-jexl-1.1-src.tar.gz
+commons-jexl-2.0.1-src.tar.gz
Index: apache-commons-jexl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-jexl/EL-6/apache-commons-jexl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- apache-commons-jexl.spec 12 Jan 2010 15:39:14 -0000 1.1
+++ apache-commons-jexl.spec 1 Jul 2010 17:40:31 -0000 1.2
@@ -1,29 +1,34 @@
%global jarname commons-jexl
Name: apache-%{jarname}
-Version: 1.1
-Release: 3%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
Summary: Java Expression Language (JEXL)
Group: Development/Libraries
License: ASL 2.0
URL: http://commons.apache.org/jexl
Source0: http://www.apache.org/dist/commons/jexl/source/%{jarname}-%{version}-src.tar.gz
-Source1: pom.xml
-#Up source and target level to 1.3 from 1.2
-Patch0: %{name}-1.1-level.patch
+# Java 1.6 contains bsf 3.0, so we don't need the dependency in the pom.xml file
+Patch0: %{name}-2.0.1-bsf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven2
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven-plugin-bundle
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: maven2-plugin-surefire
BuildRequires: maven2-plugin-surefire-report
+BuildRequires: maven-release-plugin
+BuildRequires: javacc-maven-plugin
BuildRequires: maven-doxia-sitetools
BuildArch: noarch
@@ -50,7 +55,6 @@ needed Velocity-ish method access, it ju
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
-Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
Provides: %{jarname}-javadoc = %{version}-%{release}
@@ -60,8 +64,7 @@ This package contains the API documentat
%prep
%setup -q -n %{jarname}-%{version}-src
-%patch0 -p1 -b .level
-cp %SOURCE1 .
+%patch0 -p1 -b .bsf
find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' +
# Fix line endings
find -name '*.txt' -exec sed -i 's/\r//' '{}' +
@@ -91,7 +94,7 @@ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
cp -p pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven %{jarname} %{version} JPP %{name}
+%add_to_maven_depmap org.apache.commons %{jarname} %{version} JPP %{name}
%clean
@@ -121,6 +124,14 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed May 26 2010 Orion Poplawski <orion at cora.nwra.com> - 2.0.1-1
+- Update to 2.0.1
+- Require Java 1.6 or greater
+- Drop language level patch
+- Add patch to remove bsf-api 3.0 dependency from pom.xml as this is provided
+ by Java 1.6
+- Fix depmap group id
+
* Sat Jan 9 2010 Orion Poplawski <orion at cora.nwra.com> - 1.1-3
- Drop gcj support
- Fix javadoc group
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-jexl/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 12 Jan 2010 15:39:14 -0000 1.1
+++ import.log 1 Jul 2010 17:40:31 -0000 1.2
@@ -1 +1,2 @@
apache-commons-jexl-1_1-3_fc12:F-12:apache-commons-jexl-1.1-3.fc12.src.rpm:1263310558
+apache-commons-jexl-2_0_1-1_fc14:EL-6:apache-commons-jexl-2.0.1-1.fc14.src.rpm:1278005992
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-jexl/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 12 Jan 2010 15:39:14 -0000 1.2
+++ sources 1 Jul 2010 17:40:31 -0000 1.3
@@ -1 +1 @@
-d774d1ec952faa744b2f768b611cf175 commons-jexl-1.1-src.tar.gz
+37c370ec1c4168c26a88d2f6239b3153 commons-jexl-2.0.1-src.tar.gz
--- apache-commons-jexl-1.1-level.patch DELETED ---
--- pom.xml DELETED ---
More information about the scm-commits
mailing list