From 692e6a636898b8eda865dbf6f4ab185b93a791b6 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Jun 30 2020 09:41:32 +0000 Subject: Update to 5.7-rc1 Signed-off-by: Igor Raits --- diff --git a/.gitignore b/.gitignore index d1e3abc..b3aae63 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /btrfs-progs-v5.4.tar.xz /btrfs-progs-v5.6.tar.xz /btrfs-progs-v5.6.1.tar.xz +/btrfs-progs-v5.7-rc1.tar.xz diff --git a/btrfs-progs.spec b/btrfs-progs.spec index 532f0b8..06ea1f3 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,59 +1,56 @@ # Disable for now until version handling question is dealt with %bcond_with python -Name: btrfs-progs -Version: 5.6.1 -Release: 2%{?dist} -Summary: Userspace programs for btrfs - -License: GPLv2 -URL: http://btrfs.wiki.kernel.org/index.php/Main_Page -Source0: https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version}.tar.xz - - -BuildRequires: gcc, autoconf, automake -BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel, libzstd-devel -BuildRequires: libacl-devel, libblkid-devel, lzo-devel -BuildRequires: asciidoc, xmlto +Name: btrfs-progs +Version: 5.7~rc1 +Release: 1%{?dist} +Summary: Userspace programs for btrfs + +License: GPLv2 +URL: https://btrfs.wiki.kernel.org/index.php/Main_Page +Source0: https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version_no_tilde}.tar.xz + +BuildRequires: gcc, autoconf, automake +BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel, libzstd-devel +BuildRequires: libacl-devel, libblkid-devel, lzo-devel +BuildRequires: asciidoc, xmlto BuildRequires: systemd %if %{with python} BuildRequires: python3-devel >= 3.4 %endif -%define _root_sbindir /sbin - %description The btrfs-progs package provides all the userspace programs needed to create, check, modify and correct any inconsistencies in the btrfs filesystem. %package -n libbtrfs -Summary: btrfs filesystem-specific runtime libraries -License: GPLv2 +Summary: btrfs filesystem-specific runtime libraries +License: GPLv2 # This was not properly split out before -Conflicts: %{name} < 4.20.2 +Conflicts: %{name} < 4.20.2 %description -n libbtrfs libbtrfs contains the main library used by btrfs filesystem-specific programs. %package -n libbtrfsutil -Summary: btrfs filesystem-specific runtime utility libraries -License: LGPLv3 +Summary: btrfs filesystem-specific runtime utility libraries +License: LGPLv3 # This was not properly split out before -Conflicts: %{name}-devel < 4.20.2 +Conflicts: %{name}-devel < 4.20.2 %description -n libbtrfsutil libbtrfsutil contains an alternative utility library used by btrfs filesystem-specific programs. %package devel -Summary: btrfs filesystem-specific libraries and headers +Summary: btrfs filesystem-specific libraries and headers # libbtrfsutil is LGPLv3 -License: GPLv2 and LGPLv3 -Requires: %{name} = %{version}-%{release} -Requires: libbtrfs%{?_isa} = %{version}-%{release} -Requires: libbtrfsutil%{?_isa} = %{version}-%{release} +License: GPLv2 and LGPLv3 +Requires: %{name} = %{version}-%{release} +Requires: libbtrfs%{?_isa} = %{version}-%{release} +Requires: libbtrfsutil%{?_isa} = %{version}-%{release} %description devel btrfs-progs-devel contains the libraries and header files needed to @@ -68,9 +65,9 @@ btrfs filesystem-specific programs. %if %{with python} %package -n python3-btrfsutil -Summary: Python 3 bindings for libbtrfsutil -License: LGPLv3 -Requires: libbtrfsutil%{?_isa} = %{version}-%{release} +Summary: Python 3 bindings for libbtrfsutil +License: LGPLv3 +Requires: libbtrfsutil%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python3-btrfsutil} %description -n python3-btrfsutil @@ -82,12 +79,12 @@ btrfs filesystem-specific programs in Python. %endif %prep -%autosetup -n %{name}-v%{version} +%autosetup -n %{name}-v%{version_no_tilde} %build ./autogen.sh %configure CFLAGS="%{optflags} -fno-strict-aliasing" %{!?with_python:--disable-python} -make %{?_smp_mflags} +%make_build %if %{with python} pushd libbtrfsutil/python @@ -96,9 +93,9 @@ popd %endif %install -make mandir=%{_mandir} bindir=%{_sbindir} libdir=%{_libdir} incdir=%{_includedir} install DESTDIR=%{buildroot} +%make_install mandir=%{_mandir} bindir=%{_sbindir} libdir=%{_libdir} incdir=%{_includedir} # Nuke the static lib -rm -f %{buildroot}/%{_libdir}/*.a +rm -v %{buildroot}%{_libdir}/*.a %if %{with python} pushd libbtrfsutil/python @@ -143,6 +140,9 @@ popd %endif %changelog +* Tue Jun 30 2020 Igor Raits - 5.7~rc1-1 +- Update to 5.7-rc1 + * Mon Jun 15 2020 Igor Raits - 5.6.1-2 - Rebuild diff --git a/sources b/sources index ae34769..aa99ed9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (btrfs-progs-v5.6.1.tar.xz) = 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6 +SHA512 (btrfs-progs-v5.7-rc1.tar.xz) = 9b3376bf0f1ff94b787de6fdd4086957d222657cdb83d1e418ceae1d99e71fa03f2943eee207cacab59005ae87d8e71bf4bb345876d6029054a87cc238280ac0