[xpp2/f20] Update for newer guidelines, drop versioned jars, duplicate docs

Mon Aug 26 22:42:58 UTC 2013

commit 261e8cc865c07386ff4931a5672581501f173e53
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Aug 26 23:42:21 2013 +0100

    Update for newer guidelines, drop versioned jars, duplicate docs
    
    - Fixes rhbz #993885, rhbz #1001270

 xpp2.spec |   91 ++++++++++++++++++++++++-------------------------------------
 1 files changed, 36 insertions(+), 55 deletions(-)
---

diff --git a/xpp2.spec b/xpp2.spec
index c5c719d..01edaad 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,11 +33,11 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        17%{?dist}
+Release:        18%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
-Group:          Text Processing/Markup/XML
+Group:          Development/Libraries
 Source0:        http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
 Patch0:         xpp2-build_xml.patch
 BuildRequires:  ant >= 0:1.6
@@ -48,7 +48,8 @@ BuildRequires:  xml-commons-apis
 Requires:       xml-commons-apis
 Requires:       jpackage-utils
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides:  xpp2-doc = 0:%{version}-%{release}
+Obsoletes: xpp2-doc < 0:2.1.10-18
 
 %description
 XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser.
@@ -57,22 +58,14 @@ All active development concentrates on its successor XPP3/MXP1.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires:       jpackage-utils
+Group:          Documentation
 
 %description javadoc
 %{summary}.
 
-%package doc
-Summary:        Manual for %{name}
-Group:          Development/Documentation
-
-%description doc
-%{summary}.
-
 %package demo
 Summary:        Samples for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{epoch}:%{version}
 
 %description demo
@@ -85,81 +78,69 @@ find \( -name *.class -o -name *.jar \) -delete
 
 %patch0 -b .sav
 
+# Fix encoding of licence file
+iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt > LICENSE.txt.utf8
+mv LICENSE.txt.utf8 LICENSE.txt
+
 %build
-export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=$(build-classpath xml-commons-apis)
 ant all api api.impl
 CLASSPATH=$CLASSPATH:$(build-classpath junit):build/tests:build/lib/PullParser-2.1.10.jar
 java AllTests
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 
 cp -p build/lib/%{originalname}-intf-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-intf-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-intf.jar
 cp -p build/lib/%{originalname}-standard-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-standard-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-standard.jar
 cp -p build/lib/%{originalname}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 cp -p build/lib/%{originalname}-x2-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-x2-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-x2.jar
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
-cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
-cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl
+cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api
+cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/api_impl
 rm -rf doc/{build.txt,api,api_impl}
 
-# doc
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-cp -pr doc/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
-
 # demo
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pretrans javadoc
+# workaround for rpm bug, can be removed in F-23
+[ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
+%pretrans demo
+# workaround for rpm bug, can be removed in F-23
+[ -L %{_datadir}/%{name} ] && \
+rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || :
 
 %files
-%defattr(0644,root,root,0755)
-%doc README.html
-%doc LICENSE.txt
+%doc LICENSE.txt README.html doc
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}-intf.jar
-%{_javadir}/%{name}-intf-%{version}.jar
 %{_javadir}/%{name}-standard.jar
-%{_javadir}/%{name}-standard-%{version}.jar
 %{_javadir}/%{name}-x2.jar
-%{_javadir}/%{name}-x2-%{version}.jar
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
-
-%files doc
-%defattr(0644,root,root,0755)
-%doc %{_datadir}/doc/%{name}-%{version}
-%doc %{_datadir}/doc/%{name}
+%doc LICENSE.txt
+%{_javadocdir}/%{name}
 
 %files demo
-%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Aug 26 2013 Mat Booth <fedora at matbooth.co.uk> - 0:2.1.10-18
+- Update for newer guidelines, drop versioned jars, duplicate docs
+- Fixes rhbz #993885, rhbz #1001270
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.1.10-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
