[maven-javadoc-plugin] Update to latest upstream version.
by Alexander Kurtakov
commit 20bb2295cc1cb64c3b3f35f25dcb1deeb170ef9e
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed May 11 13:23:04 2011 +0300
Update to latest upstream version.
Guidelines fixes.
.gitignore | 1 +
maven-javadoc-plugin.spec | 52 +++++++++++++++-----------------------------
remove-test-deps.patch | 18 +++++++-------
sources | 2 +-
4 files changed, 29 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0a75ef..44672d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-javadoc-plugin-2.7.tar.xz
+/maven-javadoc-plugin-2.8-source-release.zip
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 1a9edd2..8d70d23 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,30 +1,27 @@
%global bootstrap 0
Name: maven-javadoc-plugin
-Version: 2.7
-Release: 4%{?dist}
+Version: 2.8
+Release: 1%{?dist}
Summary: Maven Javadoc Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-javadoc-plugin
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.7
-# tar caf maven-javadoc-plugin-2.7.tar.xz maven-javadoc-plugin-2.7/
-Source0: %{name}-%{version}.tar.xz
+Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Patch0: remove-test-deps.patch
Patch1: pom.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-clean-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-shade-plugin
BuildRequires: plexus-interactivity
BuildRequires: maven-shared-invoker
@@ -33,7 +30,7 @@ BuildRequires: maven-javadoc-plugin
%endif
Requires: jpackage-utils
-Requires: maven2
+Requires: maven
Requires: maven-shared-invoker
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -60,40 +57,28 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0
+%patch0 -b .sav
# Update source for use with newer doxia
-%patch1
+#%patch1
sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
sed -i -e "s|model>|models>|g" pom.xml
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
install
%if ! %{bootstrap}
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
javadoc:javadoc
%endif
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins maven-javadoc-plugin %{version} JPP maven-javadoc-plugin
@@ -104,9 +89,8 @@ install -pm 644 pom.xml \
%if ! %{bootstrap}
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
%endif
@@ -116,9 +100,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -128,11 +109,14 @@ rm -rf target/site/api*
%if ! %{bootstrap}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%endif
%changelog
+* Wed May 11 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.8-1
+- Update to latest upstream version.
+- Guidelines fixes.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/remove-test-deps.patch b/remove-test-deps.patch
index 8953d15..d83d4e5 100644
--- a/remove-test-deps.patch
+++ b/remove-test-deps.patch
@@ -1,6 +1,6 @@
---- pom.xml.sav 2010-07-19 17:00:50.000000000 +0300
-+++ pom.xml 2010-07-19 17:24:35.896986800 +0300
-@@ -212,12 +212,6 @@ under the License.
+--- pom.xml.sav 2011-05-02 00:47:52.000000000 +0300
++++ pom.xml 2011-05-11 13:03:43.411039567 +0300
+@@ -220,12 +220,6 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
@@ -13,16 +13,16 @@
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>1.2</version>
-@@ -230,12 +224,6 @@ under the License.
+@@ -237,12 +231,6 @@ under the License.
+ <version>6.1.19</version>
<scope>test</scope>
</dependency>
- <dependency>
+- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>6.1.19</version>
- <scope>test</scope>
- </dependency>
-- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-common-artifact-filters</artifactId>
- <version>1.2</version>
+ </dependencies>
+
+ <build>
diff --git a/sources b/sources
index 8f47c51..6da96c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc81f1aa7bf6e6c25f821de3cf62536e maven-javadoc-plugin-2.7.tar.xz
+db1de84284174b0b59150ffb8132e564 maven-javadoc-plugin-2.8-source-release.zip
12 years, 11 months
[maven] Improve and clean up depmap handling for m2/m3 repos
by Stanislav Ochotnicky
commit 2caba3e6ac4a01185d6060a9bbda858fbbc7a4c7
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue May 10 13:40:59 2011 +0200
Improve and clean up depmap handling for m2/m3 repos
JavadirWorkspaceReader.java | 43 +++++++++++++++++++++++++------------------
maven.spec | 5 ++++-
2 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/JavadirWorkspaceReader.java b/JavadirWorkspaceReader.java
index 0fe02b7..8efd7e0 100644
--- a/JavadirWorkspaceReader.java
+++ b/JavadirWorkspaceReader.java
@@ -39,7 +39,7 @@ public class JavadirWorkspaceReader
MavenJPackageDepmap.debug("Wanted GROUPID=" + groupId);
MavenJPackageDepmap.debug("Wanted ARTIFACTID=" + artifactId);
-
+
if (!groupId.startsWith("JPP")) {
MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
Hashtable<String,String> newInfo = map.getMappedInfo(groupId, artifactId, version);
@@ -53,9 +53,13 @@ public class JavadirWorkspaceReader
if (artifact.getExtension().equals("pom")) {
path = getPOMPath(groupId, artifactId);
} else if (artifact.getExtension().equals("signature")) {
- path.append("/usr/share/maven/repository/");
+ path.append("/usr/share/maven/repository/");
path.append( groupId ).append( '/' );
path.append( artifactId ).append( ".signature" );
+ } else if (artifact.getExtension().equals("zip")) {
+ path.append("/usr/share/maven/repository/");
+ path.append( groupId ).append( '/' );
+ path.append( artifactId ).append( ".zip" );
} else {
path.append("/usr/share/maven/repository/");
path.append( groupId ).append( '/' );
@@ -70,7 +74,7 @@ public class JavadirWorkspaceReader
MavenJPackageDepmap.debug("Returning " + path.toString());
return ret;
} else {
- MavenJPackageDepmap.debug("Returning null for gid:aid" + groupId + ":" + artifactId);
+ MavenJPackageDepmap.debug("Returning null for gid:aid =>" + groupId + ":" + artifactId);
return null;
}
}
@@ -83,22 +87,25 @@ public class JavadirWorkspaceReader
private StringBuffer getPOMPath(String groupId, String artifactId) {
- StringBuffer path = new StringBuffer();
String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom";
- path.append(System.getProperty("maven.local.pom.path", "JPP/maven2/poms")).append("/").append(fName);
- java.io.File f;
-
- // NOTE: We are returning default_poms/ as the path for this pom
- // even though it may not exist there. This may cause an error,
- // but that is fine because if the pom is not there, there is
- // a serious problem anyways..
- f = new java.io.File(System.getProperty("maven.local.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
- //System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
- if (!f.exists()) {
- path = new StringBuffer();
- path.append(System.getProperty("maven.local.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName);
+ String m2path = System.getProperty("maven2.local.pom.path", "JPP/maven2/poms") + "/" + fName;
+ String m3path = System.getProperty("maven.local.pom.path", "JPP/maven/poms") + "/" + fName;
+ File f;
+
+ // let's try maven 2 repo first
+ f = new File(System.getProperty("maven2.local.default.repo", "/usr/share/maven2/repository") + "/" + m2path);
+ if ( f.exists() ) {
+ return new StringBuffer(f.getPath());
}
- path.insert(0, "/usr/share/maven2/repository/");
- return path;
+
+ f = new File(System.getProperty("maven.local.default.repo", "/usr/share/maven/repository") + "/" + m3path);
+ if ( f.exists() ) {
+ return new StringBuffer(f.getPath());
+ }
+
+ // final fallback to m2 default poms
+ return new StringBuffer("/usr/share/maven2/repository/" +
+ System.getProperty("maven.local.default.repo", "JPP/maven2/default_poms") +
+ "/" + fName);
}
}
diff --git a/maven.spec b/maven.spec
index 20847c8..e0033a0 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
Name: maven
Version: 3.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -308,6 +308,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* Tue May 10 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-3
+- Improve and clean up depmap handling for m2/m3 repos
+
* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-2
- Enable MAVEN_OPTS override in scripts
12 years, 12 months
[icu4j] Use proper tarball.
by Alexander Kurtakov
commit a8f8cdd56179d1603dcb7df3fc511e95bd6142ce
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon May 9 15:48:35 2011 +0300
Use proper tarball.
Fix build.
.gitignore | 5 +-
icu4j-4.0.1.pom | 22 --------
icu4j-4.4.2.pom | 134 +++++++++++++++++++++++++++++++++++++++++++++++++
icu4j-crosslink.patch | 31 ++++-------
icu4j.spec | 53 ++++++++++----------
sources | 2 +-
6 files changed, 174 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 545f33e..073f5d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-icu4j-3_8_1-src.jar
-icu4j-4_0_1-src.jar
-icu4j-4_2_1-src.jar
+icu4j-*-src.jar
+/icu4j-4.4.2.tar.xz
diff --git a/icu4j-4.4.2.pom b/icu4j-4.4.2.pom
new file mode 100644
index 0000000..ba2918c
--- /dev/null
+++ b/icu4j-4.4.2.pom
@@ -0,0 +1,134 @@
+<!--
+*******************************************************************************
+* Copyright (C) 2010-2011, International Business Machines Corporation and *
+* others. All Rights Reserved. *
+*******************************************************************************
+--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>4.4.2</version>
+
+ <name>ICU4J</name>
+ <description>
+ International Component for Unicode for Java (ICU4J) is a mature, widely used Java library
+ providing Unicode and Globalization support
+ </description>
+ <url>http://icu-project.org/</url>
+ <inceptionYear>2001</inceptionYear>
+ <licenses>
+ <license>
+ <name>ICU License</name>
+ <url>http://source.icu-project.org/repos/icu/icu/trunk/license.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <id>mark</id>
+ <name>Mark Davis</name>
+ <organization>Google</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>emmons</id>
+ <name>John Emmons</name>
+ <organization>IBM Corporation</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>doug</id>
+ <name>Doug Felt</name>
+ <organization>Google</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>deborah</id>
+ <name>Deborah Goldsmith</name>
+ <organization>Apple</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>srl</id>
+ <name>Steven Loomis</name>
+ <organization>IBM Corporation</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>markus</id>
+ <name>Markus Scherer</name>
+ <organization>Google</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>yoshito</id>
+ <name>Yoshito Umaoka</name>
+ <organization>IBM Corporation</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <mailingLists>
+ <mailingList>
+ <name>icu-support</name>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/icu-support</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/icu-support</unsubscribe>
+ <post>icu-support(a)lists.sourceforge.net</post>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=icu-support</archive>
+ </mailingList>
+ <mailingList>
+ <name>icu-announce</name>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/icu-announce</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/icu-announce</unsubscribe>
+ <post>icu-announce(a)lists.sourceforge.net</post>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=icu-announce</archive>
+ </mailingList>
+ <mailingList>
+ <name>icu-design</name>
+ <subscribe>https://lists.sourceforge.net/lists/listinfo/icu-design</subscribe>
+ <unsubscribe>https://lists.sourceforge.net/lists/listinfo/icu-design</unsubscribe>
+ <post>icu-design(a)lists.sourceforge.net</post>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum_name=icu-design</archive>
+ </mailingList>
+ </mailingLists>
+
+ <scm>
+ <connection>scm:svn:http://source.icu-project.org/repos/icu/icu4j/trunk/</connection>
+ <developerConnection>scm:svn:http://source.icu-project.org/repos/icu/icu4j/trunk/</developerConnection>
+ <url>http://source.icu-project.org/repos/icu/icu4j/trunk/</url>
+ </scm>
+ <issueManagement>
+ <system>Trac</system>
+ <url>http://bugs.icu-project.org/trac/</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <repository>
+ <id>icu4j-releases</id>
+ <name>ICU4J Central Repository</name>
+ <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>icu4j-snapshots</id>
+ <name>ICU4J Central Development Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
+
diff --git a/icu4j-crosslink.patch b/icu4j-crosslink.patch
index 957af68..ccb7536 100644
--- a/icu4j-crosslink.patch
+++ b/icu4j-crosslink.patch
@@ -1,20 +1,11 @@
---- build.xml.orig 2007-12-10 21:56:54.000000000 -0500
-+++ build.xml 2008-06-30 18:29:36.000000000 -0400
-@@ -425,7 +425,7 @@
- docencoding="iso-8859-1"
- bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>"
- additionalparam="${doc.params}"
-- link="http://java.sun.com/j2se/1.5/docs/api"
-+ link="${j2se.apidoc}"
- source="1.4" />
- </target>
-
-@@ -442,7 +442,7 @@
- docencoding="iso-8859-1"
- bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>"
- additionalparam="${doc.params}"
-- link="http://java.sun.com/j2se/1.5/docs/api"
-+ link="${j2se.apidoc}"
- source="1.4" />
- </target>
-
+--- build.xml.sav 2011-05-09 15:34:33.558950383 +0300
++++ build.xml 2011-05-09 15:37:10.204119756 +0300
+@@ -448,7 +448,7 @@
+ docencoding="iso-8859-1"
+ bottom="<font size=-1>Copyright (c) ${current.year} IBM Corporation and others.</font>"
+ additionalparam="-breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet"
+- link="http://java.sun.com/javase/6/docs/api/"
++ link="${j2se.apidoc}"
+ source="1.5">
+ <packageset dir="${icu4j.core.dir}/src">
+ <include name="com/ibm/icu/lang/**"/>
diff --git a/icu4j.spec b/icu4j.spec
index 428756e..a5fe570 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -43,18 +43,19 @@
%endif
Name: icu4j
-Version: 4.2.1
+Version: 4.4.2
Release: 2%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
-URL: http://www-306.ibm.com/software/globalization/icu/index.jsp
+URL: http://site.icu-project.org/
Group: Development/Libraries
-Source0: http://download.icu-project.org/files/icu4j/4.2.1/icu4j-4_2_1-src.jar
-Source1: http://repo2.maven.org/maven2/com/ibm/icu/icu4j/4.0.1/%{name}-4.0.1.pom
+#http://source.icu-project.org/repos/icu/icu4j/tags/release-4-4-2-eclipse37-20110208/ icu4j-4.4.2
+#tar caf icu4j-4.4.2.tar.xz icu4j-4.4.2/
+Source0: icu4j-4.4.2.tar.xz
+Source1: %{name}-4.4.2.pom
+
Patch0: %{name}-crosslink.patch
-# PDE Build is in a location the upstream build.xml doesn't check
-Patch4: %{name}-pdebuildlocation.patch
BuildRequires: ant >= 1.7.0
# FIXME: is this necessary or is it just adding strings in the hrefs in
# the docs?
@@ -73,7 +74,6 @@ BuildRequires: eclipse-pde >= 0:3.2.1
%else
BuildArch: noarch
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
The International Components for Unicode (ICU) library provides robust and
@@ -111,13 +111,11 @@ Eclipse plugin support for %{name}.
%endif
%prep
-%setup -q -c
-%patch0 -p0
-%patch4 -p0
+%setup -q
+#%patch0 -p0
cp %{SOURCE1} .
-%{__sed} -i 's/\r//' license.html
%{__sed} -i 's/\r//' APIChangeReport.html
%{__sed} -i 's/\r//' readme.html
@@ -127,23 +125,20 @@ sed --in-place "/javac1.3/d" build.xml
sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml
%build
+%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
%if %{with_eclipse}
+pushd eclipse-build
%ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
-Declipse.basews=gtk -Declipse.baseos=linux \
-Declipse.basearch=%{eclipse_arch} \
- -Dicu4j.eclipse.build.version.string=4.2.1.v20100412 \
- jar docs eclipsePDEBuild
-%else
- %ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs
+ -Declipse.pde.dir=%{eclipse_base}/dropins/sdk/plugins/`ls %{eclipse_base}/dropins/sdk/plugins/|grep org.eclipse.pde.build_`
+popd
%endif
-
+
%install
-%__rm -rf %{buildroot}
-
# jars
%__mkdir_p %{buildroot}%{_javadir}
-%__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %__ln_s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+%__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -154,12 +149,12 @@ sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml
# eclipse
install -d -m755 %{buildroot}/%{eclipse_base}
-unzip -qq -d %{buildroot}/%{eclipse_base} eclipseProjects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
+unzip -qq -d %{buildroot}/%{eclipse_base} eclipse-build/out/projects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
%endif
# maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-cp %{name}-4.0.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap com.ibm.icu %{name} %{version} JPP %{name}
%post
@@ -168,12 +163,9 @@ cp %{name}-4.0.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%postun
%update_maven_depmap
-%clean
-%__rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
-%doc license.html readme.html APIChangeReport.html
+%doc readme.html APIChangeReport.html
%{_javadir}/%{name}*.jar
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*.pom
@@ -190,10 +182,17 @@ cp %{name}-4.0.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%dir %{_libdir}/eclipse/plugins
%{_libdir}/eclipse/features/*
%{_libdir}/eclipse/plugins/*
-%doc license.html readme.html
+%doc readme.html
%endif
%changelog
+* Mon May 9 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1:4.4.2-2
+- Use proper tarball.
+- Fix build.
+
+* Tue Apr 05 2011 Chris Aniszczyk <zx(a)redhat.com> 1:4.4.2-1
+- Update to 4.4.2.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:4.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index dcf611c..7518c9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01f58c554dffce3b2365eec4c94ea921 icu4j-4_2_1-src.jar
+44f4bdc0e436931a158bbd40cca3a6a2 icu4j-4.4.2.tar.xz
12 years, 12 months
[objenesis] * Mon May 09 2011 Guido Grazioli <guido.grazioli@gmail.com> 1.2-7 - Improve project description
by Guido Grazioli
commit 6c3e4ba3951ad0e53ce68c09efee689a1c0c261d
Author: Guido Grazioli <guido.grazioli(a)gmail.com>
Date: Mon May 9 12:49:16 2011 +0200
* Mon May 09 2011 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-7
- Improve project description
objenesis.spec | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/objenesis.spec b/objenesis.spec
index 9583bc3..b2aeea6 100644
--- a/objenesis.spec
+++ b/objenesis.spec
@@ -31,7 +31,7 @@
Summary: A library for instantiating Java objects
Name: objenesis
Version: 1.2
-Release: 6%{dist}
+Release: 7%{dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://objenesis.googlecode.com/svn/docs/index.html
@@ -76,18 +76,18 @@ Requires(postun): jpackage-utils
BuildArch: noarch
%description
-Java supports dynamic instantiation of classes using Class.newInstance().
-However, this only works if the class has an appropriate constructor. There
+Objenesis is a small Java library that serves one purpose: to instantiate
+a new object of a particular class.
+Java supports dynamic instantiation of classes using Class.newInstance();
+however, this only works if the class has an appropriate constructor. There
are many times when a class cannot be instantiated this way, such as when
-the class contains:
-* Constructors that require arguments.
-* Constructors that have side effects.
-* Constructors that throw exceptions.
-As a result, it is common to see restrictions in libraries stating that
-classes must require a default constructor. Objenesis aims to overcome these
-restrictions by bypassing the constructor on object instantiation.
-Needing to instantiate an object without calling the constructor is a fairly
-specialized task, however there are certain cases when this is useful:
+the class contains constructors that require arguments, that have side effects,
+and/or that throw exceptions. As a result, it is common to see restrictions
+in libraries stating that classes must require a default constructor.
+Objenesis aims to overcome these restrictions by bypassing the constructor
+on object instantiation. Needing to instantiate an object without calling
+the constructor is a fairly specialized task, however there are certain cases
+when this is useful:
* Serialization, Remoting and Persistence - Objects need to be instantiated
and restored to a specific state, without invoking code.
* Proxies, AOP Libraries and Mock Objects - Classes can be subclassed without
@@ -180,6 +180,9 @@ cp -pr tck/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
%changelog
+* Mon May 09 2011 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-7
+- Improve project description
+
* Thu Feb 24 2011 Guido Grazioli <guido.grazioli(a)gmail.com> 1.2-6
- Build with mvn-rpmbuild
- Fix License
12 years, 12 months
