rpms/plexus-bsh-factory/devel plexus-bsh-factory.spec,1.13,1.14

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/plexus-bsh-factory/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6465/devel

Modified Files:
	plexus-bsh-factory.spec 
Log Message:
- Drop gcj_support.
- Build with ant. Fixes rhbz#539101.


Index: plexus-bsh-factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-bsh-factory/devel/plexus-bsh-factory.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- plexus-bsh-factory.spec	26 Jul 2009 18:54:17 -0000	1.13
+++ plexus-bsh-factory.spec	12 Feb 2010 08:16:17 -0000	1.14
@@ -28,18 +28,15 @@
 # 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 with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+%define with_maven 0
+%define without_maven 1
 
 %define parent plexus
 %define subname bsh-factory
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.4.a7s.1.10%{?dist}
+Release:        0.4.a7s.1.11%{?dist}
 Epoch:          0
 Summary:        Plexus Bsh component factory
 License:        MIT
@@ -56,9 +53,7 @@ Patch1:         %{name}-encodingfix.patc
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 
 BuildRequires:     jpackage-utils >= 0:1.7.2
 %if %{with_maven}
@@ -67,7 +62,6 @@ BuildRequires:     maven2-plugin-compile
 BuildRequires:     maven2-plugin-install
 BuildRequires:     maven2-plugin-jar
 BuildRequires:     maven2-plugin-javadoc
-BuildRequires:     maven2-plugin-release
 BuildRequires:     maven2-plugin-resources
 BuildRequires:     maven2-plugin-surefire
 BuildRequires:     maven2-common-poms >= 1.0-2
@@ -87,12 +81,6 @@ Requires:          plexus-utils
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
 
-%if %{gcj_support}
-BuildRequires:     java-gcj-compat-devel
-Requires(post):    java-gcj-compat
-Requires(postun):  java-gcj-compat
-%endif
-
 %description
 Bsh component class creator for Plexus.
 
@@ -166,29 +154,13 @@ install -pm 644 \
                 $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 %update_maven_depmap
 
 %files
@@ -199,11 +171,6 @@ fi
 %{_datadir}/maven2
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/bsh-factory-1.0.jar.*
-%endif
-
 %if %{with_maven}
 %files javadoc
 %defattr(-,root,root,-)
@@ -211,6 +178,10 @@ fi
 %endif
 
 %changelog
+* Fri Feb 12 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a7s.1.11
+- Drop gcj_support.
+- Build with ant. Fixes rhbz#539101.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a7s.1.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild