[jarjar/f18] Install COPYING file with javadoc package

[Mikolaj Izdebski]

commit 61e50b19829f3c124cd23a0f2f603f031dc1334f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Sep 20 12:41:13 2012 +0200

    Install COPYING file with javadoc package
    
    - Update to current packaging guidelines
    - Remove rpm bug workaround

 jarjar.spec |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/jarjar.spec b/jarjar.spec
index 6edade7..c9d84e3 100644
--- a/jarjar.spec
+++ b/jarjar.spec
@@ -30,7 +30,7 @@
 
 Name:           jarjar
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Jar Jar Links
 License:        ASL 2.0
 URL:            http://code.google.com/p/jarjar/
@@ -53,8 +53,6 @@ BuildRequires:  maven
 Requires:       objectweb-asm
 Requires:       gnu-regexp
 Requires:       jpackage-utils >= 0:1.7.2
-Requires(post):    jpackage-utils >= 0:1.7.2
-Requires(postun):  jpackage-utils >= 0:1.7.2
 
 BuildArch:      noarch
 
@@ -142,16 +140,6 @@ install -pD -T -m 644 maven/pom.xml \
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
 %doc COPYING
@@ -166,9 +154,15 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadir}/%{name}-maven-plugin.jar
 
 %files javadoc
+%doc COPYING
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 20 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0-7
+- Install COPYING file with javadoc package
+- Update to current packaging guidelines
+- Remove rpm bug workaround
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild