msrb pushed to dom4j (master). "Adapt to current guidelines"

[notifications at fedoraproject.org]

From b9daf46c987bde861a1fe906bd52fc94514d8516 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Mon, 8 Jun 2015 16:52:27 +0200
Subject: Adapt to current guidelines


diff --git a/dom4j.spec b/dom4j.spec
index ace4fd8..0d79c5c 100644
--- a/dom4j.spec
+++ b/dom4j.spec
@@ -31,11 +31,10 @@
 Summary:        Open Source XML framework for Java
 Name:           dom4j
 Version:        1.6.1
-Release:        22%{?dist}
+Release:        23%{?dist}
 Epoch:          0
 License:        BSD
-URL:            http://www.dom4j.org/
-Group:          Development/Libraries
+URL:            http://sourceforge.net/projects/dom4j
 # ./create-tarball.sh
 Source0:        %{name}-%{version}-clean.tar.xz
 Source1:        dom4j_rundemo.sh
@@ -64,19 +63,7 @@ BuildRequires:  xerces-j2
 BuildRequires:  xpp2
 BuildRequires:  xpp3
 BuildRequires:  msv-xsdlib
-Requires:  xpp2
-Requires:  xpp3
-Requires:  xerces-j2
-Requires:  msv-msv
-Requires:  msv-xsdlib
-Requires:  relaxngDatatype
-Requires:  isorelax
-Requires:  jaxen-bootstrap >= 0:1.1-0.b7
-Requires:  jpackage-utils >= 0:1.6
-Requires:  bea-stax
-Requires:  bea-stax-api
-Requires:  ws-jaxme
-Requires:  xalan-j2
+BuildRequires:  javapackages-local
 BuildArch:      noarch
 
 %description
@@ -86,7 +73,6 @@ DOM and SAX and is seamlessly integrated with full XPath support.
 
 %package demo
 Summary:        Samples for %{name}
-Group:          Documentation
 Requires:       dom4j = 0:%{version}-%{release}
 
 %description demo
@@ -94,14 +80,12 @@ Samples for %{name}.
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Documentation
 
 %description manual
 Documentation for %{name}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
@@ -120,6 +104,8 @@ sed -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml.orig > build.xml
 %patch2 -p1
 %patch3 -p1
 
+%mvn_alias : org.jvnet.hudson.dom4j:dom4j
+
 %build
 pushd lib
 ln -sf $(build-classpath xpp2)
@@ -150,19 +136,15 @@ popd
 ant all samples # test
 
 %install
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_artifact %{SOURCE2} build/%{name}.jar
 
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 pushd build/doc/javadoc
 for f in `find -name \*.html -o -name \*.css`; do
   sed -i 's/\r//g' $f;
 done
 popd
-cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%mvn_install -J build/doc/javadoc
 
 # manual
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -172,6 +154,7 @@ for f in `find -name \*.html -o -name \*.css -o -name \*.java`; do
   sed -i 's/\r//g' $f;
 done
 popd
+
 cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}
 tr -d \\r <LICENSE.txt >tmp.file; mv tmp.file LICENSE.txt
 cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -184,19 +167,11 @@ cp -pr src/samples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/src
 cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/classes/org/dom4j
 install -m 755 run.sh $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 
-# POM and depmap
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a "org.jvnet.hudson.dom4j:dom4j"
-
 %files -f .mfiles
-%dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/LICENSE.txt
+%license %{_docdir}/%{name}/LICENSE.txt
 
-%files javadoc
-%dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/LICENSE.txt
-%{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
+%license %{_docdir}/%{name}/LICENSE.txt
 
 %files manual
 %doc %{_docdir}/%{name}
@@ -206,6 +181,9 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %{_datadir}/%{name}-%{version}
 
 %changelog
+* Mon Jun 08 2015 Michal Srb <msrb at redhat.com> - 0:1.6.1-23
+- Adapt to current guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.6.1-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/dom4j.git/commit/?h=master&id=b9daf46c987bde861a1fe906bd52fc94514d8516