diff --git a/dde-api-5.2.0.tar.gz b/dde-api-5.4.6.orig.tar.xz similarity index 56% rename from dde-api-5.2.0.tar.gz rename to dde-api-5.4.6.orig.tar.xz index 89cad2cd28d492f72678daa708c8718924eab62d..b5c2b48863efa117d18e1397bc2ab687895a7453 100644 Binary files a/dde-api-5.2.0.tar.gz and b/dde-api-5.4.6.orig.tar.xz differ diff --git a/dde-api.spec b/dde-api.spec old mode 100755 new mode 100644 index 9ebcfa2761298d015a71f1e160e254ae2bff3d6c..c4e3f6cb9a9e32b80e2a641d9bb94a1806ccb37e --- a/dde-api.spec +++ b/dde-api.spec @@ -1,117 +1,136 @@ +# Run tests in check section +# disable for bootstrapping %bcond_with check -%global goipath pkg.deepin.io/lib +#%global _unpackaged_files_terminate_build 0 +%global with_debug 1 -Name: dde-api -Version: 5.2.0 -Release: 2 -Summary: dde-api -License: GPLv3 -URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ -Source0: %{name}-%{version}.tar.gz -BuildRequires: golang -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(cairo-ft) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) -BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(libpulse-simple) -BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(poppler-glib) -BuildRequires: pkgconfig(polkit-qt5-1) -BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xcursor) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(sqlite3) -BuildRequires: deepin-gettext-tools +%if 0%{?with_debug} +%global debug_package %{nil} +%endif -%define debug_package %{nil} +%global sname deepin-api -%description -dde-api - -%prep -%autosetup -go env -w GO111MODULE=auto +# out of memory on armv7hl +%ifarch %{arm} +%global _smp_mflags -j1 +%endif -%build -make -C ./gir generator -make -C ./gir -cp -r ./gir/out/src/pkg.deepin.io/gir/ ./pkg.deepin.io +%global goipath pkg.deepin.io/dde/api +%global forgeurl https://github.com/linuxdeepin/dde-api +%global tag %{version} -%install -install -d -p %{buildroot}/%{gopath}/src/ -for file in $(find . -iname "*.go" -o -iname "*.c" -o -iname "*.h" -o -iname "*.s") ; do - install -d -p %{buildroot}/%{gopath}/src/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/$file - #echo "%{gopath}/src/$file" >> devel.file-list -done +Name: dde-api +Version: 5.4.6 +Release: 1 +Summary: Go-lang bingding for dde-daemon +License: GPLv3+ +URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ +Source0: %{name}-%{version}.orig.tar.xz +Source1: vendor.tar.gz -make -C ./pkg.deepin.io/dde/api/ GOPATH=%{buildroot}/%{gopath} +BuildRequires: libcanberra-devel +BuildRequires: deepin-gettext-tools +BuildRequires: librsvg2-devel +BuildRequires: sqlite-devel +#BuildRequires: go-compiler +BuildRequires: golang golang-devel +BuildRequires: gdk-pixbuf-xlib +BuildRequires: kf5-kwayland-devel +BuildRequires: poppler-glib +BuildRequires: poppler-glib-devel +BuildRequires: alsa-lib-devel +BuildRequires: alsa-lib +BuildRequires: pulseaudio-libs-devel +BuildRequires: libgudev-devel +%{?systemd_requires} +Requires: deepin-desktop-base +Requires: rfkill +Requires(pre): shadow-utils -install -d -p %{buildroot}/usr/lib/deepin-api -for file in $(ls ./pkg.deepin.io/dde/api/out/bin) ; do - cp -pav ./pkg.deepin.io/dde/api/out/bin/$file %{buildroot}/usr/lib/deepin-api/$file - echo "/usr/lib/deepin-api/$file" >> devel.file-list -done +%description +%{summary}. -install -d -p %{buildroot}/usr/share/dbus-1/system.d/ -for file in $(find ./pkg.deepin.io/dde/api/misc -iname "*.conf") ; do - cp -pav $file %{buildroot}/usr/share/dbus-1/system.d/$(basename $file) - echo "/usr/share/dbus-1/system.d/$(basename $file)" >> devel.file-list -done +%package -n %{name}-devel +Summary: %{summary} +BuildArch: noarch -install -d -p %{buildroot}/usr/share/dbus-1/services/ -for file in $(find ./pkg.deepin.io/dde/api/misc/services -iname "*.service") ; do - cp -pav $file %{buildroot}/usr/share/dbus-1/services/$(basename $file) - echo "/usr/share/dbus-1/services/$(basename $file)" >> devel.file-list -done +%description -n %{name}-devel +%{summary}. -install -d -p %{buildroot}/usr/share/dbus-1/system-services/ -for file in $(find ./pkg.deepin.io/dde/api/misc/system-services -iname "*.service") ; do - cp -pav $file %{buildroot}/usr/share/dbus-1/system-services/$(basename $file) - echo "/usr/share/dbus-1/system-services/$(basename $file)" >> devel.file-list -done +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. -install -d -p %{buildroot}/usr/share/polkit-1/actions -for file in $(find ./pkg.deepin.io/dde/api/misc/polkit-action -iname "*.policy") ; do - cp -pav $file %{buildroot}/usr/share/polkit-1/actions/$(basename $file) - echo "/usr/share/polkit-1/actions/$(basename $file)" >> devel.file-list -done +%prep +%forgeautosetup -p1 -n %{name}-%{version} -install -d -p %{buildroot}/var/lib/polkit-1/localauthority/10-vendor.d -for file in $(find ./pkg.deepin.io/dde/api/misc/polkit-localauthority -iname "*.pkla") ; do - cp -pav $file %{buildroot}/var/lib/polkit-1/localauthority/10-vendor.d/$(basename $file) - echo "/var/lib/polkit-1/localauthority/10-vendor.d/$(basename $file)" >> devel.file-list -done +sed -i 's|/usr/lib|%{_libexecdir}|' misc/*services/*.service \ + misc/systemd/system/deepin-shutdown-sound.service \ + lunar-calendar/main.go \ + theme_thumb/gtk/gtk.go \ + thumbnails/gtk/gtk.go -install -d -p %{buildroot}/usr/share/dde-api -for file in $(find ./pkg.deepin.io/dde/api/misc/data) ; do - cp -pav $file %{buildroot}/usr/share/dde-api/$(basename $file) - echo "/usr/share/dde-api/$(basename $file)" >> devel.file-list -done +sed -i 's|PREFIX}${libdir|LIBDIR|; s|libdir|LIBDIR|' \ + Makefile adjust-grub-theme/main.go +tar -xf %{SOURCE1} -install -d -p %{buildroot}/lib/systemd/system/ -for file in $(find ./pkg.deepin.io/dde/api/misc/systemd/system/ -iname "*.service") ; do - cp -pav $file %{buildroot}/lib/systemd/system/$(basename $file) - echo "/lib/systemd/system/$(basename $file)" >> devel.file-list -done +%build +go env -w GO111MODULE=auto +export GOPATH=%{_builddir}/%{name}-%{version}/vendor:$GOPATH +%make_build -install -d -p %{buildroot}/usr/share/icons/hicolor -for file in $(find ./pkg.deepin.io/dde/api/misc/icons/) ; do - cp -pav $file %{buildroot}/usr/share/icons/hicolor/$(basename $file) - echo "/usr/share/icons/hicolor/$(basename $file)" >> devel.file-list +%install +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 -rm -rf %{buildroot}/%{gopath} - -%files -f devel.file-list +%make_install SYSTEMD_SERVICE_DIR="%{_unitdir}" LIBDIR="%{_libexecdir}" +# HOME directory for user deepin-sound-player +mkdir -p %{buildroot}%{_sharedstatedir}/deepin-sound-player + +%pre +getent group deepin-sound-player >/dev/null || groupadd -r deepin-sound-player +getent passwd deepin-sound-player >/dev/null || \ + useradd -r -g deepin-sound-player -d %{_sharedstatedir}/deepin-sound-player\ + -s /sbin/nologin \ + -c "User of com.deepin.api.SoundThemePlayer.service" deepin-sound-player +exit 0 + +%post +%systemd_post deepin-shutdown-sound.service + +%preun +%systemd_preun deepin-shutdown-sound.service + +%postun +%systemd_postun_with_restart deepin-shutdown-sound.service + +%files +%doc README.md +%license LICENSE +%{_bindir}/dde-open +%{_libexecdir}/%{sname}/ +%{_unitdir}/*.service +%{_datadir}/dbus-1/services/*.service +%{_datadir}/dbus-1/system-services/*.service +%{_datadir}/dbus-1/system.d/*.conf +%{_datadir}/icons/hicolor/*/actions/* +%{_datadir}/dde-api/data/huangli.db +%{_datadir}/dde-api/data/huangli.version +%{_datadir}/dde-api/data/pkg_depends +%{_datadir}/dde-api/data/grub-themes/ +%{_datadir}/polkit-1/actions/com.deepin.api.locale-helper.policy +%{_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 + +%files -n %{name}-devel -f devel.file-list %changelog +* Mon Jul 18 2022 konglidong - 5.4.6-1 +- Update to 5.4.6 + * Sat Jan 29 2022 liweiganga - 5.2.0-2 - fix build error. diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a8ffb6247ce1b28f70c3c8289a010ea99a356d9b Binary files /dev/null and b/vendor.tar.gz differ