Updated to 0.02, use date.h from sqlpp11, corrected arch

3 files changed, 11 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac5547f3c0df..d432804f792a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,17 @@
-# Generated by mksrcinfo v8
-# Tue Mar  1 22:58:30 UTC 2016
 pkgbase = sqlpp11-connector-odbc
 	pkgdesc = ODBC wrapper for sqlpp11
-	pkgver = 0.01
+	pkgver = 0.02
 	pkgrel = 1
 	url = https://github.com/Erroneous1/sqlpp11-connector-odbc
-	arch = any
+	arch = x86_64
+	arch = i686
 	license = CUSTOM
 	makedepends = cmake
 	makedepends = git
 	makedepends = unixodbc
 	depends = sqlpp11
-	source = https://github.com/Erroneous1/sqlpp11-connector-odbc/archive/v0.01.tar.gz
-	source = git+https://github.com/HowardHinnant/date.git
-	source = cmake_patch
-	sha256sums = b1310b6614034e3c0aa2b794ac24eed498a775e8044c9e5fae047fd781df6b39
-	sha256sums = SKIP
-	sha256sums = bb310bd69869ac19e1f53deff4cc15ead856904a2b77137a905afe75f1c53dd9
+	source = https://github.com/Erroneous1/sqlpp11-connector-odbc/archive/v0.02.tar.gz
+	sha256sums = b4ac8b592fa8acdd29996ce999dc928fe805b977e0e91b60f8087d115c1d3f4b
 
 pkgname = sqlpp11-connector-odbc
 
diff --git a/PKGBUILD b/PKGBUILD
index 17d7a97b074c..3bf1fcb59ee5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,22 @@
 # Maintainer: Aaron Bishop < erroneous at gmail >
 
 pkgname=sqlpp11-connector-odbc
-pkgver=0.01
+pkgver=0.02
 pkgrel=1
 pkgdesc="ODBC wrapper for sqlpp11"
-arch=('any')
+arch=('x86_64' 'i686')
 url="https://github.com/Erroneous1/sqlpp11-connector-odbc"
 license=('CUSTOM')
 depends=('sqlpp11')
 makedepends=('cmake' 'git' 'unixodbc')
-source=("${url}/archive/v${pkgver}.tar.gz"
-        "git+https://github.com/HowardHinnant/date.git"
-        'cmake_patch')
-sha256sums=('b1310b6614034e3c0aa2b794ac24eed498a775e8044c9e5fae047fd781df6b39'
-            'SKIP'
-            'bb310bd69869ac19e1f53deff4cc15ead856904a2b77137a905afe75f1c53dd9')
+source=("${url}/archive/v${pkgver}.tar.gz")
+sha256sums=('b4ac8b592fa8acdd29996ce999dc928fe805b977e0e91b60f8087d115c1d3f4b')
+
 build() {
     mkdir build
-    mkdir -p ${pkgname}-${pkgver}/external/date
-    cp date/date.h ${pkgname}-${pkgver}/external/date
     cd ${pkgname}-${pkgver}
-    patch -p2 < ../cmake_patch
     cd ../build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr ../${pkgname}-${pkgver}
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DDATE_INCLUDE_DIR=/usr/include/sqlpp11 ../${pkgname}-${pkgver}
     make
 }
 
diff --git a/cmake_patch b/cmake_patch
deleted file mode 100644
index edc01071169d..000000000000
--- a/cmake_patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ruN a/sqlpp11-connector-odbc-0.01/CMakeLists.txt b/sqlpp11-connector-odbc-0.01/CMakeLists.txt
---- a/sqlpp11-connector-odbc-0.01/CMakeLists.txt	2016-02-23 07:58:38.000000000 -0500
-+++ b/sqlpp11-connector-odbc-0.01/CMakeLists.txt	2016-03-01 08:11:46.181752542 -0500
-@@ -63,4 +63,4 @@
- 
- 
- add_subdirectory(src)
--add_subdirectory(tests)
-+#add_subdirectory(tests)
-diff -ruN a/sqlpp11-connector-odbc-0.01/src/CMakeLists.txt b/sqlpp11-connector-odbc-0.01/src/CMakeLists.txt
---- a/sqlpp11-connector-odbc-0.01/src/CMakeLists.txt	2016-02-23 07:58:38.000000000 -0500
-+++ b/sqlpp11-connector-odbc-0.01/src/CMakeLists.txt	2016-03-01 08:11:28.939187823 -0500
-@@ -23,10 +23,10 @@
- # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
--add_library(sqlpp-odbc
-+add_library(sqlpp-odbc SHARED
- 	connection.cpp
- 	bind_result.cpp
- 	prepared_statement.cpp
- 	detail/connection_handle.cpp)
- 
--install(TARGETS sqlpp-odbc DESTINATION lib)
-\ No newline at end of file
-+install(TARGETS sqlpp-odbc DESTINATION lib)