[java-1.5.0-gcj] - Removed triggerin requirements - Compensated for triggerin reqs by adjusting Requires/Requires(pos

[Deepak Bhole]

commit 2b5d8a99a3bd67ad799de05a75434fba3365c815
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Thu Jun 23 16:02:34 2011 -0400

    - Removed triggerin requirements
    - Compensated for triggerin reqs by adjusting Requires/Requires(postun)

 java-1.5.0-gcj.spec |   36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/java-1.5.0-gcj.spec b/java-1.5.0-gcj.spec
index 3492385..c2fc6de 100644
--- a/java-1.5.0-gcj.spec
+++ b/java-1.5.0-gcj.spec
@@ -55,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 36%{?dist}
+Release: 37%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 # The LICENSE file has the classpath exception, but nothing in this package
@@ -118,12 +118,8 @@ Requires(postun): %{_bindir}/rebuild-gcj-db
 Requires(postun): %{_bindir}/gcj-dbtool%{gccsuffix}
 # rebuild-gcj-db requires findutils
 Requires(postun): findutils
-# triggerin requires alternatives to install tool alternatives
-Requires(triggerin): %{_sbindir}/alternatives
-# triggerin requires gij to retrieve gcc version
-Requires(triggerin): %{_bindir}/gij%{gccsuffix}
-# triggerin requires jpackage-utils for abs2rel
-Requires(triggerin): jpackage-utils >= 1.7.5-3.10
+# jpackage-utils for abs2rel
+Requires: jpackage-utils >= 1.7.5-3.10
 
 # standard JPackage base provides
 Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
@@ -177,15 +173,13 @@ Requires:         gcc%{gccsuffix}-java >= %{gccver}
 # post requires alternatives to install tool alternatives
 Requires(post):   %{_sbindir}/alternatives
 # post requires gcj to retrieve gcj header file locations
-Requires(post):   %{_bindir}/gcj%{gccsuffix}
+Requires(postun):   %{_bindir}/gcj%{gccsuffix}
 # postun requires alternatives to uninstall tool alternatives
 Requires(postun): %{_sbindir}/alternatives
 # triggerin requires gij to retrieve gcc version
-Requires(triggerin): %{_bindir}/gij%{gccsuffix}
-# triggerin requires gcj to retrieve gcj header file locations
-Requires(triggerin): %{_bindir}/gcj%{gccsuffix}
-# triggerin requires jpackage-utils for abs2rel
-Requires(triggerin): jpackage-utils >= 1.7.5-3.10
+Requires: %{_bindir}/gij%{gccsuffix}
+# jpackage-utils for abs2rel
+Requires: jpackage-utils >= 1.7.5-3.10
 
 # standard JPackage devel provides
 Provides: java-sdk-%{javaver}-%{origin} = %{version}
@@ -213,11 +207,9 @@ Group:   Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libgcj%{gccsuffix}-src >= %{gccver}
 # post requires gij to retrieve gcc version
-Requires(post): %{_bindir}/gij%{gccsuffix}
-# triggerin requires gij to retrieve gcc version
-Requires(triggerin): %{_bindir}/gij%{gccsuffix}
-# triggerin requires jpackage-utils for abs2rel
-Requires(triggerin): jpackage-utils >= 1.7.5-3.10
+Requires(postun): %{_bindir}/gij%{gccsuffix}
+# jpackage-utils for abs2rel
+Requires: jpackage-utils >= 1.7.5-3.10
 
 # java-gcj-compat src provides
 Provides: java-1.4.2-gcj-compat-src > 1.4.2.0-40jpp.111
@@ -271,10 +263,6 @@ Requires(post):   %{plugindir}
 Requires(postun): %{_bindir}/gij%{gccsuffix}
 # postun requires alternatives to uninstall plugin alternative
 Requires(postun): %{_sbindir}/alternatives
-# triggerin requires gij to retrieve gcc version
-Requires(triggerin): %{_bindir}/gij%{gccsuffix}
-# triggerin requires alternatives to install plugin alternative
-Requires(triggerin): %{_sbindir}/alternatives
 
 # standard JPackage plugin provides
 Provides: java-plugin = %{javaver}
@@ -798,6 +786,10 @@ fi
 %endif
 
 %changelog
+* Thu Jun 23 2011 Deepak Bhole <dbhole at redhat.com> 1.5.0.0-37
+- Removed triggerin requirements 
+- Compensated for triggerin reqs by adjusting Requires/Requires(postun)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild