rpms/javasqlite/devel javasqlite-20070914-javadoc.patch, NONE, 1.1 javasqlite-20080315-cflags.patch, NONE, 1.1 javasqlite-20080315-jnipath.patch, NONE, 1.1 javasqlite-20080315-libtool.patch, NONE, 1.1 javasqlite-20080401-module.patch, NONE, 1.1 javasqlite-20080401-parallelmake.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
Thu Apr 3 20:41:58 UTC 2008
Author: scop
Update of /cvs/pkgs/rpms/javasqlite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23440/devel
Modified Files:
.cvsignore sources
Added Files:
javasqlite-20070914-javadoc.patch
javasqlite-20080315-cflags.patch
javasqlite-20080315-jnipath.patch
javasqlite-20080315-libtool.patch
javasqlite-20080401-module.patch
javasqlite-20080401-parallelmake.patch javasqlite.spec
Log Message:
Initial import (#439941).
javasqlite-20070914-javadoc.patch:
--- NEW FILE javasqlite-20070914-javadoc.patch ---
--- Makefile.in~ 2007-09-11 10:14:45.000000000 +0300
+++ Makefile.in 2007-09-14 22:55:43.000000000 +0300
@@ -154,7 +154,8 @@
$(RM) config.status config.log config.cache Makefile
javadoc:
- $(JAVADOC) -private -nodeprecated -nodeprecatedlist \
+ $(JAVADOC) -nodeprecated -nodeprecatedlist \
+ -link $(JAVADOCLINK) \
-noindex -nohelp -overview doc/overview.html \
-windowtitle "SQLite Java Wrapper" \
-doctitle "`cat doc/title.html`" \
javasqlite-20080315-cflags.patch:
--- NEW FILE javasqlite-20080315-cflags.patch ---
diff -up javasqlite-20080315/Makefile.in~ javasqlite-20080315/Makefile.in
--- javasqlite-20080315/Makefile.in~ 2008-01-07 20:14:29.000000000 +0200
+++ javasqlite-20080315/Makefile.in 2008-03-20 23:51:40.000000000 +0200
@@ -39,7 +39,7 @@ CFLAGS= -Wall -O -fPIC $(JNIINCLUDE) $(S
-DHAVE_SQLITE3_RESULT_ZEROBLOB=@HAVE_SQLITE3_RESULT_ZEROBLOB@ \
-DHAVE_SQLITE3_INCRBLOBIO=@HAVE_SQLITE3_INCRBLOBIO@ \
-DHAVE_SQLITE3_KEY=@HAVE_SQLITE3_KEY@ \
- @VALIST_FLAGS@
+ @VALIST_FLAGS@ @CFLAGS@
LIBS= @SQLITE_LIB@ @SQLITE3_LIB@
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;
javasqlite-20080315-libtool.patch:
--- NEW FILE javasqlite-20080315-libtool.patch ---
diff -up javasqlite-20080315/Makefile.in~ javasqlite-20080315/Makefile.in
--- javasqlite-20080315/Makefile.in~ 2008-01-07 20:14:29.000000000 +0200
+++ javasqlite-20080315/Makefile.in 2008-03-21 00:18:50.000000000 +0200
@@ -119,14 +119,14 @@ native/sqlite_jni.h: SQLite/Database.cla
SQLite.FunctionContext SQLite.Stmt SQLite.Blob
sqlite_jni.lo: native/sqlite_jni.h native/sqlite_jni.c
- $(LIBTOOL) $(CC) -c $(CFLAGS) native/sqlite_jni.c
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) native/sqlite_jni.c
libsqlite_jni.la: sqlite_jni.lo
- $(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \
- -rpath $(NATIVE_LIB_DIR) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) -o libsqlite_jni.la sqlite_jni.lo \
+ -rpath $(NATIVE_LIB_DIR) $(LIBS)
native/mkconst: native/mkconst.c
- $(LIBTOOL) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \
+ $(LIBTOOL) --mode=link $(CC) $(SQLITE_INC) $(SQLITE3_INC) \
-DHAVE_SQLITE2=@HAVE_SQLITE2@ -DHAVE_SQLITE3=@HAVE_SQLITE3@ \
-o native/mkconst native/mkconst.c $(LIBS)
@@ -173,4 +173,5 @@ install:
$(INSTALL) -d -m 755 $(DESTDIR)$(JAR_DIR)
$(INSTALL) -m 644 sqlite.jar $(DESTDIR)$(JAR_DIR)
$(INSTALL) -d -m 755 $(DESTDIR)$(NATIVE_LIB_DIR)
- $(LIBTOOL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR)
+ $(LIBTOOL) --mode=install \
+ $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR)
javasqlite-20080401-module.patch:
--- NEW FILE javasqlite-20080401-module.patch ---
diff -up javasqlite-20080401/Makefile.in~ javasqlite-20080401/Makefile.in
--- javasqlite-20080401/Makefile.in~ 2008-04-02 18:35:51.000000000 +0300
+++ javasqlite-20080401/Makefile.in 2008-04-02 18:37:16.000000000 +0300
@@ -123,7 +123,7 @@ sqlite_jni.lo: native/sqlite_jni.h nativ
libsqlite_jni.la: sqlite_jni.lo
$(LIBTOOL) --mode=link $(CC) -o libsqlite_jni.la sqlite_jni.lo \
- -rpath $(NATIVE_LIB_DIR) $(LIBS)
+ -rpath $(NATIVE_LIB_DIR) -module -avoid-version $(LIBS)
native/mkconst: native/mkconst.c
$(LIBTOOL) --mode=link $(CC) $(SQLITE_INC) $(SQLITE3_INC) \
javasqlite-20080401-parallelmake.patch:
--- NEW FILE javasqlite-20080401-parallelmake.patch ---
--- Makefile.in.orig 2008-04-01 18:18:27.000000000 -0400
+++ Makefile.in 2008-04-01 18:19:06.000000000 -0400
@@ -107,7 +107,7 @@
SQLite/Constants.java: native/mkconst VERSION
native/mkconst > SQLite/Constants.java
-$(CLASSES): SQLite/Constants.java
+$(CLASSES) $(PRIVATE_CLASSES): SQLite/Constants.java
sqlite.jar: $(CLASSES) $(PRIVATE_CLASSES)
$(JAR) cmf manifest sqlite.jar $(CLASSES) $(PRIVATE_CLASSES)
--- NEW FILE javasqlite.spec ---
Name: javasqlite
Version: 20080401
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
Patch0: %{name}-20080315-jnipath.patch
Patch1: %{name}-20070914-javadoc.patch
Patch2: %{name}-20080315-cflags.patch
Patch3: %{name}-20080315-libtool.patch
Patch4: %{name}-20080401-module.patch
Patch5: %{name}-20080401-parallelmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sqlite-devel
BuildRequires: java-devel
BuildRequires: java-javadoc
BuildRequires: libtool
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
%patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p0
sed -i -e 's/\r//g' doc/ajhowto.txt
%build
%configure \
--with-jdk=%{_jvmdir}/java \
--with-jardir=%{_libdir}/%{name} \
--libdir=%{_libdir}/%{name}
make %{?_smp_mflags} JAVAC_FLAGS="-source 5" LIBTOOL=/usr/bin/libtool
make javadoc JAVADOCLINK=%{_javadocdir}/java
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite_jni.*a
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
* 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/devel/.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 3 Apr 2008 20:41:17 -0000 1.2
@@ -0,0 +1 @@
+javasqlite-20080401.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/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 3 Apr 2008 20:41:17 -0000 1.2
@@ -0,0 +1 @@
+0ba49d2a4fa8d2790f71c2568f2846a8 javasqlite-20080401.tar.gz
More information about the fedora-extras-commits
mailing list