Update to new upstream version.
Adapt to current guidelines.
This commit is contained in:
Alexander Kurtakov
parent
59c617a8af
commit
34a2fc655c
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
jdom-1.1.1.tar.gz
|
||||
jdom-1.1.2.tar.gz
|
||||
|
||||
75
jdom-1.1.2.pom
Normal file
75
jdom-1.1.2.pom
Normal file
@ -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@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@github.com:/hunterhacker/jdom</url>
|
||||
<connection>scm:git:git@github.com:hunterhacker/jdom</connection>
|
||||
<developerConnection>scm:git:git@github.com:hunterhacker/jdom</developerConnection>
|
||||
</scm>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>hunterhacker</id>
|
||||
<name>Jason Hunter</name>
|
||||
<email>jhunter@servlets.com</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rolfl</id>
|
||||
<name>Rolf Lear</name>
|
||||
<email>jdom@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>
|
||||
@ -1,54 +0,0 @@
|
||||
--- jdom-1.1.pom.orig 2010-02-05 11:25:52.525720695 +0000
|
||||
+++ jdom-1.1.pom 2010-02-05 11:26:53.387657825 +0000
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>org.jdom</groupId>
|
||||
<artifactId>jdom</artifactId>
|
||||
- <version>1.1</version>
|
||||
+ <version>1.1.1</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>JDOM</name>
|
||||
@@ -20,42 +20,4 @@
|
||||
<connection>scm:cvs:pserver:anonymous@cvs.jdom.org:/home/cvspublic:jdom</connection>
|
||||
</scm>
|
||||
|
||||
- <dependencies>
|
||||
- <dependency>
|
||||
- <groupId>xerces</groupId>
|
||||
- <artifactId>xercesImpl</artifactId>
|
||||
- <version>2.6.1</version>
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>xerces</groupId>
|
||||
- <artifactId>xmlParserAPIs</artifactId>
|
||||
- <version>2.6.1</version>
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.jdom</groupId>
|
||||
- <artifactId>jaxen-core</artifactId>
|
||||
- <version>1.0-FCS</version> <!-- patched 1.0-FCS -->
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.jdom</groupId>
|
||||
- <artifactId>jaxen-jdom</artifactId>
|
||||
- <version>1.0-FCS</version> <!-- patched 1.0-FCS -->
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>org.jdom</groupId>
|
||||
- <artifactId>saxpath</artifactId>
|
||||
- <version>1.0-FCS</version> <!-- patched 1.0-FCS -->
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
- <groupId>xalan</groupId>
|
||||
- <artifactId>xalan</artifactId>
|
||||
- <version>2.5.D1</version>
|
||||
- <optional>true</optional>
|
||||
- </dependency>
|
||||
- </dependencies>
|
||||
</project>
|
||||
41
jdom.spec
41
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@redhat.com> 0:1.1.2-1
|
||||
- New upstream version.
|
||||
- Adapt to current guidelines.
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user