From d563a7596fadf3a1e1ad464dae1aeab58bceb859 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Aug 07 2020 20:22:37 +0000 Subject: Update to 1.0.3 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index 4f6c926..5f3069d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /golang-xorm.spec /000-fix-32bit-int-overflow.patch /xorm-0.8.1.tar.gz +/xorm-1.0.3.tar.gz diff --git a/000-fix-32bit-int-overflow.patch b/000-fix-32bit-int-overflow.patch deleted file mode 100644 index 498f30c..0000000 --- a/000-fix-32bit-int-overflow.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/session_update_test.go b/session_update_test.go -index 274a6bf..ec1a241 100644 ---- a/session_update_test.go -+++ b/session_update_test.go -@@ -968,13 +968,13 @@ func TestNewUpdate(t *testing.T) { - - assertSync(t, new(TbUserInfo)) - -- targetUsr := TbUserInfo{Phone: "13126564922"} -+ targetUsr := TbUserInfo{Phone: "1312656492"} - changeUsr := TbUserInfo{Token: "ABCDEFG"} - af, err := testEngine.Update(&changeUsr, &targetUsr) - assert.NoError(t, err) - assert.EqualValues(t, 0, af) - -- af, err = testEngine.Table(new(TbUserInfo)).Where("phone=?", 13126564922).Update(&changeUsr) -+ af, err = testEngine.Table(new(TbUserInfo)).Where("phone=?", 1312656492).Update(&changeUsr) - assert.NoError(t, err) - assert.EqualValues(t, 0, af) - } diff --git a/0001-fix-32bit-int-overflow.patch b/0001-fix-32bit-int-overflow.patch new file mode 100644 index 0000000..42471cd --- /dev/null +++ b/0001-fix-32bit-int-overflow.patch @@ -0,0 +1,19 @@ +diff -up xorm/integrations/session_update_test.go.orig xorm/integrations/session_update_test.go +--- xorm/integrations/session_update_test.go.orig 2020-07-10 14:57:00.000000000 +0200 ++++ xorm/integrations/session_update_test.go 2020-08-07 22:13:23.949478451 +0200 +@@ -797,13 +797,13 @@ func TestNewUpdate(t *testing.T) { + + assertSync(t, new(TbUserInfo)) + +- targetUsr := TbUserInfo{Phone: "13126564922"} ++ targetUsr := TbUserInfo{Phone: "1312656492"} + changeUsr := TbUserInfo{Token: "ABCDEFG"} + af, err := testEngine.Update(&changeUsr, &targetUsr) + assert.NoError(t, err) + assert.EqualValues(t, 0, af) + +- af, err = testEngine.Table(new(TbUserInfo)).Where("phone=?", 13126564922).Update(&changeUsr) ++ af, err = testEngine.Table(new(TbUserInfo)).Where("phone=?", 1312656492).Update(&changeUsr) + assert.NoError(t, err) + assert.EqualValues(t, 0, af) + } diff --git a/golang-xorm.spec b/golang-xorm.spec index 112811b..3bfd478 100644 --- a/golang-xorm.spec +++ b/golang-xorm.spec @@ -4,7 +4,7 @@ # https://gitea.com/xorm/xorm %global goipath xorm.io/xorm %global forgeurl https://gitea.com/xorm/xorm -Version: 0.8.1 +Version: 1.0.3 %global repo xorm %global archivename %{repo}-%{version} %global archiveext tar.gz @@ -29,26 +29,25 @@ Simple and Powerful ORM for Go} CONTRIBUTING.md README.md Name: %{goname} -Release: 2%{?dist} +Release: 1%{?dist} Summary: ORM for Go # Upstream license specification: BSD-3-Clause License: BSD URL: %{gourl} Source0: %{gosource} - # session_update_test.go uses an 11 digit ph number as an int -Patch0: 000-fix-32bit-int-overflow.patch +Patch0: 0001-fix-32bit-int-overflow.patch -BuildRequires: golang(github.com/go-sql-driver/mysql) -BuildRequires: golang(github.com/lib/pq) -BuildRequires: golang(github.com/mattn/go-sqlite3) -BuildRequires: golang(xorm.io/builder) >= 0.3.6 -BuildRequires: golang(xorm.io/core) +BuildRequires: golang(github.com/syndtr/goleveldb/leveldb) +BuildRequires: golang(xorm.io/builder) %if %{with check} # Tests BuildRequires: golang(github.com/denisenkom/go-mssqldb) +BuildRequires: golang(github.com/go-sql-driver/mysql) +BuildRequires: golang(github.com/lib/pq) +BuildRequires: golang(github.com/mattn/go-sqlite3) BuildRequires: golang(github.com/stretchr/testify/assert) BuildRequires: golang(github.com/ziutek/mymysql/godrv) %endif @@ -73,6 +72,9 @@ BuildRequires: golang(github.com/ziutek/mymysql/godrv) %gopkgfiles %changelog +* Fri Aug 07 21:51:36 CEST 2020 Robert-André Mauchin - 1.0.3-1 +- Update to 1.0.3 + * Tue Jul 28 2020 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 99c8ee6..c22fa36 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (golang-xorm.spec) = ea8019025a0b881a259bc06ed53531cf2ad84b56a7f859c3816d871b2a61383d9807f35518756e67254ae758e76cccdb51a5d5ae4c4e4e780f47c0a01d3f69db -SHA512 (000-fix-32bit-int-overflow.patch) = 188bd5c2e424c7ceeb8b31fbc1106e3f859191b793059067ab00190ba1abbd179b4559bcd1babc5bfec75e80e132ec1815214e94abd14c9aff822c6e68e09f80 -SHA512 (xorm-0.8.1.tar.gz) = 82d1b711ced7f6eb7d19609c36fb70fa1e5e9c27843827ab9bb44248a20af05d046da0c20ae8ae3f1fa74dc5f19a695168bc2579af851e8b2da61dc0584a8952 +SHA512 (xorm-1.0.3.tar.gz) = 5289c07dbf1e2a491f226f47fa72220d78a3810efc16a34b12153941dcaf5fe54e9bc5aa9e1c0fb874a10e6054f82f8da81b4975ddd6def91f51669b61ec8788