rpms/javasqlite/EL-5 javasqlite-20080315-jnipath.patch, NONE, 1.1 javasqlite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Ville Skytta (scop) fedora-extras-commits at redhat.com
Sat May 17 13:17:07 UTC 2008


Author: scop

Update of /cvs/pkgs/rpms/javasqlite/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24238

Modified Files:
	.cvsignore sources 
Added Files:
	javasqlite-20080315-jnipath.patch javasqlite.spec 
Log Message:
First EPEL build.

javasqlite-20080315-jnipath.patch:

--- NEW FILE javasqlite-20080315-jnipath.patch ---
diff -up javasqlite-20080315/SQLite/Database.java~ javasqlite-20080315/SQLite/Database.java
--- javasqlite-20080315/SQLite/Database.java~	2008-01-29 10:48:21.000000000 +0200
+++ javasqlite-20080315/SQLite/Database.java	2008-03-20 00:10:30.000000000 +0200
@@ -708,7 +708,7 @@ public class Database {
 	try {
 	    String path = System.getProperty("SQLite.library.path");
 	    if (path == null || path.length() == 0) {
-		System.loadLibrary("sqlite_jni");
+		System.load("@JNIPATH@/" + System.mapLibraryName("sqlite_jni"));
 	    } else {
 		try {
 		    java.lang.reflect.Method mapLibraryName;


--- NEW FILE javasqlite.spec ---
# TODO: build JDBC 3 driver too (not doable with gcj 1.5.0 - it apparently
#       has java 1.6 (JDBC 4) class libs???)


Name:           javasqlite
Version:        20080420
Release:        1%{?dist}
Summary:        SQLite Java Wrapper/JDBC Driver

Group:          Development/Libraries
License:        BSD
URL:            http://www.ch-werner.de/javasqlite/
Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
# jnipath: Fedora specific, no need to send upstream
Patch0:         %{name}-20080315-jnipath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  sqlite-devel
BuildRequires:  java-devel
BuildRequires:  java-javadoc
Requires:       jre

%description
javasqlite is a Java wrapper including a basic JDBC driver for the
SQLite 2/3 database engine. It is designed using JNI to interface to
the SQLite API.

%package        javadoc
Summary:        API documentation for %{name}
Group:          Documentation
Requires:       java-javadoc

%description    javadoc
API documentation for %{name}.


%prep
%setup -q
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
sed -i -e 's/\r//g' doc/ajhowto.txt
f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f


%build
%configure \
    --with-jdk=%{_jvmdir}/java \
    --with-jardir=%{_libdir}/%{name} \
    --libdir=%{_libdir}/%{name}
make %{?_smp_mflags} JAVAC_FLAGS="-source 5"
make javadoc JAVADOCLINK=%{_javadocdir}/java


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite_jni.la
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pR doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}


%clean
rm -rf $RPM_BUILD_ROOT


%check
make test


%files
%defattr(-,root,root,-)
%doc ChangeLog license.terms
%{_libdir}/%{name}/sqlite.jar
%{_libdir}/%{name}/libsqlite_jni.so

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}


%changelog
* Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080420-1
- 20080420; all upstreamable patches applied upstream.

* Thu Apr  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080401-2
- First Fedora build.

* Wed Apr  2 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080401-1
- Update to 20080401.
- Patch to install *.so as an unversioned module.
- Patch to fix parallel make (#439941, Colin Walters).
- Build with "-source 5" instead of "-source 5.0" (#439941, Colin Walters).
- Use %%{_jvmdir} instead of %%{_prefix}/lib/jvm.

* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080315-1
- 20080315; classpath, lib64, and getboolean patches applied upstream.
- Install to %%{_libdir}/%%{name} per current Fedora packaging guidelines.
- Patch to appease recent libtool.
- Patch to honor $RPM_OPT_FLAGS.

* Sat Nov 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 20070915-0.2
- Build with -source 5.0.
- More classpath fixes.

* Tue Sep 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 20070915-0.1
- 20070915.
- Disable parallel build, doesn't work.
- Patch to fix build and test suite classpath.
- Patch to add support for ResultSet.getBoolean().

* Fri Sep 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 20070914-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2008 20:26:15 -0000	1.1
+++ .cvsignore	17 May 2008 13:16:26 -0000	1.2
@@ -0,0 +1 @@
+javasqlite-20080420.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2008 20:26:15 -0000	1.1
+++ sources	17 May 2008 13:16:26 -0000	1.2
@@ -0,0 +1 @@
+1ca6eca130049d888a3f8783261bcdf8  javasqlite-20080420.tar.gz




More information about the scm-commits mailing list