The package rpms/deepin-gir-generator.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/deepin-gir-generator.git/commit/?....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit 9ca6785b45032eaaa8cdf308dbdc18b6e4987127
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue Jun 4 20:52:35 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 758ad81..5c4fd2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/go-gir-generator-1.0.4.tar.gz
/go-gir-generator-1.1.0.tar.gz
/go-gir-generator-1.2.0.tar.gz
+/go-gir-generator-2.0.2.tar.gz
diff --git a/SettingsBackendLike.patch b/SettingsBackendLike.patch
deleted file mode 100644
index 74b0660..0000000
--- a/SettingsBackendLike.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 55ad8df560b2a8aec3462e61edff781f11cf86a9 Mon Sep 17 00:00:00 2001
-From: jouyouyun <jouyouwen717(a)gmail.com>
-Date: Mon, 24 Oct 2016 19:43:32 +0800
-Subject: [PATCH] Fix 'SettingsBackendLike' undefined
-
-Change-Id: I9b817b3a6ec26ce8023e26a6b2c7abc67074d53f
----
-
-diff --git a/lib.in/gio-2.0/config.json b/lib.in/gio-2.0/config.json
-index aaf75ed..7733140 100644
---- a/lib.in/gio-2.0/config.json
-+++ b/lib.in/gio-2.0/config.json
-@@ -35,6 +35,7 @@
- "AppLaunchContext",
- "Emblem",
- "Settings",
-+ "SettingsBackend",
- "FileMonitor",
- "FileInfo",
- "InputStream",
-@@ -52,7 +53,6 @@
- "FileAttributeInfoList",
- "FileAttributeMatcher",
- "ActionEntry",
-- "SettingsBackend",
- "MountIface"
- //"SettingsSchema"
- ],
-diff --git a/lib.in/glib-2.0/config.json b/lib.in/glib-2.0/config.json
-index 88a8314..4290004 100644
---- a/lib.in/glib-2.0/config.json
-+++ b/lib.in/glib-2.0/config.json
-@@ -11,7 +11,8 @@
- "KeyFile",
- "Variant",
- "VariantType",
-- "PollFD"
-+ "PollFD",
-+ "Tree"
- ],
- "functions": [
- "get_user_cache_dir",
diff --git a/deepin-gir-generator.spec b/deepin-gir-generator.spec
index 6dd3f2a..ae47023 100644
--- a/deepin-gir-generator.spec
+++ b/deepin-gir-generator.spec
@@ -1,55 +1,76 @@
-%global repo go-gir-generator
+# Generated by go2rpm
+%bcond_without check
-Name: deepin-gir-generator
-Version: 1.2.0
-Release: 1%{?dist}
+#
https://github.com/linuxdeepin/go-gir-generator
+%global goipath pkg.deepin.io/gir
+%global forgeurl
https://github.com/linuxdeepin/go-gir-generator
+Version: 2.0.2
+%global tag 2.0.2
+
+%gometa
+
+%global goname deepin-gir-generator
+
+%global common_description %{expand:
+Generate static golang bindings for GObject.}
+
+%global golicenses LICENSE
+%global godocs CHANGELOG.md README.md
+
+Name: %{goname}
+Release: 2%{?dist}
Summary: Generate static golang bindings for GObject
+
License: GPLv3
-URL:
https://github.com/linuxdeepin/go-gir-generator
-Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
-Patch0: SettingsBackendLike.patch
-#
https://cr.deepin.io/#/c/go-gir-generator/+/41653/
-Patch1: %{name}_build-with-glib2.patch
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
+
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gudev-1.0)
-Provides: golang(gir/gobject-2.0)
-Provides: golang(gir/gio-2.0)
-Provides: golang(gir/glib-2.0)
-Provides: golang(gir/gudev-1.0)
+
+%if %{with check}
+# Tests
+BuildRequires: golang(gopkg.in/check.v1)
+%endif
%description
-Generate static golang bindings for GObject
+%{common_description}
%prep
-%setup -q -n %{repo}-%{version}
-
-GIO_VER=$(v=$(rpm -q --qf %{RPMTAG_VERSION} gobject-introspection); echo ${v//./})
-if [ $GIO_VER -ge 1521 ]; then
-# Our gobject-introspection is too new
-#
https://cr.deepin.io/#/c/16880/
-%patch0 -p1
-%patch1 -p1
-fi
+%goprep
+rm -rf gogtk-demo
+find . -name ".gitignore" -delete
+sed -i "s#go build#go build -buildmode pie -compiler gc
-tags=\"rpm_crashtraceback \${BUILDTAGS:-}\" -ldflags \"\${LDFLAGS:-} -B
0x\$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\\n') -extldflags
'-Wl,-z,relro -Wl,--as-needed -Wl,-z,now
-specs=/usr/lib/rpm/redhat/redhat-hardened-ld '\" -a -v -x#" Makefile
%build
+mkdir -p out/src/pkg.deepin.io/gir/{glib-2.0,gio-2.0,gobject-2.0,gudev-1.0}
export GOPATH="%{gopath}"
%make_build
%install
%make_install
+rm -rf lib.in out src test
+%gopkginstall
%files
-%doc README.md
+%doc CHANGELOG.md README.md
%license LICENSE
%{_bindir}/gir-generator
-%{gopath}/src/gir/
+%{gopath}/src/pkg.deepin.io/
%changelog
+* Tue Jun 04 19:37:05 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 2.0.2-2
+- Update to new macros
+
+* Fri May 10 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 2.0.2-1
+- new version
+
+* Wed Apr 17 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 2.0.1-1
+- new version
+
+* Thu Mar 28 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 2.0.0-1
+- new version
+
* Thu Jan 31 2019 mosquito <sensor.wen(a)gmail.com> - 1.2.0-1
- Update to 1.2.0
diff --git a/deepin-gir-generator_build-with-glib2.patch
b/deepin-gir-generator_build-with-glib2.patch
deleted file mode 100644
index 4946619..0000000
--- a/deepin-gir-generator_build-with-glib2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 45d1e2d91b6ee19866ed319f29e0fe561105e80b Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars(a)archlinux.org>
-Date: Sat, 16 Feb 2019 03:56:07 +0800
-Subject: [PATCH] fix: build issues with new glib2/gobject-introspection
-
-This should fix build errors on Fedora. Tested with glib2 2.59.2 and
-gobject-introspection 1.59.4.
-
-Change-Id: Ia1a21978e7494762ca9418ad57b32bcc4311e221
----
-
-diff --git a/lib.in/gio-2.0/config.json b/lib.in/gio-2.0/config.json
-index de0be17..ef2cb51 100644
---- a/lib.in/gio-2.0/config.json
-+++ b/lib.in/gio-2.0/config.json
-@@ -53,7 +53,8 @@
- "FileAttributeInfoList",
- "FileAttributeMatcher",
- "ActionEntry",
-- "MountIface"
-+ "MountIface",
-+ "OutputVector"
- //"SettingsSchema"
- ],
- "interfaces": [
diff --git a/sources b/sources
index 13a48ac..3e79eb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-gir-generator-1.2.0.tar.gz) =
8fefad81103f614bb5c172df5255ff36a395923d9d82faf54f6a21ad4c38f59bdcab3c6f94ee7298debec46c79981a58011cf38f52effe2cde819ef399e9d5ce
+SHA512 (go-gir-generator-2.0.2.tar.gz) =
1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7