rpms/jakarta-commons-discovery/devel jakarta-commons-discovery-addosgimanifest.patch, NONE, 1.1 jakarta-commons-discovery.spec, 1.15, 1.16

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-discovery/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6839/devel

Modified Files:
	jakarta-commons-discovery.spec 
Added Files:
	jakarta-commons-discovery-addosgimanifest.patch 
Log Message:
- Add OSGi manifest.
- Drop gcj support.

jakarta-commons-discovery-addosgimanifest.patch:

--- NEW FILE jakarta-commons-discovery-addosgimanifest.patch ---
--- src/conf/MANIFEST.MF.orig	2006-11-30 00:15:55.000000000 +0100
+++ src/conf/MANIFEST.MF	2009-05-27 23:35:42.000000000 +0200
@@ -6,4 +6,22 @@ Specification-Vendor: The Apache Softwar
 Implementation-Title: @package@
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Version: @version@
+Bundle-ManifestVersion: 2
+Bundle-Name: Jakarta-Commons Discovery
+Specification-Version: 1.0
+Bundle-SymbolicName: org.apache.commons.discovery
+Bundle-Version: 0.2.0.qualifier
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Export-Package: org.apache.commons.discovery,
+ org.apache.commons.discovery.ant,
+ org.apache.commons.discovery.jdk,
+ org.apache.commons.discovery.log,
+ org.apache.commons.discovery.resource,
+ org.apache.commons.discovery.resource.classes,
+ org.apache.commons.discovery.resource.names,
+ org.apache.commons.discovery.tools
+Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)";resolution:=optional
+Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)"
 


Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- jakarta-commons-discovery.spec	25 Feb 2009 08:43:12 -0000	1.15
+++ jakarta-commons-discovery.spec	28 May 2009 11:16:50 -0000	1.16
@@ -28,25 +28,20 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 %define short_name commons-discovery
 %define section    free
 
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
 Version:        0.4
-Release:        4.2%{?dist}
+Release:        4.3%{?dist}
 Epoch:          1
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://jakarta.apache.org/commons/discovery/
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 Source0:        http://www.apache.org/dist/jakarta/commons/discovery/source/commons-discovery-0.4-src.tar.gz
+Patch0:         %{name}-addosgimanifest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant
@@ -55,12 +50,6 @@ BuildRequires:  junit >= 0:3.7
 BuildRequires:  jakarta-commons-logging >= 0:1.0.4
 Requires:       jakarta-commons-logging >= 0:1.0.4
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 The Discovery component is about discovering, or finding, implementations for
 pluggable interfaces.  Pluggable interfaces are specified with the intent that
@@ -69,10 +58,8 @@ described by the interface.  Discovery p
 instantiating classes, and for lifecycle management of singleton (factory)
 classes. 
 
-# -----------------------------------------------------------------------------
-
 %package javadoc
-Group:          Development/Documentation
+Group:          Documentation
 Summary:        Javadoc for %{name}
 # for /bin/rm and /bin/ln
 Requires(post): coreutils
@@ -81,22 +68,17 @@ Requires(postun): coreutils
 %description javadoc
 Javadoc for %{name}.
 
-# -----------------------------------------------------------------------------
-
 %prep
 %setup -q -n commons-discovery-%{version}-src
+%patch0
 chmod u+w .
 
-# -----------------------------------------------------------------------------
-
 %build
 ant \
   -Djunit.jar=%(find-jar junit) \
   -Dlogger.jar=%(find-jar jakarta-commons-logging) \
   test.discovery dist
 
-# -----------------------------------------------------------------------------
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -110,33 +92,9 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
-# -----------------------------------------------------------------------------
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
@@ -144,18 +102,16 @@ fi
 %doc RELEASE-NOTES.txt
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-discovery-0.4.jar.*
-%endif
-
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
-# -----------------------------------------------------------------------------
-
 %changelog
+* Thu May 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:0.4-4.3
+- Add OSGi manifest.
+- Drop gcj support.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.4-4.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -212,4 +168,3 @@ fi
 
 * Sat Sep  7 2002 Ville Skyttä <ville.skytta at iki.fi> 1.0-0.rc1.1jpp
 - First JPackage release.
-