From bdc25850771c286ee08929ae855766ccf28cd206 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Nov 09 2012 12:17:05 +0000
Subject: Fix up packaging properly


- Use new macros

---

diff --git a/backport-util-concurrent.spec b/backport-util-concurrent.spec
index 5528818..73f46df 100644
--- a/backport-util-concurrent.spec
+++ b/backport-util-concurrent.spec
@@ -31,7 +31,7 @@
 Name:		backport-util-concurrent
 Summary:	Backport of java.util.concurrent API, introduced in Java 5.0
 Version:	3.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 URL:		http://backport-jsr166.sourceforge.net
 License:	Public Domain
 Group:		Development/Libraries
@@ -39,17 +39,13 @@ Source0:        http://downloads.sourceforge.net/backport-jsr166/%{name}-%{versi
 Source1:	http://repo1.maven.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
 
 BuildRequires:	jpackage-utils >= 0:1.7.2
-BuildRequires:	java-devel = 0:1.5.0
+BuildRequires:	javapackages-tools >= 0.7.0
+BuildRequires:	java-devel
 BuildRequires:	ant >= 0:1.6.5
 BuildRequires:	junit
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:	noarch
-Requires:	java >= 0:1.5.0
+Requires:	java
 Requires:	jpackage-utils
-Requires(post):		jpackage-utils >= 0:1.7.2
-Requires(postun):	jpackage-utils >= 0:1.7.2
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 This package is the backport of java.util.concurrent API, introduced in
@@ -76,21 +72,16 @@ unset CLASSPATH
 ant dist test
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 backport-util-concurrent-dist/%{name}.jar \
-		$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar \
 		$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%add_maven_depmap
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -98,30 +89,20 @@ cp -pr backport-util-concurrent-dist/doc/api/* \
 		$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%files
-%defattr(-,root,root,-)
+%files -f .mfiles
 %doc license.html
 %doc README.html
-%{_javadir}/*.jar
-%{_datadir}/maven2
-%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc license.html
 %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Nov  9 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.1-11
+- Fix up packaging properly
+- Use new macros
+
 * Fri Nov  9 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1-10
 - Add missing dist tag