Update to version 1.4.4 (RHBZ#999071)
Patch submitted by: gil cattaneo
This commit is contained in:
Matt Spaulding
parent
ad74dceec8
commit
ed4fd51fd2
3 changed files with 93 additions and 104 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
xstream-distribution-1.2.2-src.zip
|
||||
xstream-distribution-1.3.1-src.zip
|
||||
/xstream-distribution-1.4.4-src.zip
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
3a129d9bdf88e385424a917c59e284e2 xstream-distribution-1.3.1-src.zip
|
||||
c7b3df5cbed667ca87e70935b0462bc3 xstream-distribution-1.4.4-src.zip
|
||||
|
|
|
|||
188
xstream.spec
188
xstream.spec
|
|
@ -35,43 +35,53 @@
|
|||
%bcond_with test
|
||||
|
||||
Name: xstream
|
||||
Version: 1.3.1
|
||||
Release: 8%{?dist}
|
||||
Version: 1.4.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Java XML serialization library
|
||||
|
||||
Group: Development/Libraries
|
||||
License: BSD
|
||||
URL: http://xstream.codehaus.org/
|
||||
Source0: http://repository.codehaus.org/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip
|
||||
Source0: https://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip
|
||||
BuildRequires: java-devel
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires: jpackage-utils >= 0:1.7.2
|
||||
BuildRequires: ant >= 0:1.6
|
||||
BuildRequires: bea-stax >= 0:1.2.0
|
||||
BuildRequires: bea-stax-api >= 0:1.0.1
|
||||
BuildRequires: cglib >= 0:2.1.3
|
||||
BuildRequires: dom4j >= 0:1.6.1
|
||||
BuildRequires: jakarta-commons-lang >= 0:2.1
|
||||
BuildRequires: jakarta-oro
|
||||
BuildRequires: jdom >= 0:1.0
|
||||
BuildRequires: jettison >= 0:1.0
|
||||
BuildRequires: joda-time >= 0:1.2.1
|
||||
BuildRequires: junit >= 0:3.8.1
|
||||
BuildRequires: xom >= 0:1.0
|
||||
BuildRequires: xpp3 >= 0:1.1.3.4
|
||||
BuildRequires: unzip
|
||||
BuildRequires: java-devel-openjdk
|
||||
# core deps
|
||||
BuildRequires: mvn(cglib:cglib)
|
||||
BuildRequires: mvn(dom4j:dom4j)
|
||||
BuildRequires: mvn(joda-time:joda-time)
|
||||
BuildRequires: mvn(net.sf.kxml:kxml2)
|
||||
BuildRequires: mvn(org.codehaus:codehaus-parent)
|
||||
BuildRequires: mvn(org.codehaus.jettison:jettison)
|
||||
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
|
||||
BuildRequires: mvn(org.jdom:jdom)
|
||||
BuildRequires: mvn(stax:stax)
|
||||
BuildRequires: mvn(stax:stax-api)
|
||||
BuildRequires: mvn(xom:xom)
|
||||
BuildRequires: mvn(xpp3:xpp3)
|
||||
# hibernate deps
|
||||
BuildRequires: mvn(javassist:javassist)
|
||||
BuildRequires: mvn(org.hibernate:hibernate-core)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
||||
%if %with test
|
||||
BuildRequires: jmock >= 0:1.0.1
|
||||
BuildRequires: wstx >= 0:3.2.0
|
||||
# Not available
|
||||
BuildRequires: mvn(com.megginson.sax:xml-writer)
|
||||
BuildRequires: mvn(commons-cli:commons-cli)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(commons-lang:commons-lang)
|
||||
# Not available
|
||||
BuildRequires: mvn(jmock:jmock)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
# Non provides pom file
|
||||
BuildRequires: mvn(net.sf.kxml:kxml2-min)
|
||||
# Non free
|
||||
BuildRequires: mvn(org.json:json)
|
||||
BuildRequires: mvn(org.hsqldb:hsqldb)
|
||||
BuildRequires: mvn(oro:oro)
|
||||
# Not available
|
||||
BuildRequires: mvn(proxytoys:proxytoys)
|
||||
%endif
|
||||
Requires: jpackage-utils
|
||||
Requires: java
|
||||
Requires: xpp3-minimal
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: maven-local
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
XStream is a simple library to serialize objects to XML
|
||||
|
|
@ -96,8 +106,6 @@ are provided to help isolate and fix the problem.
|
|||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation
|
||||
Requires: jpackage-utils
|
||||
|
||||
%description javadoc
|
||||
%{name} API documentation.
|
||||
|
|
@ -105,75 +113,61 @@ Requires: jpackage-utils
|
|||
|
||||
%prep
|
||||
%setup -qn %{name}-%{version}
|
||||
find . -name "*.jar" -delete
|
||||
find . -name "*.class" -print -delete
|
||||
find . -name "*.jar" -print -delete
|
||||
|
||||
%if %with test
|
||||
# This test requires megginson's sax2
|
||||
rm -f xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java
|
||||
%endif
|
||||
# Remove org.apache.maven.wagon:wagon-webdav
|
||||
%pom_xpath_remove "pom:project/pom:build/pom:extensions"
|
||||
# Require org.codehaus.xsite:xsite-maven-plugin
|
||||
%pom_disable_module xstream-distribution
|
||||
%pom_remove_plugin :xsite-maven-plugin
|
||||
%pom_remove_plugin :jxr-maven-plugin
|
||||
# Unwanted
|
||||
%pom_remove_plugin :maven-source-plugin
|
||||
%pom_remove_plugin :maven-dependency-plugin
|
||||
|
||||
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream
|
||||
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream
|
||||
# use xpp3 instead of xpp3_min, requires xmlpull classes
|
||||
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'xpp3' ]/pom:artifactId" xpp3 xstream
|
||||
%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "<scope>test</scope>" xstream
|
||||
# Remove no pom file available
|
||||
%pom_remove_dep :kxml2-min xstream
|
||||
# Remove xmlpull classes provides by xpp3
|
||||
%pom_remove_dep :xmlpull xstream
|
||||
# Unavailable test deps
|
||||
%pom_remove_dep jmock:jmock xstream
|
||||
# Remove non free
|
||||
%pom_remove_dep org.json:json xstream
|
||||
# Require unavailable proxytoys:proxytoys
|
||||
%pom_remove_plugin :maven-dependency-plugin xstream
|
||||
|
||||
%pom_remove_plugin :maven-javadoc-plugin xstream
|
||||
|
||||
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream-hibernate
|
||||
%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "<scope>test</scope>" xstream-hibernate
|
||||
%pom_remove_plugin :maven-dependency-plugin xstream-hibernate
|
||||
%pom_remove_plugin :maven-javadoc-plugin xstream-hibernate
|
||||
|
||||
%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "<scope>test</scope>" xstream-benchmark
|
||||
%pom_remove_plugin :maven-javadoc-plugin xstream-benchmark
|
||||
|
||||
%build
|
||||
# Replace bundled tars
|
||||
pushd xstream/lib
|
||||
ln -sf $(build-classpath cglib)
|
||||
ln -sf $(build-classpath commons-lang)
|
||||
ln -sf $(build-classpath dom4j)
|
||||
ln -sf $(build-classpath jdom)
|
||||
ln -sf $(build-classpath jettison)
|
||||
ln -sf $(build-classpath joda-time)
|
||||
ln -sf $(build-classpath junit)
|
||||
ln -sf $(build-classpath oro)
|
||||
ln -sf $(build-classpath bea-stax-ri)
|
||||
ln -sf $(build-classpath bea-stax-api)
|
||||
ln -sf $(build-classpath xom)
|
||||
ln -sf $(build-classpath xpp3)
|
||||
%if %with test
|
||||
ln -sf $(build-classpath jmock)
|
||||
ln -sf $(build-classpath wstx/wstx-asl)
|
||||
%endif
|
||||
popd
|
||||
|
||||
# Build
|
||||
pushd xstream
|
||||
%mvn_file :%{name} %{name}/%{name} %{name}
|
||||
%mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark
|
||||
# test skipped for unavailable test deps
|
||||
%if %with test
|
||||
ant library javadoc
|
||||
%mvn_build
|
||||
%else
|
||||
ant benchmark:compile jar javadoc
|
||||
%mvn_build -f
|
||||
%endif
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
# Directory structure
|
||||
install -d $RPM_BUILD_ROOT%{_javadir}
|
||||
install -d $RPM_BUILD_ROOT%{_javadocdir}
|
||||
|
||||
# Main jar
|
||||
pushd xstream
|
||||
install -p -m644 target/xstream-SNAPSHOT.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||
|
||||
# Benchmarks
|
||||
install -p -m644 target/xstream-benchmark-SNAPSHOT.jar \
|
||||
$RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar
|
||||
|
||||
# API Documentation
|
||||
cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
popd
|
||||
|
||||
# POMs
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 644 pom.xml \
|
||||
%{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
|
||||
%add_maven_depmap JPP-%{name}-parent.pom
|
||||
|
||||
install -pm 644 xstream/pom.xml \
|
||||
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%add_maven_depmap
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE.txt README.txt
|
||||
|
||||
# Workaround for RPM bug #646523 - can't change symlink to directory
|
||||
# TODO: Remove this in F-22
|
||||
|
|
@ -181,20 +175,14 @@ install -pm 644 xstream/pom.xml \
|
|||
dir = "%{_javadocdir}/%{name}"
|
||||
dummy = posix.readlink(dir) and os.remove(dir)
|
||||
|
||||
|
||||
%files
|
||||
%{_javadir}/*.jar
|
||||
%{_mavenpomdir}/*
|
||||
%{_mavendepmapfragdir}/*
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt
|
||||
|
||||
|
||||
%files javadoc
|
||||
%{_javadocdir}/%{name}
|
||||
%doc LICENSE.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 20 2013 gil cattaneo <puntogil@libero.it> 1.4.4-1
|
||||
- update to 1.4.4
|
||||
- switch to XMvn
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue