rpms/javasqlite/F-9 .cvsignore, 1.2, 1.3 javasqlite.spec, 1.2, 1.3 sources, 1.2, 1.3 javasqlite-20070914-javadoc.patch, 1.1, NONE javasqlite-20080315-cflags.patch, 1.1, NONE javasqlite-20080315-libtool.patch, 1.1, NONE javasqlite-20080401-module.patch, 1.1, NONE javasqlite-20080401-parallelmake.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed May 14 15:41:20 UTC 2008
- Previous message: rpms/javasqlite/F-8 .cvsignore, 1.2, 1.3 javasqlite.spec, 1.1, 1.2 sources, 1.2, 1.3 javasqlite-20070914-javadoc.patch, 1.1, NONE javasqlite-20080315-cflags.patch, 1.1, NONE javasqlite-20080315-libtool.patch, 1.1, NONE javasqlite-20080401-module.patch, 1.1, NONE javasqlite-20080401-parallelmake.patch, 1.1, NONE
- Next message: rpms/ocaml-pa-monad - New directory
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/javasqlite/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22613/F-9
Modified Files:
.cvsignore javasqlite.spec sources
Removed Files:
javasqlite-20070914-javadoc.patch
javasqlite-20080315-cflags.patch
javasqlite-20080315-libtool.patch
javasqlite-20080401-module.patch
javasqlite-20080401-parallelmake.patch
Log Message:
* Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080420-1
- 20080420; all upstreamable patches applied upstream.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Apr 2008 20:41:17 -0000 1.2
+++ .cvsignore 14 May 2008 15:40:42 -0000 1.3
@@ -1 +1 @@
-javasqlite-20080401.tar.gz
+javasqlite-20080420.tar.gz
Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-9/javasqlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- javasqlite.spec 3 Apr 2008 20:51:24 -0000 1.2
+++ javasqlite.spec 14 May 2008 15:40:42 -0000 1.3
@@ -1,6 +1,10 @@
+# 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: 20080401
-Release: 2%{?dist}
+Version: 20080420
+Release: 1%{?dist}
Summary: SQLite Java Wrapper/JDBC Driver
Group: Development/Libraries
@@ -9,19 +13,11 @@
Source0: http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
# jnipath: Fedora specific, no need to send upstream
Patch0: %{name}-20080315-jnipath.patch
-# javadoc, cflags, libtool patches sent upstream 20080401
-Patch1: %{name}-20070914-javadoc.patch
-Patch2: %{name}-20080315-cflags.patch
-Patch3: %{name}-20080315-libtool.patch
-# module, parallelmake patches sent upstream 20080403
-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
@@ -41,12 +37,8 @@
%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
+f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
%build
@@ -54,14 +46,14 @@
--with-jdk=%{_jvmdir}/java \
--with-jardir=%{_libdir}/%{name} \
--libdir=%{_libdir}/%{name}
-make %{?_smp_mflags} JAVAC_FLAGS="-source 5" LIBTOOL=/usr/bin/libtool
+make %{?_smp_mflags} JAVAC_FLAGS="-source 5"
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
+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}
@@ -86,6 +78,9 @@
%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.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Apr 2008 20:41:17 -0000 1.2
+++ sources 14 May 2008 15:40:42 -0000 1.3
@@ -1 +1 @@
-0ba49d2a4fa8d2790f71c2568f2846a8 javasqlite-20080401.tar.gz
+1ca6eca130049d888a3f8783261bcdf8 javasqlite-20080420.tar.gz
--- javasqlite-20070914-javadoc.patch DELETED ---
--- javasqlite-20080315-cflags.patch DELETED ---
--- javasqlite-20080315-libtool.patch DELETED ---
--- javasqlite-20080401-module.patch DELETED ---
--- javasqlite-20080401-parallelmake.patch DELETED ---
- Previous message: rpms/javasqlite/F-8 .cvsignore, 1.2, 1.3 javasqlite.spec, 1.1, 1.2 sources, 1.2, 1.3 javasqlite-20070914-javadoc.patch, 1.1, NONE javasqlite-20080315-cflags.patch, 1.1, NONE javasqlite-20080315-libtool.patch, 1.1, NONE javasqlite-20080401-module.patch, 1.1, NONE javasqlite-20080401-parallelmake.patch, 1.1, NONE
- Next message: rpms/ocaml-pa-monad - New directory
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list