From ca3da812181080912357e32f319c1f78d4e675b4f1067f2cc88fdf9c0796c2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 8 Jul 2014 11:36:09 +0000
Subject: [PATCH] - Cleanup bit with spec-cleaner

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-beanutils?expand=0&rev=5
---
 apache-commons-beanutils.changes |  5 +++++
 apache-commons-beanutils.spec    | 35 ++++++++++----------------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/apache-commons-beanutils.changes b/apache-commons-beanutils.changes
index 19d0bf6..8b2e486 100644
--- a/apache-commons-beanutils.changes
+++ b/apache-commons-beanutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  8 11:35:52 UTC 2014 - tchvatal@suse.com
+
+- Cleanup bit with spec-cleaner
+
 -------------------------------------------------------------------
 Mon Jul  7 08:04:04 UTC 2014 - dmacvicar@suse.de
 
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index ff97101..d7a4d44 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -14,37 +14,31 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 %define base_name	beanutils
 %define short_name	commons-%{base_name}
-
 Name:           apache-commons-beanutils
 Version:        1.9.2
 Release:        0
 Summary:        Utility methods for accessing and modifying the properties of JavaBeans
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Source0:        commons-beanutils-%{version}-src.tar.gz
 Url:            http://commons.apache.org/beanutils
-
+Source0:        commons-beanutils-%{version}-src.tar.gz
 BuildRequires:  ant
 BuildRequires:  commons-collections
 BuildRequires:  commons-logging
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  xml-commons-apis
-
 Requires:       commons-collections >= 2.0
 Requires:       commons-logging >= 1.0
-
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The scope of this package is to create a package of Java utility
@@ -52,9 +46,7 @@ methods for accessing and modifying the properties of arbitrary
 JavaBeans.  No dependencies outside of the JDK are required, so the use
 of this package is very lightweight.
 
-
 %package javadoc
-PreReq:         coreutils
 Summary:        Javadoc for jakarta-commons-beanutils
 Group:          Development/Libraries/Java
 
@@ -67,10 +59,8 @@ are required, so the use of this package is very lightweight.
 This package contains the javadoc documentation for the Jakarta Commons
 BeanUtils Package.
 
-
-
 %prep
-%setup -n %{short_name}-%{version}-src
+%setup -q -n %{short_name}-%{version}-src
 sed -i 's/\r//' *.txt
 # bug in ant build
 touch README.txt
@@ -81,24 +71,21 @@ ant -Dbuild.sysclasspath=first dist
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
-pushd $RPM_BUILD_ROOT%{_javadir}
+pushd %{buildroot}%{_javadir}
 for jar in *.jar; do
     ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
 done
 popd # come back from javadir
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)