[xstream] Spec file cleanup

[Michal Srb]

commit e6e2eee776569f3f0806111fb7ad0c8b24316ba2
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Feb 19 07:20:38 2014 +0100

    Spec file cleanup
    
    Fix BR
    
    Build with kxml2 and json
    
    There are no known licensing issues with org.json:json

 xstream.spec |  104 +++++++++++++++++++++++-----------------------------------
 1 files changed, 41 insertions(+), 63 deletions(-)
---
diff --git a/xstream.spec b/xstream.spec
index 7bf26e4..0ae2d92 100644
--- a/xstream.spec
+++ b/xstream.spec
@@ -30,58 +30,44 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# Tests are disabled by default since we don't have
-# all the requirements in Fedora yet
-%bcond_with test
-
 Name:           xstream
 Version:        1.4.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java XML serialization library
 License:        BSD
 URL:            http://xstream.codehaus.org/
 Source0:        https://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip
 BuildRequires: java-devel
 
-# 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.mojo:build-helper-maven-plugin)
-BuildRequires: mvn(org.codehaus:codehaus-parent)
-BuildRequires: mvn(org.codehaus.jettison:jettison)
-BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
-BuildRequires: mvn(org.jdom:jdom2)
-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.hibernate:hibernate-envers)
-BuildRequires: mvn(org.slf4j:slf4j-simple)
-%if %with test
-# 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
-
-BuildRequires: maven-local
+BuildRequires:  maven-local
+BuildRequires:  mvn(cglib:cglib)
+BuildRequires:  mvn(commons-cli:commons-cli)
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(commons-lang:commons-lang)
+BuildRequires:  mvn(dom4j:dom4j)
+BuildRequires:  mvn(javassist:javassist)
+BuildRequires:  mvn(joda-time:joda-time)
+BuildRequires:  mvn(net.sf.kxml:kxml2)
+BuildRequires:  mvn(net.sf.kxml:kxml2-min)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus:codehaus-parent)
+BuildRequires:  mvn(org.codehaus.jettison:jettison)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.codehaus.woodstox:woodstox-core-asl)
+BuildRequires:  mvn(org.hibernate:hibernate-core)
+BuildRequires:  mvn(org.hibernate:hibernate-envers)
+BuildRequires:  mvn(org.hsqldb:hsqldb)
+BuildRequires:  mvn(org.jdom:jdom)
+BuildRequires:  mvn(org.jdom:jdom2)
+BuildRequires:  mvn(org.json:json)
+BuildRequires:  mvn(org.slf4j:slf4j-simple)
+BuildRequires:  mvn(oro:oro)
+BuildRequires:  mvn(stax:stax)
+BuildRequires:  mvn(stax:stax-api)
+BuildRequires:  mvn(xom:xom)
+BuildRequires:  mvn(xpp3:xpp3_min)
+
 
 BuildArch:     noarch
 
@@ -130,17 +116,8 @@ find . -name "*.jar" -print -delete
 
 %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
 
@@ -154,33 +131,34 @@ find . -name "*.jar" -print -delete
 %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
-
 %mvn_file :%{name} %{name}/%{name} %{name}
 %mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark
-# test skipped for unavailable test deps
-%if %with test
-%mvn_build
-%else
+
+%build
+# test skipped for unavailable test deps (com.megginson.sax:xml-writer)
 %mvn_build -f
-%endif
 
 %install
 %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
 %pretrans javadoc -p <lua>
 dir = "%{_javadocdir}/%{name}"
 dummy = posix.readlink(dir) and os.remove(dir)
 
+%files -f .mfiles
+%doc LICENSE.txt README.txt
+
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %changelog
+* Wed Feb 19 2014 Michal Srb <msrb at redhat.com> - 1.4.7-2
+- Spec file cleanup
+- Fix BR
+- Build with kxml2 and json
+
 * Mon Feb 10 2014 Michal Srb <msrb at redhat.com> - 1.4.7-1
 - Update to latest upstream release 1.4.7