diff --git a/linglong-1.5.6.4.tar.gz b/linglong-1.5.6.4.tar.gz deleted file mode 100644 index 2e6d312159f4c22acfc6bd5308eb65c201281176..0000000000000000000000000000000000000000 Binary files a/linglong-1.5.6.4.tar.gz and /dev/null differ diff --git a/linglong.spec b/linglong.spec index 39a7ef8ff9ddb8fa260f8c98f4acbc666b896c93..ae45285c6d2bb5e2072871dd4129c329b8a4f050 100644 --- a/linglong.spec +++ b/linglong.spec @@ -1,18 +1,19 @@ %define anolis_release 1 Name: linglong -Version: 1.5.6.4 +Version: 1.7.0 Release: %{anolis_release}%{?dist} Summary: Linglong Package FrameWork License: LGPLv3 -URL: https://github.com/kamiyadm/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/OpenAtom-Linyaps/linyaps +Source0: %{url}/archive/%{version}/linyaps-%{version}.tar.gz BuildRequires: cmake gcc-c++ -BuildRequires: qt5-qtbase-devel qt5-qtwebsockets-devel qt5-qtbase-private-devel +BuildRequires: qt5-qtbase-devel qt5-qtbase-private-devel BuildRequires: glib2-devel nlohmann-json-devel ostree-devel yaml-cpp-devel BuildRequires: systemd-devel gtest-devel libseccomp-devel elfutils-libelf-devel BuildRequires: glibc-static libstdc++-static +BuildRequires: libcurl-devel openssl-devel gettext Requires: linglong-bin = %{version}-%{release} %description @@ -37,14 +38,8 @@ Summary: Linglong sandbox %description -n linglong-box Linglong sandbox with OCI standard. -%package -n linglong-installer -Summary: Linglong web store installer -Requires: linglong-bin = %{version}-%{release} -%description -n linglong-installer -Linglong web store installer. - %prep -%autosetup -p1 -n linglong-%{version} +%autosetup -p1 -n linyaps-%{version} %build export PATH=%{_qt5_bindir}:$PATH @@ -55,9 +50,8 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ -DBUILD_SHARED_LIBS=OFF \ - -DCPM_LOCAL_PACKAGES_ONLY=ON \ - -DENABLE_LINGLONG_INSTALLER=ON .. -%make_build -j4 + -DCPM_LOCAL_PACKAGES_ONLY=ON .. +%make_build %install cd build @@ -65,7 +59,6 @@ cd build %post -n linglong-bin %systemd_post org.deepin.linglong.PackageManager.service -/usr/bin/busctl call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig %preun -n linglong-bin %systemd_preun org.deepin.linglong.PackageManager.service @@ -77,9 +70,6 @@ cd build %doc README.md %license LICENSE %exclude %{_libdir}/cmake/linglong-*/*.cmake -%exclude %{_datadir}/polkit-1/actions/org.deepin.linglong.PackageManager.policy -%{_prefix}/src/* - %files -n linglong-bin %doc README.md @@ -88,15 +78,14 @@ cd build %{_sysconfdir}/X11/Xsession.d/* %{_bindir}/ll-cli %{_bindir}/llpkg -%{_bindir}/linglong-repair-tool %{_prefix}/lib/%{name}/container/* +%{_prefix}/lib/%{name}/generate-xdg-data-dirs.sh %{_prefix}/lib/sysusers.d/*.conf %{_prefix}/lib/tmpfiles.d/*.conf %{_prefix}/lib/systemd/system/*.service %{_prefix}/lib/systemd/system-preset/*.preset %{_prefix}/lib/systemd/user/* %{_prefix}/lib/systemd/system-environment-generators/* -%{_prefix}/lib/systemd/user-environment-generators/* %{_libexecdir}/%{name}/ll-package-manager %{_libexecdir}/%{name}/00-id-mapping-static %{_libexecdir}/%{name}/05-initialize-static @@ -105,15 +94,15 @@ cd build %{_libexecdir}/%{name}/30-user-home-static %{_libexecdir}/%{name}/40-host-ipc-static %{_libexecdir}/%{name}/90-legacy-static -%{_libexecdir}/%{name}/upgrade-all %{_libexecdir}/%{name}/ll-session-helper %{_datadir}/bash-completion/completions/ll-cli %{_datadir}/dbus-1/system-services/*.service %{_datadir}/dbus-1/system.d/*.conf +%{_datadir}/polkit-1/actions/org.deepin.linglong.PackageManager1.policy +%{_datadir}/polkit-1/rules.d/org.deepin.linglong.PackageManager1.rules %{_datadir}/%{name}/config.yaml %{_datadir}/mime/packages/* -%{_datadir}/%{name}/api/api.json -%{_datadir}/applications/linglong-repair-tool.desktop +%{_datadir}/locale/* %files -n linglong-builder %license LICENSE @@ -131,12 +120,9 @@ cd build %license LICENSE %{_bindir}/ll-box -%files -n linglong-installer -%license LICENSE -%{_bindir}/ll-installer -%{_datadir}/applications/linglong-store-installer.desktop - %changelog +* Fri Nov 15 2024 chenhuixing - 1.7.0-1 +- Release 1.7.0 * Thu Aug 22 2024 chenhuixing - 1.5.6.4-1 - Release 1.5.6.4 * Thu Apr 25 2024 chenhuixing - 1.4.3-1 diff --git a/linyaps-1.7.0.tar.gz b/linyaps-1.7.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..38fc297bea8bb11298d6d19220d7ba752456a2bb Binary files /dev/null and b/linyaps-1.7.0.tar.gz differ