diff --git a/dde-api_5.1.11.1-server-industry.orig.tar.xz b/dde-api-5.2.0.tar.gz old mode 100755 new mode 100644 similarity index 41% rename from dde-api_5.1.11.1-server-industry.orig.tar.xz rename to dde-api-5.2.0.tar.gz index fd242efe9c1a7ab91ee8f1c7866599135ac08a80..89cad2cd28d492f72678daa708c8718924eab62d Binary files a/dde-api_5.1.11.1-server-industry.orig.tar.xz and b/dde-api-5.2.0.tar.gz differ diff --git a/dde-api.spec b/dde-api.spec index f43d5c91a9562942240be8cac3fbb3d0d6ca6eb6..5937b4c32ddfce81121a8f094caf705db2d5c4a5 100755 --- a/dde-api.spec +++ b/dde-api.spec @@ -1,123 +1,119 @@ %bcond_with check -%global with_debug 1 - -%if 0%{?with_debug} -%global debug_package %{nil} -%endif - -%global sname deepin-api -%global release_name server-industry - -%ifarch %{arm} -%global _smp_mflags -j1 -%endif - -%global goipath pkg.deepin.io/dde/api -%global forgeurl https://github.com/linuxdeepin/dde-api -%global tag %{version} +%global goipath pkg.deepin.io/lib Name: dde-api -Version: 5.1.11.1 -Release: 8 -Summary: Go-lang bingding for dde-daemon -License: GPLv2 +Version: 5.2.0 +Release: 1 +Summary: dde-api +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 - -BuildRequires: libcanberra-devel -BuildRequires: deepin-gettext-tools -BuildRequires: librsvg2-devel -BuildRequires: sqlite-devel +Source0: %{name}-%{version}.tar.gz BuildRequires: golang -BuildRequires: gdk-pixbuf2-xlib-devel -BuildRequires: kf5-kwayland-devel -BuildRequires: poppler-glib -BuildRequires: poppler-glib-devel -BuildRequires: alsa-lib-devel -BuildRequires: alsa-lib -BuildRequires: pulseaudio-libs-devel -%{?systemd_requires} -Requires: deepin-desktop-base -Requires: rfkill -Requires(pre): shadow-utils +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 + +%define debug_package %{nil} %description -%{summary}. +dde-api %prep -%forgeautosetup -p1 -n %{name}-%{version}-%{release_name} +%autosetup + +%build +make -C ./gir generator +make -C ./gir +cp -r ./gir/out/src/pkg.deepin.io/gir/ ./pkg.deepin.io -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 +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 -sed -i 's|PREFIX}${libdir|LIBDIR|; s|libdir|LIBDIR|' \ - Makefile adjust-grub-theme/main.go +make -C ./pkg.deepin.io/dde/api/ GOPATH=%{buildroot}/%{gopath} -%build -for cmd in $(make binaries); do - GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor - go build -mod=vendor -o _bin/$cmd %{goipath}/$cmd +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 -%make_build -%install -rm -rf $(make binaries) -gofiles=$(find $(make libraries) %{?gofindfilter} -print) -for file in $gofiles ; do - install -d -p %{buildroot}/%{gopath}/src/%{goipath}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{goipath}/$file +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 -%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 || \ - 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 -%exclude %{gopath}/src + +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 + +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 + +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 + +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 + +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 + +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 + +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 +done +rm -rf %{buildroot}/%{gopath} + +%files -f devel.file-list %changelog +* Thu Aug 26 2021 weidong - 5.2.0-1 +- Update dde-api. + * Thu Mar 4 2021 weidong - 5.1.11.1-8 - Update license. diff --git a/deepin-api_makefile.patch b/deepin-api_makefile.patch deleted file mode 100644 index 12987ac1dc7dd0da9938d7601dca978cd0128ee9..0000000000000000000000000000000000000000 --- a/deepin-api_makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/Makefile 2020-03-22 23:45:53.000000000 +0800 -+++ b/Makefile 2020-04-27 20:28:02.391864563 +0800 -@@ -2,8 +2,8 @@ - GOBUILD_DIR = gobuild - GOPKG_PREFIX = pkg.deepin.io/dde/api - GOSITE_DIR = ${PREFIX}/share/gocode --libdir = /lib --SYSTEMD_LIB_DIR = ${libdir} -+LIBDIR = /lib -+SYSTEMD_LIB_DIR = ${LIBDIR} - SYSTEMD_SERVICE_DIR = ${SYSTEMD_LIB_DIR}/systemd/system/ - GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build -mod=vendor - -@@ -38,7 +38,7 @@ - image-blur \ - image-blur-helper - --all: build-binary build-dev ts-to-policy -+all: ts-to-policy - - prepare: - @if [ ! -d ${GOBUILD_DIR}/src/${GOPKG_PREFIX} ]; then \ -@@ -66,12 +66,12 @@ - build-binary: prepare $(addprefix out/bin/, ${BINARIES}) - - install-binary: -- mkdir -pv ${DESTDIR}${PREFIX}${libdir}/deepin-api -- cp out/bin/* ${DESTDIR}${PREFIX}${libdir}/deepin-api/ -+ mkdir -pv ${DESTDIR}${LIBDIR}/deepin-api -+ cp _bin/* ${DESTDIR}${LIBDIR}/deepin-api/ - - mkdir -pv ${DESTDIR}${PREFIX}/bin -- cp out/bin/dde-open ${DESTDIR}${PREFIX}/bin -- rm ${DESTDIR}${PREFIX}${libdir}/deepin-api/dde-open -+ cp _bin/dde-open ${DESTDIR}${PREFIX}/bin -+ rm ${DESTDIR}${LIBDIR}/deepin-api/dde-open - - mkdir -pv ${DESTDIR}${PREFIX}/share/dbus-1/system.d - cp misc/conf/*.conf ${DESTDIR}${PREFIX}/share/dbus-1/system.d/ -@@ -106,7 +106,8 @@ - - install-dev: ${addprefix install/lib/, ${LIBRARIES}} - --install: install-binary install-dev -+install: install-binary -+ - - clean: - rm -rf out/bin gobuild out -@@ -118,3 +119,8 @@ - - test: prepare - env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go test -v ./... -+binaries: -+ @echo ${BINARIES} -+ -+libraries: -+ @echo ${LIBRARIES}