commit bf3cc1815e3c34562a88fd450a2e68178009b356
Merge: 34c1428 36971a5
Author: Andy Grimm <agrimm at gmail.com>
Date: Mon Feb 25 11:23:36 2013 -0500
Merge patch for RHBZ#602530
aopalliance.spec | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --cc aopalliance.spec
index e5d756e,51ee7cf..2f43cae
--- a/aopalliance.spec
+++ b/aopalliance.spec
@@@ -1,17 -1,16 +1,18 @@@
Name: aopalliance
Version: 1.0
- Release: 3%{?dist}
-Release: 4%{?dist}
++Release: 5%{?dist}
Epoch: 0
Summary: Java/J2EE AOP standards
Group: Development/Libraries
License: Public Domain
URL: http://aopalliance.sourceforge.net/
- # cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/aopalliance login
- # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
+ # cvs -d:pserver:anonymous at aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
+ # password empty
+ # cvs -z3 -d:pserver:anonymous at aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r HEAD aopalliance
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: jpackage-utils >= 0:1.7.5
BuildRequires: java-devel >= 0:1.5.0
@@@ -67,9 -58,12 +68,15 @@@ cp -pr build/javadoc/* %{buildroot}%{_j
%{_javadocdir}/%{name}
%changelog
- * Mon Aug 6 2012 Gerard Ryan <galileo.fedoraproject.org> 0:1.0-3
++* Mon Feb 25 2013 Gerard Ryan <galileo.fedoraproject.org> 0:1.0-5
+- Add OSGI manifest
+
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+ * Tue Nov 20 2012 Tomas Radej <tradej at redhat.com> - 0:1.0-3
+ - Fixed tarball generation guide
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild