[xom: 2/2] Merge branch 'rhbz977551'

[Mikolaj Izdebski]

commit 3a918cdcf82dc3af67210fcad03808e36c812be3
Merge: 22fa4be 2d2cff3
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Mar 24 08:32:33 2015 +0100

    Merge branch 'rhbz977551'
    
    Conflicts:
    	xom.spec

 .gitignore                       |   1 +
 clean-tarball.sh                 |  25 ++++++++
 sources                          |   2 +-
 xom-1.0.pom                      |  62 ------------------
 xom-Replace-icu4j-with-JDK.patch | 125 ------------------------------------
 xom-betterdocclasspath.patch     |  14 ----
 xom-build.patch                  | 134 +++++++++++++++++++++++++++++++++++++++
 xom-gjdocissues.patch            |  21 ------
 xom.spec                         | 104 +++++++++++++++---------------
 9 files changed, 213 insertions(+), 275 deletions(-)
---
diff --cc .gitignore
index 3ce170b,3ce170b..4856365
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
  xom-1.0.tar.gz
++/xom-1.2.10-clean.tar.gz
diff --cc sources
index 374ea3a,374ea3a..287c25d
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
--af472e90685eef0ac1e731eb84a49763  xom-1.0.tar.gz
++7d83f9794d46bf2a12cb1468f13b5964  xom-1.2.10-clean.tar.gz
diff --cc xom.spec
index ef569d6,7e69025..6a8dc50
--- a/xom.spec
+++ b/xom.spec
@@@ -33,10 -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:        16%{?dist}
+ Version:        1.2.10
+ Release:        1%{?dist}
  Epoch:          0
  License:        LGPLv2
  URL:            http://www.xom.nu
@@@ -62,10 -56,7 +56,9 @@@ BuildRequires:  xerces-j
  BuildRequires:  dom4j
  %endif
  BuildRequires:  xml-commons-apis
- 
  BuildRequires:  tagsoup
 +# Use JAXP implementation in JDK
 +BuildRequires:  java-devel
  BuildRequires:  xml-commons-resolver
  BuildRequires:  servlet
  
@@@ -140,62 -136,51 +138,64 @@@ for f in `find -name \*.css -o -name \*
  done
  popd
  
+ mv build/maven2/project.xml build/maven2/pom.xml
+ %pom_add_dep jaxen:jaxen build/maven2/pom.xml
+ 
  %install
  # jars
- install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
- 
+ install -d -m 755 %{buildroot}%{_javadir}
  install -m 644 build/%{name}-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+   %{buildroot}%{_javadir}/%{name}.jar
  
  # javadoc
- install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+ cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}
  
  # demo
- install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
- install -m 644 build/xom-samples.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/
+ install -d -m 755 %{buildroot}%{_datadir}/%{name}
+ install -m 644 build/xom-samples.jar %{buildroot}%{_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
- 
- # 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)
+ install -d -m 755 %{buildroot}%{_mavenpomdir}
+ install -m 644 build/maven2/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+ %add_maven_depmap JPP-%{name}.pom %{name}.jar
  
 -%files
 +%files -f .mfiles
- %doc overview.html
  %doc README.txt
  %doc LICENSE.txt
  %doc Todo.txt
  %doc lgpl.txt
- %doc %{name}.graffle
+ %{_javadir}/%{name}.jar
+ %{_mavenpomdir}/JPP-%{name}.pom
 -%{_mavendepmapfragdir}/*
  
  %files javadoc
- %{_javadocdir}/*
+ %{_javadocdir}/%{name}
+ %doc LICENSE.txt
+ %doc lgpl.txt
  
  %files demo
  %dir %{_datadir}/%{name}
  %{_datadir}/%{name}/xom-samples.jar
  
  %changelog
 -* Mon Jun 24 2013 Michal Srb <msrb at redhat.com> - 0:1.2.10-1
++* Tue Mar 24 2015 Michal Srb <msrb at redhat.com> - 0:1.2.10-1
+ - Update to latest upstream version 1.2.10
+ - Spec file clean up
+ 
 +* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-16
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
 +* 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
 +
 +* Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.0-13
 +- Replace BR on libgcj with generic java-devel
 +
  * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-12
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild