rpms/jsch/devel .cvsignore, 1.2, 1.3 jsch.spec, 1.4, 1.5 sources, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 22 18:35:56 UTC 2005
Update of /cvs/dist/rpms/jsch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv387
Modified Files:
.cvsignore jsch.spec sources
Log Message:
* Fri Apr 22 2005 Andrew Overholt <overholt at redhat.com> 0.1.18-1jpp_1fc
- Build into Fedora.
- Natively-compile.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Mar 2005 14:49:52 -0000 1.2
+++ .cvsignore 22 Apr 2005 18:35:54 -0000 1.3
@@ -1 +1 @@
-jsch-0.1.17.zip
+jsch-0.1.18.zip
Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jsch.spec 18 Mar 2005 16:22:23 -0000 1.4
+++ jsch.spec 22 Apr 2005 18:35:54 -0000 1.5
@@ -1,20 +1,25 @@
%define section free
+%define gcj_support 1
+ExclusiveArch: i386 x86_64 ppc
Name: jsch
-Version: 0.1.17
-Release: 2jpp_1fc
+Version: 0.1.18
+Release: 1jpp_1fc
Epoch: 0
Summary: Pure Java implementation of SSH2
Group: Development/Libraries/Java
License: BSD-style
URL: http://www.jcraft.com/jsch/
-Source0: http://download.sourceforge.net/sourceforge/jsch/jsch-0.1.17.zip
+Source0: http://download.sourceforge.net/sourceforge/jsch/jsch-%{version}.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: java-devel >= 1.4.2
BuildRequires: jzlib >= 0:1.0.5
+%if %{gcj_support}
+BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_14rh
+Requires(post,postun): java-1.4.2-gcj-compat
+%endif
Requires: jzlib >= 0:1.0.5
%description
@@ -44,6 +49,10 @@
export CLASSPATH=$(build-classpath jzlib)
ant dist javadoc
+%if %{gcj_support}
+ find-and-aot-compile . "-fPIC"
+%endif
+
%install
# jars
rm -rf $RPM_BUILD_ROOT
@@ -51,6 +60,19 @@
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%if %{gcj_support}
+ install -dm 755 $RPM_BUILD_ROOT%{_libdir}
+ install -pm 755 dist/lib/lib%{name}-*.jar.so \
+ $RPM_BUILD_ROOT%{_libdir}/lib%{name}-%{version}.jar.so
+ ln -s lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
+
+ gcjdbdir=$RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
+ mkdir -p $gcjdbdir
+ gcj-dbtool -n $gcjdbdir/%{name}.db 100
+ gcj-dbtool -f $gcjdbdir/%{name}.db $RPM_BUILD_ROOT%{_javadir}/%{name}.jar \
+ %{_libdir}/lib%{name}.jar.so
+%endif
+
# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -65,6 +87,13 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%if %{gcj_support}
+%post
+/usr/bin/rebuild-gcj-db %{_libdir}
+
+%postun
+/usr/bin/rebuild-gcj-db %{_libdir}
+%endif
%post javadoc
rm -f %{_javadocdir}/%{name}
@@ -79,6 +108,11 @@
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc LICENSE.txt
+%if %{gcj_support}
+%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}.db
+%{_libdir}/lib%{name}-%{version}.jar.so
+%{_libdir}/lib%{name}.jar.so
+%endif
%files javadoc
%defattr(-,root,root,-)
@@ -92,6 +126,16 @@
%changelog
+* Fri Apr 22 2005 Andrew Overholt <overholt at redhat.com> 0.1.18-1jpp_1fc
+- Build into Fedora.
+- Natively-compile.
+
+* Fri Apr 22 2005 Fernando Nasser <fnasser at redhat.com> 0:0.1.18-1jpp_1rh
+- Merge with upstream for 0.1.18 upgrade
+
+* Fri Apr 22 2005 Fernando Nasser <fnasser at redhat.com> 0:0.1.18-1jpp
+- 0.1.18
+
* Fri Mar 18 2005 Andrew Overholt <overholt at redhat.com> 0.1.17-2jpp_1fc
- Build into Fedora.
- Remove Distribution and Vendor tags.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Mar 2005 14:49:52 -0000 1.2
+++ sources 22 Apr 2005 18:35:54 -0000 1.3
@@ -1 +1 @@
-c1afcf8716f7fe9c8cf96c91325c87e8 jsch-0.1.17.zip
+12ea010f539aee2347b43ad378f6c8df jsch-0.1.18.zip
More information about the fedora-cvs-commits
mailing list