Update rpm-ostree to 2022.7
This commit is contained in:
parent
1800ab34b6
commit
db76f2a405
@ -1,21 +0,0 @@
|
||||
diff -Nur rpm-ostree-2018.8_old/Makefile.am rpm-ostree-2018.8/Makefile.am
|
||||
--- rpm-ostree-2018.8_old/Makefile.am 2019-04-28 15:40:35.032000000 +0800
|
||||
+++ rpm-ostree-2018.8/Makefile.am 2019-04-28 15:41:34.856000000 +0800
|
||||
@@ -30,7 +30,7 @@
|
||||
SUBDIRS += api-doc
|
||||
endif
|
||||
|
||||
-RPM_OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -e $(srcdir)/.git; then git describe --abbrev=42 --tags --always HEAD; fi)
|
||||
+RPM_OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -e $(srcdir)/.git; then echo 67cf76d85e7783b1f0007638bdad823998340338; fi)
|
||||
|
||||
ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS}
|
||||
# WITH_SWDB is a hackaround for it being used in libdnf headers
|
||||
diff -Nur rpm-ostree-2018.8_old/rust/Cargo.toml rpm-ostree-2018.8/rust/Cargo.toml
|
||||
--- rpm-ostree-2018.8_old/rust/Cargo.toml 2019-04-28 15:40:35.112000000 +0800
|
||||
+++ rpm-ostree-2018.8/rust/Cargo.toml 2019-04-28 15:41:02.988000000 +0800
|
||||
@@ -27,4 +27,4 @@
|
||||
|
||||
[profile.release]
|
||||
panic = "abort"
|
||||
-lto = true
|
||||
+lto = false
|
||||
Binary file not shown.
BIN
rpm-ostree-2022.7.tar.xz
Normal file
BIN
rpm-ostree-2022.7.tar.xz
Normal file
Binary file not shown.
@ -3,14 +3,12 @@
|
||||
%global __provides_exclude_from ^%{_libdir}/%{name}/.*$
|
||||
|
||||
Name: rpm-ostree
|
||||
Version: 2018.8
|
||||
Release: 4
|
||||
Version: 2022.7
|
||||
Release: 1
|
||||
Summary: Hybrid image/package system
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/projectatomic/rpm-ostree
|
||||
Source0: https://github.com/coreos/rpm-ostree/archive/v%{version}.tar.xz#/%{name}-%{version}.tar.xz
|
||||
|
||||
Patch0: eliminate-rpmostree-differences.patch
|
||||
Source0: https://github.com/coreos/rpm-ostree/releases/download/v2022.7/%{name}-%{version}.tar.xz
|
||||
|
||||
%if %{with rust}
|
||||
|
||||
@ -33,7 +31,8 @@ BuildRequires: gtk-doc gperf gnome-common /usr/bin/g-ir-scanner ostree-devel c
|
||||
BuildRequires: polkit-devel json-glib-devel rpm-devel libarchive-devel systemd-devel
|
||||
BuildRequires: libcap-devel libcurl-devel librepo-devel expat-devel check-devel
|
||||
BuildRequires: pkgconfig(libsolv) gcc gcc-c++
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: chrpath jq glib2-devel sqlite-devel json-c-devel cppunit-devel
|
||||
BuildRequires: libmodulemd-devel libsmartcols-devel gettext gpgme-devel make
|
||||
|
||||
Requires: ostree bubblewrap fuse
|
||||
|
||||
@ -62,14 +61,13 @@ Header files for rpm-ostree.
|
||||
|
||||
%build
|
||||
%{?rusttoolset} env NOCONFIGURE=1 ./autogen.sh
|
||||
%define _configure %{?rusttoolset} ./configure
|
||||
%configure --disable-silent-rules --enable-gtk-doc \
|
||||
%{?with_rust:--enable-rust}
|
||||
|
||||
%{?rusttoolset} %make_build
|
||||
|
||||
%install
|
||||
%{?rusttoolset} %make_install
|
||||
%{?rusttoolset} %make_install INSTALL="install -p -c"
|
||||
%delete_la
|
||||
|
||||
chrpath -d %{buildroot}%{_libdir}/librpmostree-1.so.1.0.0
|
||||
@ -80,10 +78,13 @@ echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
install -d -m 0755 %{buildroot}/etc/dbus-1/system.d/
|
||||
install -pm 0644 src/daemon/org.projectatomic.rpmostree1.conf %{buildroot}/etc/dbus-1/system.d/
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README.md
|
||||
%license COPYING
|
||||
%license COPYING.*
|
||||
%{_bindir}/*
|
||||
%{_sysconfdir}/dbus-1/system.d/*
|
||||
%{_sysconfdir}/rpm-ostreed.conf
|
||||
@ -94,6 +95,8 @@ echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
%{_prefix}/lib/systemd/system/*
|
||||
%{_datadir}/dbus-1/system-services
|
||||
%{_datadir}/polkit-1/actions/*.policy
|
||||
%{_datadir}/dbus-1/system.d/org.projectatomic.rpmostree1.conf
|
||||
%{_datadir}/bash-completion/completions/rpm-ostree
|
||||
%config(noreplace) /etc/ld.so.conf.d/*
|
||||
|
||||
%files devel
|
||||
@ -110,6 +113,9 @@ echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%changelog
|
||||
* Thu Apr 14 2022 yaoxin <yaoxin30@h-partners.com> - 2022.7-1
|
||||
- Update rpm-ostree to 2022.7
|
||||
|
||||
* Fri Sep 10 2021 gaihuiying <gaihuiying1@huawei.com> - 2018.8-4
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user