From eb7417e8badca0b365c22d7c571559c88b56db36 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jul 12 2013 12:37:05 +0000
Subject: Update to current packaging guidelines


---

diff --git a/sources b/sources
index 413619e..6161bbc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-a29303d9e74ddb39de87fa5c6dcd2099  xstream-distribution-1.2.2-src.zip
 3a129d9bdf88e385424a917c59e284e2  xstream-distribution-1.3.1-src.zip
diff --git a/xstream.spec b/xstream.spec
index 4a6c149..7df481c 100644
--- a/xstream.spec
+++ b/xstream.spec
@@ -36,7 +36,7 @@
 
 Name:           xstream
 Version:        1.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java XML serialization library
 
 Group:          Development/Libraries
@@ -154,40 +154,35 @@ 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
+        $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # Benchmarks
 install -p -m644 target/xstream-benchmark-SNAPSHOT.jar \
-        $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark-%{version}.jar
-ln -s %{name}-benchmark-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar
 
 # API Documentation
-cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 popd
 
-# poms
+# 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
+%add_maven_depmap JPP-%{name}-parent.pom
 
 install -pm 644 xstream/pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap com.thoughtworks.xstream %{name} %{version} JPP %{name}
+%add_maven_depmap
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
+# 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)
 
-%postun
-%update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
@@ -195,11 +190,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+%doc LICENSE.txt
 
 
 %changelog
+* Fri Jul 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.1-7
+- Update to current packaging guidelines
+
 * Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.1-6
 - Rebuild to regenerate API documentation
 - Resolves: CVE-2013-1571