[xom] Update to current packaging guidelines

[Mikolaj Izdebski]

commit d503148ca05e0424e0abfe3282a4a6949673a941
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Jan 23 08:31:46 2014 +0100

    Update to current packaging guidelines

 xom.spec |   61 +++++++++++++++++++++++++------------------------------------
 1 files changed, 25 insertions(+), 36 deletions(-)
---
diff --git a/xom.spec b/xom.spec
index b2172d0..b1d5475 100644
--- a/xom.spec
+++ b/xom.spec
@@ -33,10 +33,10 @@
 %define with_dom4j %{?_with_dom4j:1}%{!?_with_dom4j:0}
 %define without_dom4j %{!?_with_dom4j:1}%{?_with_dom4j:0}
 
-Summary:        XML Pull Parser
+Summary:        XML Object Model
 Name:           xom
 Version:        1.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Epoch:          0
 License:        LGPLv2
 URL:            http://www.xom.nu
@@ -72,9 +72,7 @@ BuildRequires:  servlet
 Requires:  xalan-j2
 Requires:  xerces-j2
 Requires:  xml-commons-apis
-Requires:  jpackage-utils
 BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 XOM is a new XML object model. It is an open source (LGPL),
@@ -86,20 +84,17 @@ learning curve. Assuming you're already familiar with XML,
 you should be able to get up and running with XOM very quickly.
 
 %package javadoc
-Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
 
 %description javadoc
-%{summary}.
+This package provides %{summary}.
 
 %package demo
 Summary:        Samples for %{name}
-Group:          Documentation
-Requires:       %{name} = 0:%{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description demo
-%{summary}.
+This package provides %{summary}.
 
 %prep
 %setup -q -n XOM
@@ -112,11 +107,6 @@ find . -name "*.jar" -exec rm -f {} \;
 rm -f src/nu/xom/tests/{Encoding,Verifier}Test.java
 
 cp %{SOURCE1} pom.xml
-# fix xml stuff in pom
-sed -i 's%<project>%<project xmlns="http://maven.apache.org/POM/4.0.0" \
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 \
-http://maven.apache.org/maven-v4_0_0.xsd ">%' pom.xml
 # remove it from pom.xml since it's not needed anymore
 %pom_remove_dep com.ibm.icu:icu4j
 
@@ -155,49 +145,48 @@ popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 
 install -m 644 build/%{name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{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}.jar
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 # demo
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
-install -m 644 build/xom-samples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -m 644 build/xom-samples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 # POM
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Workaround for RPM bug #646523 - can't change symlink to directory
+# TODO: Remove this in F-23
+%pretrans javadoc -p <lua>
+dir = "%{_javadocdir}/%{name}"
+dummy = posix.readlink(dir) and os.remove(dir)
 
-%files
-%defattr(0644,root,root,0755)
+%files -f .mfiles
 %doc overview.html
 %doc README.txt
 %doc LICENSE.txt
 %doc Todo.txt
 %doc lgpl.txt
 %doc %{name}.graffle
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %{_javadocdir}/*
 
 %files demo
-%defattr(0644,root,root,0755)
-%dir %{_datadir}/%{name}-%{version}
-%{_datadir}/%{name}-%{version}/xom-samples.jar
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/xom-samples.jar
 
 %changelog
+* Thu Jan 23 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.0-15
+- Update to current packaging guidelines
+- Remove versioned JARs, resolves: rhbz#1022173
+- Add workaround for rhbz#646523
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild