[xmlbeans] Update to latest packaging guidelines

[Stanislav Ochotnicky]

commit a6dda4f9f280fb9802023521d723d4467a3210d8
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Jun 12 17:23:50 2013 +0200

    Update to latest packaging guidelines

 xmlbeans.spec |   42 ++++++++++--------------------------------
 1 files changed, 10 insertions(+), 32 deletions(-)
---
diff --git a/xmlbeans.spec b/xmlbeans.spec
index f3a7987..9d436dd 100644
--- a/xmlbeans.spec
+++ b/xmlbeans.spec
@@ -32,9 +32,8 @@
 
 Name:           xmlbeans
 Version:        2.6.0
-Release:        3%{?dist}%{?with_bootstrap:.boot}
+Release:        4%{?dist}%{?with_bootstrap:.boot}
 Summary:        XML-Java binding tool
-Group:          Development/Libraries
 URL:            http://xmlbeans.apache.org/
 Source0:        http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
 # Pom file is not available from maven repository for the
@@ -48,7 +47,6 @@ Patch2:         xmlbeans-2.6.0-iso-8859-1-encoding.patch
 Patch3:         xmlbeans-2.6.0-jsr-bundle.patch
 Patch4:         xmlbeans-scripts-classpath.patch
 License:        ASL 2.0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %without bootstrap
 BuildRequires:  xmlbeans
@@ -56,7 +54,6 @@ BuildRequires:  xmlbeans
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  ant >= 0:1.6, ant-junit, ant-contrib, junit
-BuildRequires:  ant >= 0:1.6, ant-junit, junit
 BuildRequires:  xml-commons-resolver >= 0:1.1
 BuildRequires:  bea-stax-api
 BuildRequires:  saxon >= 8
@@ -86,9 +83,6 @@ Object model.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 %{summary}.
@@ -96,7 +90,6 @@ Requires:       jpackage-utils
 
 %package manual
 Summary:        Documents for %{name}
-Group:          Documentation
 
 %description manual
 %{summary}.
@@ -104,7 +97,6 @@ Group:          Documentation
 
 %package scripts
 Summary:        Scripts for %{name}
-Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
 
 %description scripts
@@ -143,16 +135,11 @@ sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbe
 ant -Djavac.source=1.5 -Djavac.target=1.5 default docs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jar
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic-%{version}.jar
-install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar
-install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar
-ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar
-ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar
-ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar
+install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar
+install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar
+install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xbean.pom
@@ -190,34 +177,25 @@ cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r >
 mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%{_javadir}/*
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt  README.txt
 
-
 %files javadoc
-%defattr(0644,root,root,0755)
+%doc LICENSE.txt NOTICE.txt  README.txt
 %doc %{_javadocdir}/%{name}
 
-
 %files manual
-%defattr(0644,root,root,0755)
+%doc LICENSE.txt NOTICE.txt  README.txt
 %{_docdir}/%{name}-%{version}
 
-
 %files scripts
-%defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/*
 
 
 %changelog
+* Wed Jun 12 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.6.0-4
+- Update to latest packaging guidelines
+
 * Sun Mar 03 2013 Matt Spaulding <mspaulding06 at gmail.com> - 2.6.0-3
 - Fixed classpath issue with scripts (#892690)