rpms/jakarta-commons-lang/devel commons-lang-2.4-jpp-depmap.xml, NONE, 1.1 jakarta-commons-lang-encoding.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 jakarta-commons-lang-addosgimanifest.patch, 1.1, 1.2 jakarta-commons-lang.spec, 1.30, 1.31 sources, 1.6, 1.7 commons-lang-2.3-jpp-depmap.xml, 1.1, NONE commons-lang-2.3.pom, 1.1, NONE

Jerry James jjames at fedoraproject.org
Wed Feb 3 22:10:18 UTC 2010 

Author: jjames

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

Modified Files:
	.cvsignore jakarta-commons-lang-addosgimanifest.patch 
	jakarta-commons-lang.spec sources 
Added Files:
	commons-lang-2.4-jpp-depmap.xml 
	jakarta-commons-lang-encoding.patch 
Removed Files:
	commons-lang-2.3-jpp-depmap.xml commons-lang-2.3.pom 
Log Message:
* Wed Feb  3 2010 Jerry James <loganjerry at gmail.com> - 0:2.4-1
- Update to version 2.4.
- Install the upstream POM.
- Add -encoding patch.



--- NEW FILE commons-lang-2.4-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit</artifactId>
         <jar>junit.jar</jar>
         <version>3.8.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.1</version>
      </maven>
      <jpp>
         <groupId>JPP/maven2/plugins</groupId>
         <artifactId>checkstyle-plugin</artifactId>
         <version>2.1-SNAPSHOT</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>clirr-maven-plugin</artifactId>
         <version>2.1.1</version>
      </maven>
   </dependency>
</depset>

jakarta-commons-lang-encoding.patch:
 build.xml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE jakarta-commons-lang-encoding.patch ---
--- build.xml.orig	2010-02-03 14:58:15.298861996 -0700
+++ build.xml	2010-02-03 14:59:24.983618922 -0700
@@ -62,7 +62,7 @@
 		</copy>
 	</target>
 	<target name="compile" depends="static" description="Compile shareable components">
-		<javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
+		<javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" encoding="ISO8859-1">
 			<classpath refid="compile.classpath"/>
 		</javac>
 		<copy todir="${build.home}/classes" filtering="on">
@@ -70,7 +70,7 @@
 		</copy>
 	</target>
 	<target name="compile.tests" depends="compile" description="Compile unit test cases">
-		<javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" source="${compile.source}" optimize="${compile.optimize}">
+		<javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" source="${compile.source}" optimize="${compile.optimize}" encoding="ISO8859-1">
 			<classpath refid="test.classpath"/>
 		</javac>
 		<copy todir="${build.home}/tests" filtering="on">
@@ -89,7 +89,7 @@
 	    <tstamp>
 	        <format property="current.year" pattern="yyyy"/>
 	    </tstamp>
-		<javadoc sourcepath="${source.home}" destdir="${dist.home}/docs/api" overview="${source.home}/org/apache/commons/lang/overview.html" packagenames="org.apache.commons.*" excludepackagenames="${javadoc.excludepackagenames}" author="true" version="true" doctitle="&lt;h1&gt;${component.title}&lt;/h1&gt;" windowtitle="${component.title} (Version ${component.version})" bottom="Copyright &amp;copy; 2001-${current.year} - Apache Software Foundation" use="true" link="${jdk.javadoc}" source="${compile.source}">
+		<javadoc sourcepath="${source.home}" destdir="${dist.home}/docs/api" overview="${source.home}/org/apache/commons/lang/overview.html" packagenames="org.apache.commons.*" excludepackagenames="${javadoc.excludepackagenames}" author="true" version="true" doctitle="&lt;h1&gt;${component.title}&lt;/h1&gt;" windowtitle="${component.title} (Version ${component.version})" bottom="Copyright &amp;copy; 2001-${current.year} - Apache Software Foundation" use="true" link="${jdk.javadoc}" source="${compile.source}" encoding="ISO8859-1">
 			<classpath refid="compile.classpath"/>
 		</javadoc>
 	</target>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Jan 2008 03:40:24 -0000	1.7
+++ .cvsignore	3 Feb 2010 22:10:17 -0000	1.8
@@ -1 +1 @@
-commons-lang-2.3-src.tar.gz
+commons-lang-2.4-src.tar.gz

jakarta-commons-lang-addosgimanifest.patch:
 MANIFEST.MF |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

Index: jakarta-commons-lang-addosgimanifest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/jakarta-commons-lang-addosgimanifest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jakarta-commons-lang-addosgimanifest.patch	25 Jul 2008 14:27:51 -0000	1.1
+++ jakarta-commons-lang-addosgimanifest.patch	3 Feb 2010 22:10:18 -0000	1.2
@@ -10,12 +10,12 @@ diff -up ./src/conf/MANIFEST.MF.osgi ./s
 +Bundle-ManifestVersion: 2
 +Bundle-Name: %pluginName
 +Bundle-Localization: plugin
-+Bundle-Version: 2.3.0.v200803061910
++Bundle-Version: 2.4.0.v200803190541
 +Bundle-Vendor: %providerName
-+Export-Package: org.apache.commons.lang;version="2.3.0",org.apache.com
-+ mons.lang.builder;version="2.3.0",org.apache.commons.lang.enum;versio
-+ n="2.3.0",org.apache.commons.lang.enums;version="2.3.0",org.apache.co
-+ mmons.lang.exception;version="2.3.0",org.apache.commons.lang.math;ver
-+ sion="2.3.0",org.apache.commons.lang.mutable;version="2.3.0",org.apac
-+ he.commons.lang.text;version="2.3.0",org.apache.commons.lang.time;ver
-+ sion="2.3.0"
++Export-Package: org.apache.commons.lang;version="2.4.0",org.apache.com
++ mons.lang.builder;version="2.4.0",org.apache.commons.lang.enum;versio
++ n="2.4.0",org.apache.commons.lang.enums;version="2.4.0",org.apache.co
++ mmons.lang.exception;version="2.4.0",org.apache.commons.lang.math;ver
++ sion="2.4.0",org.apache.commons.lang.mutable;version="2.4.0",org.apac
++ he.commons.lang.text;version="2.4.0",org.apache.commons.lang.time;ver
++ sion="2.4.0"


Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- jakarta-commons-lang.spec	8 Jan 2010 22:26:35 -0000	1.30
+++ jakarta-commons-lang.spec	3 Feb 2010 22:10:18 -0000	1.31
@@ -39,8 +39,8 @@
 %define short_name      commons-%{base_name}
 
 Name:           jakarta-%{short_name}
-Version:        2.3
-Release:        4.4%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Provides a host of helper utilities for the java.lang API
 License:        ASL 2.0
@@ -51,9 +51,9 @@ Source1:        pom-maven2jpp-depcat.xsl
 Source2:        pom-maven2jpp-newdepmap.xsl
 Source3:        pom-maven2jpp-mapdeps.xsl
 Source4:        %{short_name}-%{version}-jpp-depmap.xml
-Source5:        %{short_name}-%{version}.pom
 Patch0:         %{name}-notarget.patch
 Patch1:         %{name}-addosgimanifest.patch
+Patch2:         %{name}-encoding.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,10 +112,10 @@ Group:          Documentation
 %prep
 %setup -q -n %{short_name}-%{version}-src
 %{__perl} -pi -e 's/\r//g' *.txt
-%{__sed} -i 's/\r//' STATUS.html
 
 %patch0
 %patch1
+%patch2
 
 %build
 %if %{with_maven}
@@ -182,8 +182,7 @@ cp -p dist/%{short_name}.jar $RPM_BUILD_
 
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 %{SOURCE5} \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
 %endif
 
 # javadoc
@@ -197,7 +196,6 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
 
 ## manual
 install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -p STATUS.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %if %{with_maven}
 rm -rf target/docs/apidocs
@@ -235,9 +233,8 @@ fi
 %files
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/STATUS.html
 %doc %{_docdir}/%{name}-%{version}/*.txt
-#%doc PROPOSAL.html STATUS.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+#%doc PROPOSAL.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*
 %if %{with_maven}
 %{_datadir}/maven2/poms/*
@@ -259,6 +256,11 @@ fi
 %endif
 
 %changelog
+* Wed Feb  3 2010 Jerry James <loganjerry at gmail.com> - 0:2.4-1
+- Update to version 2.4.
+- Install the upstream POM.
+- Add -encoding patch.
+
 * Fri Jan 08 2010 Andrew Overholt <overholt at redhat.com> 0:2.3-4.4
 - Update Source0 URL.
 - Fix Group tags.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Jan 2008 03:40:24 -0000	1.6
+++ sources	3 Feb 2010 22:10:18 -0000	1.7
@@ -1 +1 @@
-2ae988b339daec234019a7066f96733e  commons-lang-2.3-src.tar.gz
+625ff5f2f968dd908bca43c9469d6e6b  commons-lang-2.4-src.tar.gz


--- commons-lang-2.3-jpp-depmap.xml DELETED ---


--- commons-lang-2.3.pom DELETED ---

More information about the scm-commits mailing list