rpms/xstream/devel sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 xstream.spec, 1.1, 1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/xstream/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24946/devel

Modified Files:
	sources .cvsignore xstream.spec 
Log Message:
* Mon Jun 14 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3.1-1
- Update to 1.3.1.
- Install maven pom and depmap.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Dec 2009 08:00:23 -0000	1.2
+++ sources	14 Jun 2010 20:53:07 -0000	1.3
@@ -1 +1,2 @@
 a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip
+3a129d9bdf88e385424a917c59e284e2  xstream-distribution-1.3.1-src.zip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Dec 2009 08:00:23 -0000	1.2
+++ .cvsignore	14 Jun 2010 20:53:07 -0000	1.3
@@ -1 +1,2 @@
 xstream-distribution-1.2.2-src.zip
+xstream-distribution-1.3.1-src.zip


Index: xstream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xstream/devel/xstream.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xstream.spec	3 Dec 2009 08:00:23 -0000	1.1
+++ xstream.spec	14 Jun 2010 20:53:07 -0000	1.2
@@ -35,8 +35,8 @@
 %bcond_with test
 
 Name:           xstream
-Version:        1.2.2
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Java XML serialization library
 
 Group:          Development/Libraries
@@ -68,6 +68,7 @@ BuildRequires:  wstx >= 0:3.2.0
 %endif
 Requires:       jpackage-utils
 Requires:       java
+Requires:       xpp3-minimal
 
 BuildArch:      noarch
 
@@ -103,8 +104,7 @@ Requires:       jpackage-utils
 
 
 %prep
-rm -rf %{name}-%{version}
-%setup -qn %{name}-%{version}/xstream
+%setup -qn %{name}-%{version}
 find . -name "*.jar" -delete
 
 %if %with test
@@ -115,7 +115,7 @@ rm -f xstream/src/test/com/thoughtworks/
 
 %build
 # Replace bundled tars
-pushd lib
+pushd xstream/lib
 ln -sf $(build-classpath cglib)
 ln -sf $(build-classpath commons-lang)
 ln -sf $(build-classpath dom4j)
@@ -135,11 +135,13 @@ ln -sf $(build-classpath wstx/wstx-asl)
 popd
 
 # Build
+pushd xstream
 %if %with test
 ant library javadoc
 %else
 ant benchmark:compile jar javadoc
 %endif
+popd
 
 
 %install
@@ -150,6 +152,7 @@ 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}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
@@ -161,16 +164,34 @@ ln -s %{name}-benchmark-%{version}.jar $
 
 # API Documentation
 cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+popd
+
+# poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml \
+    %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
+%add_to_maven_depmap com.thoughtworks.xstream %{name}-parent %{version} JPP %{name}-parent
+
+install -pm 644 xstream/pom.xml \
+    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap com.thoughtworks.xstream %{name} %{version} JPP %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*.jar
-%doc ../LICENSE.txt
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%doc LICENSE.txt
 
 
 %files javadoc
@@ -179,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 14 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3.1-1
+- Update to 1.3.1.
+- Install maven pom and depmap.
+
 * Wed Dec 02 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.2.2-4
 - Cosmetic fixes