[ganymed-ssh2] Drop gcj.

[Alexander Kurtakov]

commit dc542c98e7708b944277a702bbcca4cb4c279edf
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Dec 30 12:47:22 2010 +0200

    Drop gcj.
    
    Adapt to current guidelines.

 build.xml         |   17 ++++++++++++
 ganymed-ssh2.spec |   72 ++++++++++++++---------------------------------------
 2 files changed, 36 insertions(+), 53 deletions(-)
---
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..7fb20b2
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,17 @@
+<project basedir="." default="dist" name="ganymed-ssh2">
+	<target name="init">
+		<property name="build.dir" value="build" />
+		<property name="src.dir" value="src" />
+	</target>
+	<target name="compile" depends="init">
+		<mkdir dir="${build.dir}" />
+		<javac debug="false" deprecation="true" destdir="${build.dir}" srcdir="${src.dir}" target="1.4" source="1.4">
+		</javac>
+	</target>
+	<target name="clean" depends="init">
+		<delete includeEmptyDirs="true" dir="${build.dir}" />
+	</target>
+	<target name="dist" depends="compile">
+		<jar jarFile="ganymed-ssh2.jar" baseDir="${build.dir}" index="true" />
+	</target>
+</project>
\ No newline at end of file
diff --git a/ganymed-ssh2.spec b/ganymed-ssh2.spec
index d98f852..aa98566 100644
--- a/ganymed-ssh2.spec
+++ b/ganymed-ssh2.spec
@@ -1,34 +1,20 @@
-%define gcj_support     1
-
-
 Name:           ganymed-ssh2
 Version:        210
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.ganymed.ethz.ch/ssh2/
 Source0:        http://www.ganymed.ethz.ch/ssh2/ganymed-ssh2-build%{version}.zip
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1:        build.xml
 
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	coreutils
-%if %{gcj_support}
-BuildRequires:		gcc-java >= 4.0.2
-BuildRequires:		java-gcj-compat-devel >= 1.0.33
-Requires(post):		java-gcj-compat >= 1.0.33
-Requires(postun):	java-gcj-compat >= 1.0.33
-%else
-BuildRequires:		java-devel >= 1.4.2
-%endif
-
-%if %{gcj_support}
-#ExclusiveArch:		%{ix86} x86_64 ppc ia64
-%else
-BuildArch:		noarch
-%endif
+BuildRequires:  java-devel >= 1.4.2
+BuildRequires:  ant
 
+BuildArch:		noarch
 
 %description
 Ganymed SSH-2 for Java is a library which implements the SSH-2 protocol in pure
@@ -41,6 +27,7 @@ crypto functionality is included.
 %package javadoc
 Summary:        Javadoc for ganymed-ssh2
 Group:          Development/Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for ganymed-ssh2.
@@ -51,63 +38,42 @@ Javadoc for ganymed-ssh2.
 # delete the jars that are in the archive
 rm %{name}-build%{version}.jar
 
+cp %{SOURCE1} .
+
 # fixing wrong-file-end-of-line-encoding warnings
 sed -i 's/\r//' LICENSE.txt README.txt HISTORY.txt faq/FAQ.html
 find examples -name \*.java -exec sed -i 's/\r//' {} \;
 
 %build
-javac -d build src/
-jar -cf %{name}.jar -C build ch
-
-# Link source files to fix -debuginfo generation.
-rm -f ch
-ln -s src/ch
-
+ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr javadoc/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-# gcj support
-%if %{gcj_support}
-  aot-compile-rpm
-%endif
-
-pushd $RPM_BUILD_ROOT%{_javadir}/
-ln -s %{name}-%{version}.jar %{name}.jar
-popd
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_javadir}/*
 %doc LICENSE.txt HISTORY.txt README.txt faq examples
 
-%if %{gcj_support}
-%{_libdir}/gcj/%{name} 
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Dec 30 2010 Alexander Kurtakov <akurtako at redhat.com> 210-9
+- Drop gcj.
+- Adapt to current guidelines.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 210-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild