The package rpms/sqlite-jdbc.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/sqlite-jdbc.git/commit/?id=0cd70e....
Change:
-%ifarch %{arm}
Thanks.
Full change:
============
commit 0cd70ee0e7fb3c918ae6b8299c28588db72658d2
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Sep 11 12:46:13 2019 +0200
Orphaned for 6+ weeks
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 65659df..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/sqlite-jdbc-b643d0cb28a3dc6618b77827e734f500b3ef1562.tar.gz
-/sqlite-jdbc-d271bbfbbd7f8c0f05df796bb6930bf324166d3b.tar.gz
-/sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.tar.gz
-/sqlite-jdbc-0ff4aaf6839786817143a4794dbe3211fc3eda15.tar.gz
-/sqlite-jdbc-3bd593eecdd223f0118a45182ba39fbbb067ca37.tar.gz
-/sqlite-jdbc-70a84beb468ba47060935f17877ae22228db3741.tar.gz
-/sqlite-jdbc-b6efb5f83befbc8ec297c9577451390d9e5b0447.tar.gz
-/sqlite-jdbc-3.15.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5204a84
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Orphaned for 6+ weeks
diff --git a/sources b/sources
deleted file mode 100644
index 2c4a560..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-1ed2a1ad2754e03a5218fc352045b32b sqlite-jdbc-3.15.1.tar.gz
diff --git a/sqlite-jdbc-3.15.1-build.patch b/sqlite-jdbc-3.15.1-build.patch
deleted file mode 100644
index 406d4f2..0000000
--- a/sqlite-jdbc-3.15.1-build.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -Nru sqlite-jdbc-3.15.1/Makefile sqlite-jdbc-3.15.1.build/Makefile
---- sqlite-jdbc-3.15.1/Makefile 2016-11-04 21:42:29.000000000 +0100
-+++ sqlite-jdbc-3.15.1.build/Makefile 2016-11-06 12:15:06.926445700 +0100
-@@ -3,45 +3,37 @@
-
- RESOURCE_DIR = src/main/resources
-
--.phony: all package win32 win64 mac32 linux32 linux64 linux-arm linux-armhf native
native-all deploy
-+.phony: all package win32 win64 mac32 linux native native-all deploy
-
- all: jni-header package
-
- deploy:
-- mvn package deploy -DperformRelease=true
-
--MVN:=mvn
-+
-+MVN:=xmvn -o
- SRC:=src/main/java
- SQLITE_OUT:=$(TARGET)/$(sqlite)-$(OS_NAME)-$(OS_ARCH)
--SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
--SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
--SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-+#SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
-+#SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
-+#SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-
--CCFLAGS:= -I$(SQLITE_OUT) -I$(SQLITE_AMAL_DIR) $(CCFLAGS)
-+CCFLAGS:= -I$(SQLITE_OUT) $(CCFLAGS) -lsqlite3
-
- $(SQLITE_ARCHIVE):
-- @mkdir -p $(@D)
-- curl -L --max-redirs 0 -f -o$@
http://www.sqlite.org/2016/$(SQLITE_AMAL_PREFIX).zip ||
\
-- curl -L --max-redirs 0 -f -o$@
http://www.sqlite.org/2015/$(SQLITE_AMAL_PREFIX).zip ||
\
-- curl -L --max-redirs 0 -f -o$@
http://www.sqlite.org/2014/$(SQLITE_AMAL_PREFIX).zip ||
\
-- curl -L --max-redirs 0 -f -o$@
http://www.sqlite.org/2013/$(SQLITE_AMAL_PREFIX).zip ||
\
-- curl -L --max-redirs 0 -f -o$@
http://www.sqlite.org/$(SQLITE_AMAL_PREFIX).zip || \
-- curl -L --max-redirs 0 -f -o$@
http://www.sqlite.org/$(SQLITE_OLD_AMAL_PREFIX).zip
-+
-
- $(SQLITE_UNPACKED): $(SQLITE_ARCHIVE)
-- unzip -qo $< -d $(TARGET)/tmp.$(version)
-- (mv $(TARGET)/tmp.$(version)/$(SQLITE_AMAL_PREFIX) $(TARGET) && rmdir
$(TARGET)/tmp.$(version)) || mv $(TARGET)/tmp.$(version)/ $(TARGET)/$(SQLITE_AMAL_PREFIX)
-- touch $@
-
-
--$(TARGET)/common-lib/org/sqlite/%.class: src/main/java/org/sqlite/%.java
-+
-+$(SQLITE_OUT)/org/sqlite/%.class: src/main/java/org/sqlite/%.java
- @mkdir -p $(@D)
-- $(JAVAC) -source 1.5 -target 1.5 -sourcepath $(SRC) -d $(TARGET)/common-lib $<
-+ $(JAVAC) -source 1.6 -target 1.6 -sourcepath $(SRC) -d $(SQLITE_OUT) $<
-
--jni-header: $(TARGET)/common-lib/NativeDB.h
-+jni-header: $(SQLITE_OUT)/NativeDB.h
-
--$(TARGET)/common-lib/NativeDB.h: $(TARGET)/common-lib/org/sqlite/core/NativeDB.class
-- $(JAVAH) -classpath $(TARGET)/common-lib -jni -o $@ org.sqlite.core.NativeDB
-+$(SQLITE_OUT)/NativeDB.h: $(SQLITE_OUT)/org/sqlite/core/NativeDB.class
-+ $(JAVAH) -classpath $(SQLITE_OUT) -jni -o $@ org.sqlite.core.NativeDB
-
- test:
- mvn test
-@@ -50,35 +42,11 @@
-
-
- $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
-- @mkdir -p $(@D)
-- perl -p -e "s/sqlite3_api;/sqlite3_api = 0;/g" \
-- $(SQLITE_AMAL_DIR)/sqlite3ext.h > $(SQLITE_OUT)/sqlite3ext.h
--# insert a code for loading extension functions
-- perl -p -e "s/^opendb_out:/ if(!db->mallocFailed && rc==SQLITE_OK){ rc
= RegisterExtensionFunctions(db); }\nopendb_out:/;" \
-- $(SQLITE_AMAL_DIR)/sqlite3.c > $(SQLITE_OUT)/sqlite3.c
-- cat src/main/ext/*.c >> $(SQLITE_OUT)/sqlite3.c
-- $(CC) -o $@ -c $(CCFLAGS) \
-- -DSQLITE_ENABLE_LOAD_EXTENSION=1 \
-- -DSQLITE_HAVE_ISNAN \
-- -DSQLITE_HAVE_USLEEP \
-- -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT \
-- -DSQLITE_ENABLE_COLUMN_METADATA \
-- -DSQLITE_CORE \
-- -DSQLITE_ENABLE_FTS3 \
-- -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-- -DSQLITE_ENABLE_FTS5 \
-- -DSQLITE_ENABLE_JSON1 \
-- -DSQLITE_ENABLE_RTREE \
-- -DSQLITE_ENABLE_STAT2 \
-- -DSQLITE_THREADSAFE=1 \
-- -DSQLITE_DEFAULT_MEMSTATUS=0 \
-- -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-- $(SQLITE_FLAGS) \
-- $(SQLITE_OUT)/sqlite3.c
-
--$(SQLITE_OUT)/$(LIBNAME): $(SQLITE_OUT)/sqlite3.o $(SRC)/org/sqlite/core/NativeDB.c
-+
-+$(SQLITE_OUT)/$(LIBNAME): $(SQLITE_OUT)/sqlite3.o $(SRC)/org/sqlite/core/NativeDB.c
$(SQLITE_OUT)/NativeDB.h
- @mkdir -p $(@D)
-- $(CC) $(CCFLAGS) -I $(TARGET)/common-lib -c -o $(SQLITE_OUT)/NativeDB.o
$(SRC)/org/sqlite/core/NativeDB.c
-+ $(CC) $(CCFLAGS) -I $(SQLITE_OUT) -c -o $(SQLITE_OUT)/NativeDB.o
$(SRC)/org/sqlite/core/NativeDB.c
- $(CC) $(CCFLAGS) -o $@ $(SQLITE_OUT)/*.o $(LINKFLAGS)
- $(STRIP) $@
-
-@@ -88,7 +56,7 @@
- NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
-
- # For cross-compilation, install docker. See also
https://github.com/dockcross/dockcross
--native-all: native win32 win64 linux32 linux64 linux-arm linux-armhf
-+native-all: native linux
-
- native: $(SQLITE_UNPACKED) $(NATIVE_DLL)
-
-@@ -99,33 +67,23 @@
- cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
-
- win32: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-windows-x86 bash -c 'make clean-native native
CROSS_PREFIX=i686-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86'
--
--win64: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-windows-x64 bash -c 'make clean-native native
CROSS_PREFIX=x86_64-w64-mingw32.static- OS_NAME=Windows OS_ARCH=x86_64'
-
--linux32: $(SQLITE_UNPACKED) jni-header
-- docker run -ti -v $$PWD:/work xerial/centos5-linux-x86 bash -c 'make clean-native
native OS_NAME=Linux OS_ARCH=x86'
-
--linux64: $(SQLITE_UNPACKED) jni-header
-- docker run -ti -v $$PWD:/work xerial/centos5-linux-x86_64 bash -c 'make
clean-native native OS_NAME=Linux OS_ARCH=x86_64'
-+win64: $(SQLITE_UNPACKED) jni-header
-
--linux-arm: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-armv5 bash -c 'make clean-native native
CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm'
-
--linux-armhf: $(SQLITE_UNPACKED) jni-header
-- ./docker/dockcross-armv6 bash -c 'make clean-native native
CROSS_PREFIX=arm-linux-gnueabihf- OS_NAME=Linux OS_ARCH=armhf'
-+linux: $(SQLITE_UNPACKED) jni-header
-+ $(MAKE) native OS_NAME=Linux OS_ARCH=$(OS_ARCH)
-
- sparcv9:
-- $(MAKE) native OS_NAME=SunOS OS_ARCH=sparcv9
-+
-
- # deprecated
- mac32:
-- $(MAKE) native OS_NAME=Mac OS_ARCH=x86
-+
-
- package: native-all
-- rm -rf target/dependency-maven-plugin-markers
-- $(MVN) package
-+
-
- clean-native:
- rm -rf $(SQLITE_OUT)
-@@ -138,7 +96,7 @@
- rm -rf $(TARGET)/{surefire*,testdb.jar*}
-
- docker-linux64:
-- docker build -f docker/Dockerfile.linux_x86_64 -t xerial/centos5-linux-x86-64 .
-+
-
- docker-linux32:
-- docker build -f docker/Dockerfile.linux_x86 -t xerial/centos5-linux-x86 .
-+
-diff -Nru sqlite-jdbc-3.15.1/Makefile.common sqlite-jdbc-3.15.1.build/Makefile.common
---- sqlite-jdbc-3.15.1/Makefile.common 2016-11-04 21:42:29.000000000 +0100
-+++ sqlite-jdbc-3.15.1.build/Makefile.common 2016-11-06 11:58:31.575085824 +0100
-@@ -47,50 +47,24 @@
-
- # os=Default is meant to be generic unix/linux
-
--known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armhf Mac-x86 Mac-x86_64
FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9
-+known_targets := Linux Mac-x86 Mac-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86
Windows-x86_64 SunOS-sparcv9
- target := $(OS_NAME)-$(OS_ARCH)
-
--ifeq (,$(findstring $(strip $(target)),$(known_targets)))
-- target := Default
-+ifeq ($(OS_NAME),Linux)
-+ target := $(OS_NAME)
-+else
-+ target := $(OS_NAME)-$(OS_ARCH)
- endif
-
- # cross-compilation toolchain prefix (e.g. "arm-linux-gnueabi-")
- CROSS_PREFIX :=
-
--Default_CC := $(CROSS_PREFIX)gcc
--Default_STRIP := $(CROSS_PREFIX)strip
--Default_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -Os -fPIC
-fvisibility=hidden
--Default_LINKFLAGS := -shared
--Default_LIBNAME := libsqlitejdbc.so
--Default_SQLITE_FLAGS :=
--
--Linux-x86_CC := $(CROSS_PREFIX)gcc
--Linux-x86_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -fPIC -m32
-fvisibility=hidden
--Linux-x86_LINKFLAGS := -shared -static-libgcc
--Linux-x86_LIBNAME := libsqlitejdbc.so
--Linux-x86_SQLITE_FLAGS :=
--
--Linux-x86_64_CC := $(CROSS_PREFIX)gcc
--Linux-x86_64_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_64_CCFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -m64
-fvisibility=hidden
--Linux-x86_64_LINKFLAGS := -shared -static-libgcc
--Linux-x86_64_LIBNAME := libsqlitejdbc.so
--Linux-x86_64_SQLITE_FLAGS :=
--
--Linux-arm_CC := $(CROSS_PREFIX)gcc
--Linux-arm_STRIP := $(CROSS_PREFIX)strip
--Linux-arm_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -fPIC
-mfloat-abi=softfp -mfpu=vfp -fvisibility=hidden
--Linux-arm_LINKFLAGS := -shared -static-libgcc
--Linux-arm_LIBNAME := libsqlitejdbc.so
--Linux-arm_SQLITE_FLAGS :=
--
--Linux-armhf_CC := $(CROSS_PREFIX)gcc
--Linux-armhf_STRIP := $(CROSS_PREFIX)strip
--Linux-armhf_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -mfloat-abi=hard
-mfpu=vfp -fPIC -fvisibility=hidden
--Linux-armhf_LINKFLAGS := -shared -static-libgcc
--Linux-armhf_LIBNAME := libsqlitejdbc.so
--Linux-armhf_SQLITE_FLAGS :=
-+Linux_CC := gcc
-+Linux_STRIP := strip
-+Linux_CCFLAGS := -I$(JAVA_HOME)/include $(CCFLAGS) -fPIC -fvisibility=hidden
-+Linux_LINKFLAGS := -shared -static-libgcc
-+Linux_LIBNAME := libsqlitejdbc.so
-+Linux_SQLITE_FLAGS :=
-
- FreeBSD-x86_64_CC := $(CROSS_PREFIX)cc
- FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip
-diff -Nru sqlite-jdbc-3.15.1/pom.xml sqlite-jdbc-3.15.1.build/pom.xml
---- sqlite-jdbc-3.15.1/pom.xml 2016-11-04 21:42:29.000000000 +0100
-+++ sqlite-jdbc-3.15.1.build/pom.xml 2016-11-06 11:54:16.840693425 +0100
-@@ -84,7 +84,7 @@
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
-- <source>1.5</source>
-+ <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
diff --git a/sqlite-jdbc-Makefile b/sqlite-jdbc-Makefile
deleted file mode 100644
index 78094e7..0000000
--- a/sqlite-jdbc-Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# Author: gil cattaneo <puntogil(a)libero.it>
-
-include VERSION
-
-ifndef JAVA_HOME
-$(warning Set JAVA_HOME environment variable)
-endif
-
-JAVA := "$$JAVA_HOME/bin/java"
-JAVAC := "$$JAVA_HOME/bin/javac"
-JAVAH := "$$JAVA_HOME/bin/javah"
-
-CXX := gcc
-STRIP := strip
-SRCDIR := src/main/java/org/sqlite/core
-JSRCDIR := src/main/java
-
-BUILD := target
-
-OSINFO_CLASS := org.sqlite.OSInfo
-#OSINFO_CLASS := org.sqlite.util.OSInfo
-
-ifndef OS_NAME
-OS_NAME := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --os)
-endif
-ifndef OS_ARCH
-OS_ARCH := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch)
-endif
-
-sqlite := sqlite-$(version)
-TARGET := $(sqlite)-$(OS_NAME)-$(OS_ARCH)
-ODIR := $(BUILD)/$(TARGET)
-LIBNAME := libsqlitejdbc.so
-
-NATIVE_ROOT := org/sqlite/native/$(OS_NAME)/$(OS_ARCH)
-NATIVE_DIR := src/main/resources/$(NATIVE_ROOT)
-NATIVE_TARGET_DIR := $(BUILD)/classes/$(NATIVE_ROOT)
-
-IGEN := $(ODIR)
-JCLASSESDIR := $(ODIR)
-SQLITE_OUT := $(ODIR)
-
-INCLUDE=-I$(SQLITE_OUT) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-
-_OBJ_STD = NativeDB.o
-OBJ_STD = $(patsubst %,$(ODIR)/%,$(_OBJ_STD))
-_JAVA = $(shell find $(JSRCDIR) -name "*.java" -print)
-
-.PHONY: clean native
-
-build: $(ODIR)/$(LIBNAME)
-
-$(ODIR)/$(LIBNAME): $(OBJ_STD)
- $(CXX) -shared -fPIC -static-libgcc -lsqlite3 $(CFLAGS) $(LDFLAGS) -o $@ $^
- $(STRIP) $@
-
-$(ODIR)/%.class: OSINFO_PROG
- mkdir -p $(ODIR)
- $(JAVAC) -d $(ODIR) @javafiles-list
-
-javafiles-list: $(_JAVA)
- echo $^ > javafiles-list
-
-$(ODIR)/%.o: $(SRCDIR)/%.c $(IGEN)/NativeDB.h
- mkdir -p $(ODIR)
- $(CXX) $(CFLAGS) $(LDFLAGS) $(INCLUDE) -fPIC -lsqlite3 -c -o $@ $<
-
-$(IGEN)/NativeDB.h: $(ODIR)/%.class
- mkdir -p $(IGEN)
- $(JAVAH) -o $(IGEN)/NativeDB.h -classpath $(ODIR) org.sqlite.core.NativeDB
-
-native: $(ODIR)/$(LIBNAME)
- @mkdir -p $(NATIVE_DIR)
- cp $< $(NATIVE_DIR)/$(LIBNAME)
- @mkdir -p $(NATIVE_TARGET_DIR)
- cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
-
-OSINFO_PROG: javafiles-list
-# -rm -Rf lib/org/sqlite/OSInfo.class
-# cp src/main/java/org/sqlite/util/OSInfo.java lib/org/sqlite/OSInfo.java
-# sed -i "s|package org.sqlite.util;|package org.sqlite;|"
lib/org/sqlite/OSInfo.java
- $(JAVAC) lib/org/sqlite/OSInfo.java -d lib
- $(eval OS_NAME=$(shell $(JAVA) -cp lib $(OSINFO_CLASS) --os))
- $(eval OS_ARCH=$(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch))
-
-clean:
- -rm javafiles-list
- -rm -Rf $(BUILD)
diff --git a/sqlite-jdbc-build.patch b/sqlite-jdbc-build.patch
deleted file mode 100644
index 1f94949..0000000
--- a/sqlite-jdbc-build.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile
sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile 2015-05-11
16:59:00.000000000 +0200
-+++ sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile 2015-05-12
10:54:53.068289878 +0200
-@@ -4,35 +4,33 @@
-
- RESOURCE_DIR = src/main/resources
-
--.phony: all package win32 mac32 linux32 native deploy
-+.phony: all package win32 mac32 linux native deploy
-
- all: package
-
- deploy:
-- mvn deploy
-
--MVN:=mvn
-+
-+MVN:=xmvn -o
- SRC:=src/main/java
- SQLITE_OUT:=$(TARGET)/$(sqlite)-$(OS_NAME)-$(OS_ARCH)
--SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
--SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
--SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-+#SQLITE_ARCHIVE:=$(TARGET)/$(sqlite)-amal.zip
-+#SQLITE_UNPACKED:=$(TARGET)/sqlite-unpack.log
-+#SQLITE_AMAL_DIR=$(TARGET)/$(SQLITE_AMAL_PREFIX)
-
-
--CCFLAGS:= -I$(SQLITE_OUT) -I$(SQLITE_AMAL_DIR) $(CCFLAGS)
-+CCFLAGS:= -I$(SQLITE_OUT) $(CCFLAGS) -lsqlite3
-
- $(SQLITE_ARCHIVE):
-- @mkdir -p $(@D)
-- curl -o$@
http://www.sqlite.org/2015/$(SQLITE_AMAL_PREFIX).zip
-+
-
- $(SQLITE_UNPACKED): $(SQLITE_ARCHIVE)
-- unzip -qo $< -d $(TARGET)
-- touch $@
-+
-
-
- $(SQLITE_OUT)/org/sqlite/%.class: src/main/java/org/sqlite/%.java
- @mkdir -p $(@D)
-- $(JAVAC) -source 1.5 -target 1.5 -sourcepath $(SRC) -d $(SQLITE_OUT) $<
-+ $(JAVAC) -source 1.6 -target 1.6 -sourcepath $(SRC) -d $(SQLITE_OUT) $<
-
- jni-header: $(SQLITE_OUT)/NativeDB.h
-
-@@ -40,30 +38,13 @@
- $(JAVAH) -classpath $(SQLITE_OUT) -jni -o $@ org.sqlite.core.NativeDB
-
- test:
-- mvn test
-+
-
- clean: clean-native clean-java clean-tests
-
-
- $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED)
-- @mkdir -p $(@D)
-- perl -p -e "s/sqlite3_api;/sqlite3_api = 0;/g" \
-- $(SQLITE_AMAL_DIR)/sqlite3ext.h > $(SQLITE_OUT)/sqlite3ext.h
--# insert a code for loading extension functions
-- perl -p -e "s/^opendb_out:/ if(!db->mallocFailed && rc==SQLITE_OK){ rc
= RegisterExtensionFunctions(db); }\nopendb_out:/;" \
-- $(SQLITE_AMAL_DIR)/sqlite3.c > $(SQLITE_OUT)/sqlite3.c
-- cat src/main/ext/*.c >> $(SQLITE_OUT)/sqlite3.c
-- $(CC) -o $@ -c $(CCFLAGS) \
-- -DSQLITE_ENABLE_LOAD_EXTENSION=1 \
-- -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT \
-- -DSQLITE_ENABLE_COLUMN_METADATA \
-- -DSQLITE_CORE \
-- -DSQLITE_ENABLE_FTS3 \
-- -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-- -DSQLITE_ENABLE_RTREE \
-- -DSQLITE_ENABLE_STAT2 \
-- $(SQLITE_FLAGS) \
-- $(SQLITE_OUT)/sqlite3.c
-+
-
- $(SQLITE_OUT)/$(LIBNAME): $(SQLITE_OUT)/sqlite3.o $(SRC)/org/sqlite/core/NativeDB.c
$(SQLITE_OUT)/NativeDB.h
- @mkdir -p $(@D)
-@@ -92,19 +73,8 @@
- win64:
- $(MAKE) native CROSS_PREFIX=x86_64-w64-mingw32- OS_NAME=Windows OS_ARCH=x86_64
-
--linux32:
-- $(MAKE) native OS_NAME=Linux OS_ARCH=x86
--
--linux64:
-- $(MAKE) native OS_NAME=Linux OS_ARCH=x86_64
--
--# for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabi package
--linux-arm:
-- $(MAKE) native CROSS_PREFIX=arm-linux-gnueabi- OS_NAME=Linux OS_ARCH=arm
--
--# for cross-compilation on Ubuntu, install the g++-arm-linux-gnueabihf package
--linux-armhf:
-- $(MAKE) native CROSS_PREFIX=arm-linux-gnueabihf- OS_NAME=Linux OS_ARCH=armhf
-+linux:
-+ $(MAKE) native OS_NAME=Linux OS_ARCH=$(OS_ARCH)
-
- sparcv9:
- $(MAKE) native OS_NAME=SunOS OS_ARCH=sparcv9
-@@ -115,8 +85,7 @@
-
-
- package: $(NATIVE32_DLL) native
-- rm -rf target/dependency-maven-plugin-markers
-- $(MVN) package
-+
-
- clean-native:
- rm -rf $(TARGET)/$(sqlite)-$(OS_NAME)*
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.common
sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.common
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.common 2015-05-11
16:59:00.000000000 +0200
-+++ sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.common 2015-05-12
10:57:04.669475556 +0200
-@@ -45,50 +45,24 @@
-
- # os=Default is meant to be generic unix/linux
-
--known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armhf Mac-x86 Mac-x86_64
FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9
-+known_targets := Linux Mac-x86 Mac-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86
Windows-x86_64 SunOS-sparcv9
- target := $(OS_NAME)-$(OS_ARCH)
-
--ifeq (,$(findstring $(strip $(target)),$(known_targets)))
-- target := Default
-+ifeq ($(OS_NAME),Linux)
-+ target := $(OS_NAME)
-+else
-+ target := $(OS_NAME)-$(OS_ARCH)
- endif
-
- # cross-compilation toolchain prefix (e.g. "arm-linux-gnueabi-")
- CROSS_PREFIX :=
-
--Default_CC := $(CROSS_PREFIX)gcc
--Default_STRIP := $(CROSS_PREFIX)strip
--Default_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -Os -fPIC
-fvisibility=hidden
--Default_LINKFLAGS := -shared
--Default_LIBNAME := libsqlitejdbc.so
--Default_SQLITE_FLAGS :=
--
--Linux-x86_CC := $(CROSS_PREFIX)gcc
--Linux-x86_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -fPIC -m32
-fvisibility=hidden
--Linux-x86_LINKFLAGS := -shared -static-libgcc
--Linux-x86_LIBNAME := libsqlitejdbc.so
--Linux-x86_SQLITE_FLAGS :=
--
--Linux-x86_64_CC := $(CROSS_PREFIX)gcc
--Linux-x86_64_STRIP := $(CROSS_PREFIX)strip
--Linux-x86_64_CCFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -m64
-fvisibility=hidden
--Linux-x86_64_LINKFLAGS := -shared -static-libgcc
--Linux-x86_64_LIBNAME := libsqlitejdbc.so
--Linux-x86_64_SQLITE_FLAGS :=
--
--Linux-arm_CC := $(CROSS_PREFIX)gcc
--Linux-arm_STRIP := $(CROSS_PREFIX)strip
--Linux-arm_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -mfloat-abi=softfp
-mfpu=vfp -fPIC -fvisibility=hidden
--Linux-arm_LINKFLAGS := -shared -static-libgcc
--Linux-arm_LIBNAME := libsqlitejdbc.so
--Linux-arm_SQLITE_FLAGS :=
--
--Linux-armhf_CC := $(CROSS_PREFIX)gcc
--Linux-armhf_STRIP := $(CROSS_PREFIX)strip
--Linux-armhf_CCFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_linux -O2 -mfloat-abi=hard
-mfpu=vfp -fPIC -fvisibility=hidden
--Linux-armhf_LINKFLAGS := -shared -static-libgcc
--Linux-armhf_LIBNAME := libsqlitejdbc.so
--Linux-armhf_SQLITE_FLAGS :=
-+Linux_CC := gcc
-+Linux_STRIP := strip
-+Linux_CCFLAGS := -I$(JAVA_HOME)/include $(CCFLAGS) -fPIC -fvisibility=hidden
-+Linux_LINKFLAGS := -shared -static-libgcc
-+Linux_LIBNAME := libsqlitejdbc.so
-+Linux_SQLITE_FLAGS :=
-
- FreeBSD-x86_64_CC := $(CROSS_PREFIX)cc
- FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip
-@@ -162,13 +136,7 @@
- ifeq ($(OS_NAME),Windows)
- NATIVE32_DLL = win32
- else ifeq ($(OS_NAME),Linux)
-- ifeq ($(OS_ARCH),arm)
-- NATIVE32_DLL = linux-arm
-- else ifeq ($(OS_ARCH),armhf)
-- NATIVE32_DLL = linux-armhf
-- else
-- NATIVE32_DLL = linux32
-- endif
-+ NATIVE32_DLL = linux
- else ifeq ($(OS_NAME),Mac)
- NATIVE32_DLL = mac32
- endif
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.package
sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.package
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/Makefile.package 2015-05-11
16:59:00.000000000 +0200
-+++
sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/Makefile.package 2015-05-12
10:58:42.264422080 +0200
-@@ -21,7 +21,7 @@
- AMD_WORK=work/hg/sqlite-jdbc
-
- BUILD_CMD = hg pull -u && make clean-native && make native
--TEST_CMD = mvn test
-+TEST_CMD = xmvn -o test
-
- all: compile test
-
-@@ -97,21 +97,15 @@
- cp $(LIB_PUREJAVA) $(RESOURCE_DIR)/org/sqlite
-
- test-native:
-- ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) &&
$(TEST_CMD)"
-- ssh $(MAC_SERVER) "source .zprofile && cd $(MAC_WORK) &&
$(TEST_CMD)"
-- ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(MAC_WORK) &&
$(TEST_CMD)"
-- ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh
&& cd $(LINUX_WORK) && $(TEST_CMD)"
-- ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) &&
$(TEST_CMD)"
-
- test:
-- ssh $(MAC_TIGER_SERVER) "source .zprofile && cd $(MAC_WORK) &&
$(TEST_CMD) -DargLine='-Dsqlite.purejava=true'"
-+
-
- release:
-- mvn release:prepare
-- mvn release:perform
-+
-
- release-xerial:
-- mvn release:perform -Dtag=sqlite-jdbc-$(version)
-+
-
- release-sourceforge:
-- mvn release:perform -Darguments="-P sourceforge"
-Dtag=sqlite-jdbc-$(version)
-+
-diff -Nru sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/pom.xml
sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/pom.xml
---- sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e/pom.xml 2015-05-11
16:59:00.000000000 +0200
-+++ sqlite-jdbc-3627ba186e76a3cbd214b28e5dc8f05f8f260d4e.build/pom.xml 2015-05-12
10:51:19.780333950 +0200
-@@ -45,6 +45,10 @@
- <resources>
- <resource>
- <directory>src/main/java</directory>
-+ <excludes>
-+ <exclude>**/*.java</exclude>
-+ <exclude>**/*.c</exclude>
-+ </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
-@@ -87,7 +91,7 @@
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
-- <source>1.5</source>
-+ <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
diff --git a/sqlite-jdbc.spec b/sqlite-jdbc.spec
deleted file mode 100644
index b5daa9d..0000000
--- a/sqlite-jdbc.spec
+++ /dev/null
@@ -1,240 +0,0 @@
-#%% global githash
-# empty debuginfo
-%global debug_package %nil
-
-Name: sqlite-jdbc
-Version: 3.15.1
-Release: 9%{?dist}
-Summary: SQLite JDBC library
-
-# ASL 2.0:
-# ./src/main/java/org/sqlite/SQLiteConfig.java
-# ./src/main/java/org/sqlite/SQLiteDataSource.java
-# ./src/main/java/org/sqlite/SQLiteErrorCode.java
-# ./src/main/java/org/sqlite/SQLiteJDBCLoader.java
-# ./src/main/java/org/sqlite/SQLiteOpenMode.java
-# ./src/main/java/org/sqlite/javax/SQLiteConnectionPoolDataSource.java
-# ./src/main/java/org/sqlite/javax/SQLitePooledConnection.java
-# ./src/main/java/org/sqlite/util/OSInfo.java
-# ./src/main/java/org/sqlite/util/ResourceFinder.java
-
-# ISC:
-# ./src/main/java/org/sqlite/Function.java
-# ./src/main/java/org/sqlite/JDBC.java
-# ./src/main/java/org/sqlite/SQLiteConnection.java:
-# ./src/main/java/org/sqlite/core/Codes.java
-# ./src/main/java/org/sqlite/core/CoreDatabaseMetaData.java
-# ./src/main/java/org/sqlite/core/CoreResultSet.java
-# ./src/main/java/org/sqlite/core/CoreStatement.java
-# ./src/main/java/org/sqlite/core/CorePreparedStatement.java
-# ./src/main/java/org/sqlite/core/DB.java
-# ./src/main/java/org/sqlite/core/NativeDB.c
-# ./src/main/java/org/sqlite/core/NativeDB.java
-
-# This package is a fork of zentus sqlite driver the
-# original code is under BSD license. See LICENSE.zentus
-# ./src/main/java/org/sqlite/Function.java
-# ./src/main/java/org/sqlite/JDBC.java
-# ./src/main/java/org/sqlite/core/Codes.java
-# ./src/main/java/org/sqlite/core/DB.java
-# ./src/main/java/org/sqlite/core/NativeDB.c
-# ./src/main/java/org/sqlite/core/NativeDB.java
-
-License: ASL 2.0 and BSD and ISC
-URL:
https://github.com/xerial/sqlite-jdbc
-Source0:
https://github.com/xerial/sqlite-jdbc/archive/%{version}/%{name}-%{versio...
-Patch0: %{name}-3.15.1-build.patch
-
-BuildRequires: gcc
-BuildRequires: maven-local
-BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
-BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires: sqlite-devel
-
-
-%description
-SQLite JDBC, is a library for accessing and
-creating SQLite database files in Java.
-
-%package javadoc
-Summary: Javadoc for %{name}
-BuildArch: noarch
-
-%description javadoc
-This package contains javadoc for %{name}.
-
-%prep
-%setup -q -n %{name}-%{version}
-# Cleanup
-find . -name "*.class" -delete
-# Do not delete test resources
-find . -name "*.jar" ! -name "testdb.jar" -delete
-
-# Remove prebuilt libraries
-find -name "*.jnilib" -print -delete
-find -name "*.dll" -print -delete
-find -name "*.so" -print -delete
-find -name "*.h" -print -delete
-rm -r archive/* docker/*
-
-# extensions won't work with our sqlite (should be patched)
-# or use
http://www.sqlite.org/2016/sqlite-amalgamation-3150100.zip
-# ./sqlite-amalgamation-3150100/shell.c
-# ./sqlite-amalgamation-3150100/sqlite3.c
-# ./sqlite-amalgamation-3150100/sqlite3.h
-# ./sqlite-amalgamation-3150100/sqlite3ext.h
-# disable extensions and remove tests for them
-# java.sql.SQLException: [SQLITE_ERROR] SQL error or missing database (no such function:
radians)
-rm -r src/test/java/org/sqlite/ExtensionTest.java
-sed -i '/ExtensionTest/d' src/test/java/org/sqlite/AllTests.java
-# secondConnWillWait(org.sqlite.TransactionTest) Time elapsed: 23.213 sec
-rm -r src/test/java/org/sqlite/TransactionTest.java
-sed -i '/TransactionTest/d' src/test/java/org/sqlite/AllTests.java
-
-%ifarch %{power64}
-# failed test on big endian arches
-# ComparisonFailure: expected:<UTF-16[l]e> but was:<UTF-16[b]e>
-rm -r src/test/java/org/sqlite/SQLiteDataSourceTest.java
-sed -i '/SQLiteDataSourceTest/d' src/test/java/org/sqlite/AllTests.java
-%endif
-
-%patch0 -p1
-
-# Build JNI library. Use native task to avoid to run multiple, conflicting,
-# operations at the same time
-%pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin:1.7 . '
-<dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.8.0</version>
- </dependency>
-</dependencies>
-
-<executions>
- <execution>
- <id>compile</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <javac destdir="lib"
- srcdir="lib"
- source="1.6" target="1.6" debug="on"
- classpathref="maven.plugin.classpath">
- <include name="**/OSInfo.java"/>
- </javac>
- <exec executable="make">
- <arg line="%{?_smp_mflags}
- JAVA_HOME=%{_jvmdir}/java
- JAVA=%{_jvmdir}/java/bin/java
- JAVAC=%{_jvmdir}/java/bin/javac
- JAVAH=%{_jvmdir}/java/bin/javah
- native"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-</executions>'
-
-# Used for build JNI library
-cp -p src/main/java/org/sqlite/util/OSInfo.java lib/org/sqlite/
-sed -i "s|package org.sqlite.util;|package org.sqlite;|"
lib/org/sqlite/OSInfo.java
-
-%mvn_file org.xerial:%{name} %{name}
-
-%build
-
-%ifarch %{arm}
-opts='-f'
-%endif
-
-sed -i 's|$(CCFLAGS) -I|$(CCFLAGS) $(CFLAGS) -I|' Makefile
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
-sed -i 's|$(CCFLAGS) -o|$(CCFLAGS) $(LDFLAGS) -o|' Makefile
-LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS;
-%mvn_build $opts -- -Dmaven.test.failure.ignore=true
-
-%install
-%mvn_install
-
-%files -f .mfiles
-%doc CHANGELOG README.md Usage.md
-%license LICENSE* NOTICE
-
-%files javadoc -f .mfiles-javadoc
-%license LICENSE* NOTICE
-
-%changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-9
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-8
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.15.1-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Nov 10 2016 gil cattaneo <puntogil(a)libero.it> 3.15.1-2
-- fix rhbz#1392845,1392848,1392851,1392854
-
-* Sun Nov 06 2016 gil cattaneo <puntogil(a)libero.it> 3.15.1-1
-- update to 3.15.1
-
-* Thu Sep 22 2016 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-5
-- disable test suite on arm builder cause JVM crash
-
-* Mon Jun 20 2016 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-4
-- add missing build requires: maven-plugin-bundle
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.8.11.2-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Oct 05 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-2
-- fix for rhbz#1268789
-
-* Sun Oct 04 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11.2-1
-- update to 3.8.11.2
-
-* Tue Aug 04 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11.1-1
-- update to 3.8.11.1
-
-* Thu Jul 30 2015 gil cattaneo <puntogil(a)libero.it> 3.8.11-1
-- update to 3.8.11
-
-* Tue Jul 28 2015 gil cattaneo <puntogil(a)libero.it> 3.8.10.2-1
-- update to 3.8.10.2
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.8.10.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue May 12 2015 gil cattaneo <puntogil(a)libero.it> 3.8.10.1-1
-- update to 3.8.10.1
-
-* Fri May 08 2015 gil cattaneo <puntogil(a)libero.it> 3.8.9.1-1
-- update to 3.8.9.1
-
-* Fri Apr 24 2015 gil cattaneo <puntogil(a)libero.it> 3.8.9-1
-- update to 3.8.9
-
-* Tue Apr 21 2015 gil cattaneo <puntogil(a)libero.it> 3.8.8.2-1
-- update to 3.8.8.2
-
-* Tue Apr 21 2015 gil cattaneo <puntogil(a)libero.it> 3.8.7-1
-- initial rpm