From 45a9b01e514c263d5066df6bef67493e4e299fbb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 19 2017 14:33:34 +0000 Subject: import ostree-2017.11-1.el7 --- diff --git a/.gitignore b/.gitignore index 51ebfb1..bc21da4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libostree-2017.7.tar.xz +SOURCES/libostree-2017.11.tar.xz diff --git a/.ostree.metadata b/.ostree.metadata index bf3752d..e0d85dd 100644 --- a/.ostree.metadata +++ b/.ostree.metadata @@ -1 +1 @@ -df41cef0accf16436764c7b87d000cbe5cefb8f0 SOURCES/libostree-2017.7.tar.xz +ad593b2a01f4338d1cd78a78b61f1e2d112873d3 SOURCES/libostree-2017.11.tar.xz diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec index babb07b..42a9125 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -1,6 +1,6 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2017.7 +Version: 2017.11 Release: 1%{?dist} #VCS: git:https://github.com/ostreedev/ostree # The source tarball is generated via make -C packaging dist-snapshot @@ -18,6 +18,8 @@ BuildRequires: autoconf automake libtool BuildRequires: gtk-doc # Core requirements BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: libattr-devel # Extras @@ -88,7 +90,8 @@ env NOCONFIGURE=1 ./autogen.sh %configure --disable-silent-rules \ --enable-gtk-doc \ --with-selinux \ - --enable-libsoup-client-certs \ + --with-curl \ + --with-openssl \ --with-dracut=yesbutnoconf make %{?_smp_mflags} @@ -96,6 +99,8 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" find $RPM_BUILD_ROOT -name '*.la' -delete install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-preset/91-ostree.preset +# Right now we aren't doing installed tests here +rm -f %{buildroot}%{_libexecdir}/libostree/ostree-trivial-httpd %clean rm -rf $RPM_BUILD_ROOT @@ -107,10 +112,13 @@ rm -rf $RPM_BUILD_ROOT %systemd_preun ostree-remount.service %files -%doc COPYING README.md +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc README.md %{_bindir}/ostree %{_datadir}/ostree/trusted.gpg.d %{_sysconfdir}/ostree +%{_datadir}/bash-completion/completions/* %dir %{_prefix}/lib/dracut/modules.d/98ostree %{_prefix}/lib/systemd/system/ostree*.service %{_prefix}/lib/dracut/modules.d/98ostree/* @@ -123,6 +131,7 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libexecdir}/libostree/grub2* %{_prefix}/lib/ostree/ostree-prepare-root %{_prefix}/lib/ostree/ostree-remount +%{_prefix}/lib/tmpfiles.d/* %{_libexecdir}/libostree/* %files fuse @@ -132,7 +141,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so %{_includedir}/* %{_libdir}/pkgconfig/* -%dir %{_datadir}/gtk-doc/html/ostree %{_datadir}/gtk-doc/html/ostree %{_datadir}/gir-1.0/OSTree-1.0.gir @@ -143,10 +151,17 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 25 2017 Jonathan Lebon - 2017.11-1 +- New upstream version for 7.4.2 + +* Mon Aug 21 2017 Colin Walters - 2017.10-2 +- Switch to libcurl + Resolves: #1444903 + * Mon Jun 19 2017 Colin Walters - 2017.7-1 - New upstream version for 7.4 -* Tue Jun 05 2017 Jonathan Lebon - 2017.6-3 +* Tue Jun 06 2017 Jonathan Lebon - 2017.6-3 - Add versioned runtime req on glib2 (RHBZ#1371704) * Mon May 22 2017 Colin Walters - 2017.6-2 @@ -313,11 +328,11 @@ rm -rf $RPM_BUILD_ROOT * Mon Sep 09 2013 Colin Walters - 2013.6-1 - New upstream release -* Sat Aug 25 2013 Colin Walters - 2013.5-3 +* Sat Aug 24 2013 Colin Walters - 2013.5-3 - And actually while we are here, drop all the embedded dependency goop from this spec file; it may live on in the EPEL branch. -* Sat Aug 25 2013 Colin Walters - 2013.5-2 +* Sat Aug 24 2013 Colin Walters - 2013.5-2 - Drop requirement on linux-user-chroot We now require triggers to be processed on the build server by default, so ostree does not runtime-depend on linux-user-chroot.