diff --git a/dde-api-5.4.30.tar.gz b/dde-api-5.4.30.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d60c2772fb19c0bb7adb2f84399ad9dbd3714a72 Binary files /dev/null and b/dde-api-5.4.30.tar.gz differ diff --git a/dde-api.spec b/dde-api.spec old mode 100755 new mode 100644 index cc5e0b56f30097235fd687cd9d9fffa73cbbc025..a8bacb627e32e54fcc3bdbb569cd238c23697487 --- a/dde-api.spec +++ b/dde-api.spec @@ -1,4 +1,7 @@ +# Run tests in check section +# disable for bootstrapping %bcond_with check +#%global _unpackaged_files_terminate_build 0 %global with_debug 1 %if 0%{?with_debug} @@ -6,8 +9,8 @@ %endif %global sname deepin-api -%global release_name server-industry +# out of memory on armv7hl %ifarch %{arm} %global _smp_mflags -j1 %endif @@ -15,22 +18,22 @@ %global goipath pkg.deepin.io/dde/api %global forgeurl https://github.com/linuxdeepin/dde-api %global tag %{version} -%gometa Name: dde-api -Version: 5.1.11.1 -Release: 6 +Version: 5.4.30 +Release: 1%{?dist}.03 Summary: Go-lang bingding for dde-daemon License: GPLv3+ URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ -Source0: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/%{name}_%{version}-%{release_name}.orig.tar.xz -Patch1: deepin-api_makefile.patch +Source0: %{name}-%{version}.tar.gz -BuildRequires: libcanberra-devel -BuildRequires: deepin-gettext-tools +BuildRequires: git +BuildRequires: libcanberra-devel +BuildRequires: deepin-gettext-tools BuildRequires: librsvg2-devel BuildRequires: sqlite-devel BuildRequires: compiler(go-compiler) +BuildRequires: golang-github-linuxdeepin-go-x11-client-devel BuildRequires: gdk-pixbuf2-xlib-devel BuildRequires: kf5-kwayland-devel BuildRequires: poppler-glib @@ -38,6 +41,28 @@ BuildRequires: poppler-glib-devel BuildRequires: alsa-lib-devel BuildRequires: alsa-lib BuildRequires: pulseaudio-libs-devel + +%if 0%{?openeuler} +BuildRequires: gocode +%else +BuildRequires: golang-github-fsnotify-fsnotify-devel +BuildRequires: golang-dbus +BuildRequires: golang-x-image-devel +BuildRequires: golang-github-rickb777-date-devel +BuildRequires: golang-github-mattn-go-sqlite3-devel +BuildRequires: golang-gopkg-alecthomas-kingpin-devel +BuildRequires: golang-github-cryptix-wav-devel +BuildRequires: golang-github-disintegration-imaging-devel +BuildRequires: golang-github-fogleman-gg-devel +BuildRequires: golang-github-gosexy-gettext-devel +BuildRequires: golang-github-nfnt-resize-devel +BuildRequires: golang-github-stretchr-testify-unit-test +%endif + +BuildRequires: go-gir-generator +BuildRequires: golang-github-linuxdeepin-go-dbus-factory-devel +BuildRequires: go-lib-devel +BuildRequires: libgudev-devel %{?systemd_requires} Requires: deepin-desktop-base Requires: rfkill @@ -46,8 +71,19 @@ Requires(pre): shadow-utils %description %{summary}. +%package -n %{name}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}-devel +%{summary}. + +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. + %prep -%forgeautosetup -p1 -n %{name}-%{version}-%{release_name} +%forgeautosetup -p1 -n %{name}-%{version} sed -i 's|/usr/lib|%{_libexecdir}|' misc/*services/*.service \ misc/systemd/system/deepin-shutdown-sound.service \ @@ -59,26 +95,24 @@ sed -i 's|PREFIX}${libdir|LIBDIR|; s|libdir|LIBDIR|' \ Makefile adjust-grub-theme/main.go %build -%gobuildroot -for cmd in $(make binaries); do - GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor - go build -mod=vendor -o _bin/$cmd %{goipath}/$cmd -done +%ifarch loongarch64 +export CGO_ENABLED=1 +export GOOS="linux" +%endif + +export GOPATH=/usr/share/gocode/:$GOPATH %make_build %install -rm -rf $(make binaries) -gofiles=$(find $(make libraries) %{?gofindfilter} -print) -%goinstall $gofiles +for file in $(find . -iname "*.go" -o -iname "*.c" -o -iname "*.h" -o -iname "*.s"); do + install -d -p %{buildroot}/%{gopath}/src/%{goipath}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{goipath}/$file + echo "%{gopath}/src/%{goipath}/$file" >> devel.file-list +done %make_install SYSTEMD_SERVICE_DIR="%{_unitdir}" LIBDIR="%{_libexecdir}" # HOME directory for user deepin-sound-player mkdir -p %{buildroot}%{_sharedstatedir}/deepin-sound-player -%if %{with check} -%check -%gochecks -%endif - %pre getent group deepin-sound-player >/dev/null || groupadd -r deepin-sound-player getent passwd deepin-sound-player >/dev/null || \ @@ -114,18 +148,15 @@ exit 0 %{_datadir}/polkit-1/actions/com.deepin.api.device.unblock-bluetooth-devices.policy %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla %attr(-, deepin-sound-player, deepin-sound-player) %{_sharedstatedir}/deepin-sound-player -%exclude /usr/share/gocode/src + +%files -n %{name}-devel -f devel.file-list +%if 1%{?openeuler} +%{_datadir}/gocode/src/%{goipath}/* +%endif %changelog -* Thu Sep 3 2020 weidong - 5.1.11.1-6 -- fix source url in spec -* Wed Sep 2 2020 chenbo pan - 5.1.11.1-5 -- remove dde-api-devel -* Wed Sep 2 2020 chenbo pan - 5.1.11.1-4 -- remove install golang devel -* Tue Aug 18 2020 chenbo pan - 5.1.11.1-3 -- remove golang devel -* Thu Jul 30 2020 openEuler Buildteam - 5.1.11.1-2 -- fix spec -* Thu Jul 30 2020 openEuler Buildteam - 5.1.11.1-1 -- Package init +* Thu Jun 30 2022 liweiganga - 5.4.30-1.03 +- fix: remove 'go env -w GO111MODULE=auto' + +* Tue Jun 14 2022 uoser - 5.4.30-1.02 +- update: update to 5.4.30-1.02