Drop BR on zip, use jar instead

- Add more verbose description
- Update to current packaging guidelines

aopalliance.spec

@@ -1,11 +1,11 @@
 Name:           aopalliance
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Java/J2EE AOP standards
-Group:          Development/Libraries
 License:        Public Domain
 URL:            http://aopalliance.sourceforge.net/
+BuildArch:      noarch
 # cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
 # password empty
 # cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
@@ -13,61 +13,57 @@ Source0:        aopalliance-src.tar.gz
 Source1:        http://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
 Source2:        %{name}-MANIFEST.MF
 
-Requires:       java >= 0:1.5.0
+BuildRequires:  ant
-BuildRequires:  jpackage-utils >= 0:1.7.5
+Requires:       java
-BuildRequires:  java-devel >= 0:1.5.0
-BuildRequires:  ant >= 0:1.6.5
-BuildRequires:  zip
-BuildArch:      noarch
 
 %description
-Java/J2EE AOP standards
+Aspect-Oriented Programming (AOP) offers a better solution to many
+problems than do existing technologies, such as EJB.  AOP Alliance
+intends to facilitate and standardize the use of AOP to enhance
+existing middleware environments (such as J2EE), or development
+environements (e.g. Eclipse).  The AOP Alliance also aims to ensure
+interoperability between Java/J2EE AOP implementations to build a
+larger AOP community.
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary:        API documentation for %{summary}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
-API documentation for %{summary}.
+%{summary}.
 
 %prep
-%setup -q -n aopalliance
+%setup -q -n %{name}
 
 %build
 export CLASSPATH=
 export OPT_JAR_LIST=:
 %{ant} -Dbuild.sysclasspath=only jar javadoc
 
+# Inject OSGi manifest required by Eclipse.
+jar umf %{SOURCE2} build/%{name}.jar
+
 %install
-# inject OSGi manifest
+install -d -m 755 %{buildroot}%{_javadir}
-mkdir -p META-INF
+install -d -m 755 %{buildroot}%{_mavenpomdir}
-cp -p %{SOURCE2} META-INF/MANIFEST.MF
+install -p -m 644 build/%{name}.jar %{buildroot}%{_javadir}/
-touch META-INF/MANIFEST.MF
-zip -u build/%{name}.jar META-INF/MANIFEST.MF
-
-
-install -dm 755 %{buildroot}%{_javadir}
-
-install -pm 644 build/aopalliance.jar \
-  %{buildroot}%{_javadir}/%{name}.jar
-install -dm 755 %{buildroot}%{_mavenpomdir}
 install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap
 
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
-%files
+%files -f .mfiles
-%{_javadir}*/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.0-6
+- Drop BR on zip, use jar instead
+- Add more verbose description
+- Update to current packaging guidelines
+
 * Mon Feb 25 2013 Gerard Ryan <galileo.fedoraproject.org> 0:1.0-5
 - Add OSGI manifest