[RPM (6.0)] xstream-1.4.4-1.jpp6

Ralph Apel <[email protected]> Tue, 15 Jul 2014 21:22:14 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : xstream                      Relocations: (not relocatable)
Version     : 1.4.4                             Vendor: JPackage Project
Release     : 1.jpp6                        Build Date: Tue 15 Jul 2014 09:05:35 PM CEST
Install Date: (not installed)               Build Host: localhost.localdomain
Group       : Development/Libraries/Java    Source RPM: (none)
Size        : 528811                           License: BSD-Style
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://xstream.codehaus.org/
Summary     : XML serialization library
Description :
XStream is a simple library to serialize objects to XML
and back again. A high level facade is supplied that
simplifies common use cases. Custom objects can be serialized
without need for specifying mappings. Speed and low memory
footprint are a crucial part of the design, making it suitable
for large object graphs or systems with high message throughput.
No information is duplicated that can be obtained via reflection.
This results in XML that is easier to read for humans and more
compact than native Java serialization. XStream serializes internal
fields, including private and final. Supports non-public and inner
classes. Classes are not required to have default constructor.
Duplicate references encountered in the object-model will be
maintained. Supports circular references. By implementing an
interface, XStream can serialize directly to/from any tree
structure (not just XML). Strategies can be registered allowing
customization of how particular types are represented as XML.
When an exception occurs due to malformed XML, detailed diagnostics
are provided to help isolate and fix the problem.

---------------
Ralph Apel <[email protected]> 0:1.4.4-1
- 1.4.4
---------------

---------------
Index: xstream-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xstream/xstream-jpp-depmap.xml,v
retrieving revision 1.2
diff -u -r1.2 xstream-jpp-depmap.xml
--- xstream-jpp-depmap.xml	29 Jan 2008 11:37:52 -0000	1.2
+++ xstream-jpp-depmap.xml	15 Jul 2014 19:22:11 -0000
@@ -1,244 +1,93 @@
 <dependencies>
-	<dependency>
-		<maven>
-			<groupId>servletapi</groupId>
-			<artifactId>servletapi</artifactId>
-			<version>2.3</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>servletapi5</artifactId>
-			<version>2.4</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>jetty</groupId>
-			<artifactId>jetty</artifactId>
-			<version>4.2.10</version>
-		</maven>
-		<jpp>
-			<groupId>JPP/jetty5</groupId>
-			<artifactId>jetty5</artifactId>
-			<version>5.1.12</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.2.1</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>1.2.1</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>xom</groupId>
-			<artifactId>xom</artifactId>
-			<version>1.1</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>xom</artifactId>
-			<version>1.0</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>xpp3</groupId>
-			<artifactId>xpp3</artifactId>
-			<version>1.1.3.4.O</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>xpp3</artifactId>
-			<version>1.1.3.8</version>
-		</jpp>
-	</dependency>
-	<dependency>
-		<maven>
-			<groupId>xpp3</groupId>
-			<artifactId>xpp3_min</artifactId>
-			<version>1.1.3.4.O</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>xpp3</artifactId>
-			<version>1.1.3.8</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.1.3</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>com.megginson.sax</groupId>
-			<artifactId>xml-writer</artifactId>
-			<version>0.2</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>xom</artifactId>
-			<version>1.0</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>stax</groupId>
-			<artifactId>stax</artifactId>
-			<version>1.2.0</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>bea-stax-ri</artifactId>
-			<version>1.2.0</version>
-		</jpp>
-	</dependency>
-	<dependency>
-		<maven>
-			<groupId>stax</groupId>
-			<artifactId>stax-api</artifactId>
-			<version>1.0.1</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>bea-stax-api</artifactId>
-			<version>1.0.1</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>1.2</version>
-		</maven>
-		<jpp>
-			<groupId>JPP/plexus</groupId>
-			<artifactId>utils</artifactId>
-			<version>1.2</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>org.codehaus.xsite</groupId>
-			<artifactId>xsite-maven-plugin</artifactId>
-			<version>1.0-beta-5</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>xsite-maven-plugin</artifactId>
-			<version>1.0</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>org.nanocontainer</groupId>
-			<artifactId>nanocontainer</artifactId>
-			<version>1.1</version>
-		</maven>
-		<jpp>
-			<groupId>JPP/nanocontainer</groupId>
-			<artifactId>container</artifactId>
-			<version>1.1</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>opensymphony</groupId>
-			<artifactId>sitemesh</artifactId>
-			<version>2.3</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>sitemesh</artifactId>
-			<version>2.3</version>
-		</jpp>
-	</dependency>
-
-	<dependency>
-		<maven>
-			<groupId>freemarker</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>2.3.9</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>2.3.6</version>
-		</jpp>
-	</dependency>
-
-        <dependency>
-                <maven>
-                        <groupId>asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>2.2.3</version>
-                </maven>
-                <jpp>
-                        <groupId>JPP/asm2</groupId>
-                        <artifactId>asm2</artifactId>
-                        <version>2.2.3</version>
-                </jpp>
-        </dependency>
-        <dependency>
-                <maven>
-                        <groupId>asm</groupId>
-                        <artifactId>asm-tree</artifactId>
-                        <version>2.2.3</version>
-                </maven>
-                <jpp>
-                        <groupId>JPP/asm2</groupId>
-                        <artifactId>asm2-tree</artifactId>
-                        <version>2.2.3</version>
-                </jpp>
-        </dependency>
-        <dependency>
-                <maven>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan-serializer</artifactId>
-                        <version>2.7.0</version>
-                </maven>
-                <jpp>
-                        <groupId>JPP</groupId>
-                        <artifactId>xalan-j2-serializer</artifactId>
-                        <version>2.7.0</version>
-                </jpp>
-        </dependency>
-        <dependency>
-                <maven>
-                        <groupId>slide</groupId>
-                        <artifactId>slide-webdavlib</artifactId>
-                        <version>2.1</version>
-                </maven>
-                <jpp>
-                        <groupId>JPP/slide</groupId>
-                        <artifactId>slide-webdavclient-webdavlib</artifactId>
-                        <version>2.1</version>
-                </jpp>
-        </dependency>
+
+<dependency>
+   <maven>
+        <groupId>stax</groupId>
+        <artifactId>stax</artifactId>
+        <version>1.2.0</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>bea-stax-ri</artifactId>
+        <version>1.2.0</version>
+    </jpp>
+</dependency>
+
+<dependency>
+   <maven>
+        <groupId>javax.transaction</groupId>
+        <artifactId>jta</artifactId>
+        <version>1.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>jta_1_1_api</artifactId>
+        <version>1.1</version>
+    </jpp>
+</dependency>
+<dependency>
+   <maven>
+        <groupId>org.jboss.spec.javax.transaction</groupId>
+        <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+        <version>1.0.1.Final</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>jta_1_1_api</artifactId>
+        <version>1.1</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.hibernate.javax.persistence</groupId>
+        <artifactId>hibernate-jpa-2.0-api</artifactId>
+        <version>1.0.0.Final</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>jpa_2_0_api</artifactId>
+        <version>2.0</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>proxytoys</groupId>
+        <artifactId>proxytoys</artifactId>
+        <version>0.2.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>proxytoys</artifactId>
+        <version>1.0</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>net.sf.kxml</groupId>
+        <artifactId>kxml2-min</artifactId>
+        <version>2.3.0</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>kxml2-min</artifactId>
+        <version>2.2.2</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.shared</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </jpp>
+</dependency>
 
 </dependencies>
Index: xstream-pom_xml.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xstream/xstream-pom_xml.patch,v
retrieving revision 1.2
diff -u -r1.2 xstream-pom_xml.patch
--- xstream-pom_xml.patch	29 Jan 2008 11:37:52 -0000	1.2
+++ xstream-pom_xml.patch	15 Jul 2014 19:22:11 -0000
@@ -1,29 +1,11 @@
---- pom.xml.sav	2007-05-24 10:11:12.000000000 +0200
-+++ pom.xml	2008-01-28 13:16:11.000000000 +0100
-@@ -156,6 +156,26 @@
-         <scope>test</scope>
-       </dependency>
- 
-+      <dependency>
-+        <groupId>plexus</groupId>
-+        <artifactId>plexus-utils</artifactId>
-+        <version>1.2</version>
-+        <scope>test</scope>
-+      </dependency>
-+
-+      <dependency>
-+        <groupId>xalan</groupId>
-+        <artifactId>xalan</artifactId>
-+        <version>2.7.0</version>
-+        <scope>test</scope>
-+      </dependency>
-+      <dependency>
-+        <groupId>xalan</groupId>
-+        <artifactId>xalan-serializer</artifactId>
-+        <version>2.7.0</version>
-+        <scope>test</scope>
-+      </dependency>
-+
-     </dependencies>
-   </dependencyManagement>
- 
+--- pom.xml.sav	2014-07-15 09:13:33.930964446 +0200
++++ pom.xml	2014-07-15 09:13:47.530032318 +0200
+@@ -70,7 +70,7 @@
+     <module>xstream</module>
+     <module>xstream-hibernate</module>
+     <module>xstream-benchmark</module>
+-    <module>xstream-distribution</module>
++    <!--<module>xstream-distribution</module>-->
+   </modules>
+ 
+   <licenses>
Index: xstream-xstream-pom_xml.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xstream/xstream-xstream-pom_xml.patch,v
retrieving revision 1.2
diff -u -r1.2 xstream-xstream-pom_xml.patch
--- xstream-xstream-pom_xml.patch	29 Jan 2008 11:37:52 -0000	1.2
+++ xstream-xstream-pom_xml.patch	15 Jul 2014 19:22:11 -0000
@@ -1,34 +1,15 @@
---- xstream/pom.xml.sav	2007-05-24 10:10:48.000000000 +0200
-+++ xstream/pom.xml	2008-01-28 13:15:07.000000000 +0100
-@@ -98,6 +98,23 @@
-       <artifactId>commons-lang</artifactId>
-       <scope>test</scope>
-     </dependency>
-+
-+    <dependency>
-+      <groupId>plexus</groupId>
-+      <artifactId>plexus-utils</artifactId>
-+      <scope>test</scope>
-+    </dependency>
-+
-+    <dependency>
-+      <groupId>xalan</groupId>
-+      <artifactId>xalan</artifactId>
-+      <scope>test</scope>
-+    </dependency>
-+    <dependency>
-+      <groupId>xalan</groupId>
-+      <artifactId>xalan-serializer</artifactId>
-+      <scope>test</scope>
-+    </dependency>
-   </dependencies>
- 
-   <build>
-@@ -106,6 +123,7 @@
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <configuration>
-+          <testFailureIgnore>true</testFailureIgnore>
-           <systemProperties>
-             <property>
-               <name>test.src.dir</name>
+--- xstream/pom.xml.sav	2014-07-15 09:19:10.677650685 +0200
++++ xstream/pom.xml	2014-07-15 09:19:46.705831766 +0200
+@@ -121,6 +121,12 @@
+     </dependency>
+ 
+     <dependency>
++      <groupId>jaxen</groupId>
++      <artifactId>jaxen</artifactId>
++      <scope>test</scope>
++    </dependency>
++
++    <dependency>
+       <groupId>oro</groupId>
+       <artifactId>oro</artifactId>
+       <scope>test</scope>
Index: xstream.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xstream/xstream.spec,v
retrieving revision 1.8
diff -u -r1.8 xstream.spec
--- xstream.spec	4 Aug 2012 00:58:46 -0000	1.8
+++ xstream.spec	15 Jul 2014 19:22:11 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2012, JPackage Project
+# Copyright (c) 2000-2014, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,20 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-
-%bcond_with gcj_support
-%bcond_with maven
-
-%if %with gcj_support
-%define gcj_support 1
-%else
-%define gcj_support 0
-%endif
-
 %define section free
 %define _binary_payload w9.gzdio
 %define _source_payload w9.gzdio
@@ -49,22 +35,19 @@
 %define _source_filedigest_algorithm 1
 
 Name:           xstream
-Version:        1.3.1
-Release:        5%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML serialization library
 Group:          Development/Libraries/Java
 License:        BSD-Style
 URL:            http://xstream.codehaus.org/
-Source0:        http://repository.codehaus.org/com/thoughtworks/xstream/xstream-distribution/1.3.1/xstream-distribution-1.3.1-src.zip
+Source0:        xstream-1.4.4.tgz
+# svn export http://svn.codehaus.org/xstream/tags/XSTREAM_1_4_4/ xstream-1.4.4
 Source1:        %{name}-settings.xml
 Source2:        %{name}-jpp-depmap.xml
-Patch0:         xstream-build_xml.patch
-Patch1:         xstream-pom_xml.patch
-Patch2:         xstream-xstream-pom_xml.patch
-Patch3:         xstream-xstream-distribution-pom_xml.patch
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Patch0:         xstream-pom_xml.patch
+Patch1:         xstream-xstream-pom_xml.patch
 Requires:       cglib
 Requires:       dom4j
 Requires:       jakarta-commons-lang
@@ -82,12 +65,16 @@
 # XXX: ant 1.8.x
 BuildRequires:  ant-nodeps
 BuildRequires:  ant-trax
-BuildRequires:  java-devel >= 0:1.5.0
+BuildRequires:  java-devel >= 0:1.6.0
 # should really be java-fonts, but openjdk provides java-fonts without any font files!
 BuildRequires:  java-fonts
 BuildRequires:  jpackage-utils >= 0:1.7.5
 BuildRequires:  junit >= 0:3.8.1
-%if %with maven
+BuildRequires:  javassist
+BuildRequires:  hsqldb
+BuildRequires:  hsqldb2
+BuildRequires:  hibernate3
+
 BuildRequires:  maven2 >= 0:2.0.7
 BuildRequires:  maven2-plugin-antrun
 BuildRequires:  maven2-plugin-compiler
@@ -99,28 +86,28 @@
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven-release
 BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit3
 BuildRequires:  jakarta-slide-webdavclient
-BuildRequires:  xsite
-%endif
+
 BuildRequires:  bea-stax
 BuildRequires:  cglib >= 0:2.1.3
 BuildRequires:  dom4j >= 0:1.6.1
+BuildRequires:  geronimo-jta-1.1-api
 BuildRequires:  jakarta-commons-lang >= 0:2.1
 BuildRequires:  jakarta-oro >= 0:2.0.8
+BuildRequires:  jaxen
 BuildRequires:  jdom >= 0:1.0
 BuildRequires:  jettison >= 0:1.0
 BuildRequires:  jmock >= 0:1.0.1
 BuildRequires:  joda-time >= 0:1.2.1
+BuildRequires:  proxytoys
 BuildRequires:  stax_1_0_api
 BuildRequires:  wstx >= 0:3.1.1
 BuildRequires:  xalan-j2 >= 0:2.7.0
+BuildRequires:  xml-writer
 BuildRequires:  xom >= 0:1.0
 BuildRequires:  xpp3-minimal >= 0:1.1.3.4
-%if %{gcj_support}
-BuildRequires:  java-gcj-compat-devel
-%else
 BuildArch:      noarch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -150,38 +137,14 @@
 %description javadoc
 %{summary}.
 
-%if %with maven
-%package manual
-Summary:        Documents for %{name}
-Group:          Development/Documentation
-
-%description manual
-%{summary}.
-%endif
-
 %prep
 %setup -q
-%if %with maven
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-cp -p %{SOURCE1} settings.xml
-%endif
-find . -name "*.jar" | xargs -t rm
-
-# This test requires megginson's sax2
-rm xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java
-# These sources are for Java5
-# Keep them now
-#rm -r xstream/src/java/com/thoughtworks/xstream/annotations/
-#rm -r xstream/src/test/com/thoughtworks/acceptance/annotations/
 
-mkdir -p xstream-distribution/target/xsite
+%patch0 -b .sav0
+%patch1 -b .sav1
 
-perl -pi -e 's/\r$//g' LICENSE.txt
+cp -p %{SOURCE1} settings.xml
 
-%if %with maven
 sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
 sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
 sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
@@ -190,72 +153,27 @@
 
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
-%else
-pushd xstream/lib
-# cglib-nodep-2.1_3.jar.no
-ln -s $(build-classpath cglib-nodep)
-# commons-lang-2.1.jar.no
-ln -s $(build-classpath commons-lang)
-# dom4j-1.6.1.jar.no
-ln -s $(build-classpath dom4j)
-# jdom-1.0.jar.no
-ln -s $(build-classpath jdom)
-# jettison-1.0-RC1.jar.no
-ln -s $(build-classpath jettison)
-# jmock-1.0.1.jar.no
-ln -s $(build-classpath jmock)
-# joda-time-1.2.1.jar.no
-ln -s $(build-classpath joda-time)
-# junit-3.8.1.jar.no
-ln -s $(build-classpath junit)
-# oro-2.0.8.jar.no
-ln -s $(build-classpath oro)
-# stax-1.2.0.jar.no
-ln -s $(build-classpath bea-stax-ri)
-# stax-api-1.0.1.jar.no
-ln -s $(build-classpath stax_1_0_api)
-# wstx-asl-3.2.0.jar.no
-ln -s $(build-classpath wstx/wstx-asl)
-# xml-writer-0.2.jar.no
-
-#xom-1.1.jar.no
-ln -s $(build-classpath xom)
-# xpp3_min-1.1.3.4.O.jar.no
-ln -s $(build-classpath xpp3)
-popd
-%endif
 
 %build
-%if %with maven
+
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 %{_bindir}/mvn-jpp \
         -e \
         -s $(pwd)/settings.xml \
-        -Dmaven2.jpp.mode=true \
+        -Dmaven.test.failure.ignore=true \
         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
-%else
-export CLASSPATH=$(build-classpath jaxen)
-export OPT_JAR_LIST="`cat %{_sysconfdir}/ant.d/{junit,nodeps,trax}`"
-pushd xstream
-%{ant} -Dbuild.sysclasspath=first -Dversion=%{version} library javadoc
-popd
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -Dpm 644 xstream/target/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%if %with maven
+
 install -Dpm 644 xstream-benchmark/target/%{name}-benchmark-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
-%else
-install -Dpm 644 xstream/target/%{name}-benchmark-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
-%endif
 
 %add_to_maven_depmap com.thoughtworks.xstream xstream %{version} JPP %{name}
 %add_to_maven_depmap com.thoughtworks.xstream xstream-benchmark %{version} JPP %{name}-benchmark
@@ -274,50 +192,19 @@
 
 #
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
-%if %with maven
 cp -pr xstream/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
-%else
-cp -pr xstream/target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
-%endif
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/benchmark
-%if %with maven
 cp -pr xstream-benchmark/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/benchmark
-%else
-cp -pr xstream/target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/benchmark
-%endif
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-# manual
-%if %with maven
-install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/xsite
-rm -rf xstream-distribution/target/xsite/javadoc 
-cp -pr xstream-distribution/target/xsite/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/xsite
-%endif
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %postun
 %update_maven_depmap 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(0644,root,root,0755)
@@ -330,23 +217,16 @@
 %{_datadir}/maven2/poms/JPP-%{name}-benchmark.pom
 %{_datadir}/maven2/poms/JPP-%{name}-parent.pom
 %{_mavendepmapfragdir}/%{name}
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
-%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
-%if %with maven
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
-%endif
-
 %changelog
+* Tue Jul 15 2014 Ralph Apel <[email protected]> 0:1.4.4-1
+- 1.4.4
+
 * Sat Aug 04 2012 Ralph Apel <[email protected]> 0:1.3.1-5
 - (B)R xpp3-minimal instead of xpp3