rpms/bsh/devel bsh.spec,1.21,1.22

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	bsh.spec 
Log Message:
Drop gcj support.
Fix rpmlint warnings.


Index: bsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- bsh.spec	21 Sep 2009 18:03:46 -0000	1.21
+++ bsh.spec	9 Jan 2010 13:50:46 -0000	1.22
@@ -28,11 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support 1
-
 Name:           bsh
 Version:        1.3.0
-Release:        15.1%{?dist}
+Release:        15.2%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 License:        SPL or LGPLv2+
@@ -51,19 +49,11 @@ BuildRequires:  servlet
 Requires:       bsf
 Requires:       jpackage-utils >= 0:1.7.2
 #BuildRequires:  libreadline-java
-Url:            http://www.beanshell.org/
-Group:          Development/Java
-%if ! %{gcj_support}
-Buildarch:      noarch
-%endif
+URL:            http://www.beanshell.org/
+Group:          Development/Libraries
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 BeanShell is a small, free, embeddable, Java source interpreter with
 object scripting language features, written in Java. BeanShell executes
@@ -85,21 +75,21 @@ scripts and return them as results.
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Development/Java
+Group:          Documentation
 
 %description manual
 Documentation for %{name}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Java
+Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
 
 %package demo
 Summary:        Demo for %{name}
-Group:          Development/Java
+Group:          Development/Libraries
 AutoReqProv:    no
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       /usr/bin/env
@@ -108,8 +98,8 @@ Requires:       /usr/bin/env
 Demonstrations and samples for %{name}.
 
 %package desktop
-Summary:        %{name} integration for the desktop
-Group:          Development/Java
+Summary:        Desktop integraton for %{name} 
+Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description desktop
@@ -277,12 +267,6 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%{name}d
 EOF
 cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm \
-   --exclude %{_datadir}/%{name}/webapps/bshservlet.war \
-   --exclude %{_datadir}/%{name}/webapps/bshservlet-wbsh.war
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -294,13 +278,6 @@ fi
 
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-exit 0
 
 %postun desktop
 touch --no-create %{_datadir}/icons/hicolor
@@ -310,13 +287,6 @@ fi
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-exit 0
 
 %files
 %defattr(-,root,root)
@@ -329,10 +299,6 @@ exit 0
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %ifnarch ppc64 s390x
 %files manual
 %defattr(-,root,root)
@@ -355,6 +321,10 @@ exit 0
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 %changelog
+* Sat Jan 9 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.0-15.2
+- Drop gcj_support.
+- Fix rpmlint warnings.
+
 * Mon Sep 21 2009 Permaine Cheung <pcheung at redhat.com> 0:1.3.0-15.1
 - Do not build manual and faq for ppc64 or s390x as the style task is disabled