[jdom] Update to new upstream version.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Nov 2 09:59:34 UTC 2011
commit cf3b89778c4cd30d175dfdca948b2ed0ecccff58
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Wed Nov 2 11:59:20 2011 +0200
Update to new upstream version.
Adapt to current guidelines.
.gitignore | 1 +
jdom-1.1.2.pom | 75 ++++++++++++++++++++++++++++++++++++++++++++++++
jdom-cleanup-pom.patch | 54 ----------------------------------
jdom.spec | 41 ++++++--------------------
sources | 2 +-
5 files changed, 87 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a1d0ff8..4493a19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
jdom-1.1.1.tar.gz
+jdom-1.1.2.tar.gz
diff --git a/jdom-1.1.2.pom b/jdom-1.1.2.pom
new file mode 100644
index 0000000..982de98
--- /dev/null
+++ b/jdom-1.1.2.pom
@@ -0,0 +1,75 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <packaging>jar</packaging>
+
+ <name>JDOM</name>
+ <version>1.1.2</version>
+
+ <description>
+ A complete, Java-based solution for accessing, manipulating,
+ and outputting XML data
+ </description>
+ <url>http://www.jdom.org</url>
+
+ <organization>
+ <name>JDOM</name>
+ <url>http://www.jdom.org</url>
+ </organization>
+
+ <mailingLists>
+ <mailingList>
+ <name>JDOM-interest Mailing List</name>
+ <post>jdom-interest at jdom.org</post>
+ <archive>http://jdom.markmail.org/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <licenses>
+ <license>
+ <name>Similar to Apache License but with the acknowledgment clause removed</name>
+ <url>https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <url>git at github.com:/hunterhacker/jdom</url>
+ <connection>scm:git:git at github.com:hunterhacker/jdom</connection>
+ <developerConnection>scm:git:git at github.com:hunterhacker/jdom</developerConnection>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>hunterhacker</id>
+ <name>Jason Hunter</name>
+ <email>jhunter at servlets.com</email>
+ </developer>
+ <developer>
+ <id>rolfl</id>
+ <name>Rolf Lear</name>
+ <email>jdom at tuis.net</email>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.10.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+ <properties>
+ <jdk.version>1.2</jdk.version>
+ </properties>
+</project>
diff --git a/jdom.spec b/jdom.spec
index 770bdb7..db86a8d 100644
--- a/jdom.spec
+++ b/jdom.spec
@@ -29,27 +29,23 @@
#
Name: jdom
-Version: 1.1.1
-Release: 5%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
Epoch: 0
Summary: Java alternative to DOM and SAX
License: ASL 1.1
URL: http://www.jdom.org/
Group: Development/Libraries
Source0: http://jdom.org/dist/binary/jdom-%{version}.tar.gz
-Source1: http://repo1.maven.org/maven2/org/jdom/jdom/1.1/jdom-1.1.pom
+Source1: http://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{version}.pom
Patch0: %{name}-crosslink.patch
Patch1: %{name}-1.0-OSGiManifest.patch
-# Change version number and remove dependencies that don't have POMs yet
-Patch2: %{name}-cleanup-pom.patch
Requires: xalan-j2 >= 0:2.2.0
BuildRequires: ant >= 0:1.6
BuildRequires: xalan-j2 >= 0:2.2.0
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: java-javadoc
BuildArch: noarch
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Requires: jpackage-utils
%description
@@ -79,24 +75,20 @@ Demonstrations and samples for %{name}.
%prep
%setup -q -n %{name}
-cp %{SOURCE1} .
%patch0 -p0
%patch1 -p0
-%patch2 -p0
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
find . -name "*.class" -exec rm -f {} \;
%build
export CLASSPATH=$(build-classpath xalan-j2)
-sed -e 's|<property name="build.compiler".*||' build.xml > tempf; cp tempf build.xml; rm tempf
ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
-
%install
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p build/%{name}-%{version}-snap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -108,41 +100,28 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
# maven stuff
mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-cp jdom-1.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
-%add_to_maven_depmap org.jdom %{name} %{version} JPP %{name}
-
-# compatibility depmap
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
+%add_maven_depmap JPP-jdom.pom %{name}.jar -a "jdom:jdom"
%files
-%defattr(-,root,root,-)
%doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
%{_javadir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/*.pom
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%doc LICENSE.txt
%files demo
-%defattr(-,root,root,-)
%{_datadir}/%{name}
%doc LICENSE.txt
%changelog
+* Wed Nov 2 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.2-1
+- New upstream version.
+- Adapt to current guidelines.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 7571322..f2c3444 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ad116194e3101fb08fab8f6f00cc58f jdom-1.1.1.tar.gz
+a18b39aaf6b855cc0fdea590a7cc4fa0 jdom-1.1.2.tar.gz
More information about the scm-commits
mailing list