|
 |
aada13 |
From d05b447617084bbd9672aa60d5cba290508956b8 Mon Sep 17 00:00:00 2001
|
|
|
aada13 |
From: David Lehman <dlehman@redhat.com>
|
|
|
aada13 |
Date: Mon, 25 Mar 2019 14:30:36 -0400
|
|
|
aada13 |
Subject: [PATCH 2/8] Adjust rpm spec file to new blivet3 name.
|
|
|
aada13 |
|
|
|
aada13 |
---
|
|
|
aada13 |
python-blivet.spec | 18 +++++++-----------
|
|
|
aada13 |
1 file changed, 7 insertions(+), 11 deletions(-)
|
|
|
aada13 |
|
|
|
aada13 |
diff --git a/python-blivet.spec b/python-blivet.spec
|
|
|
aada13 |
index 0f20e499..883ba9b8 100644
|
|
|
aada13 |
--- a/python-blivet.spec
|
|
|
aada13 |
+++ b/python-blivet.spec
|
|
|
aada13 |
@@ -17,7 +17,7 @@
|
|
|
aada13 |
%endif
|
|
|
aada13 |
|
|
|
aada13 |
Summary: A python module for system storage configuration
|
|
|
aada13 |
-Name: python-blivet
|
|
|
aada13 |
+Name: python-blivet3
|
|
|
aada13 |
Url: https://storageapis.wordpress.com/projects/blivet
|
|
|
aada13 |
Version: 3.1.3
|
|
|
aada13 |
|
|
|
aada13 |
@@ -27,9 +27,9 @@ Release: 1%{?prerelease}%{?dist}
|
|
|
aada13 |
Epoch: 1
|
|
|
aada13 |
License: LGPLv2+
|
|
|
aada13 |
Group: System Environment/Libraries
|
|
|
aada13 |
-%global realname blivet
|
|
|
aada13 |
+%global realname blivet3
|
|
|
aada13 |
%global realversion %{version}%{?prerelease}
|
|
|
aada13 |
-Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}.tar.gz
|
|
|
aada13 |
+Source0: http://github.com/storaged-project/blivet/archive/blivet-%{realversion}.tar.gz
|
|
|
aada13 |
|
|
|
aada13 |
# Versions of required components (done so we make sure the buildrequires
|
|
|
aada13 |
# match the requires versions of things).
|
|
|
aada13 |
@@ -51,9 +51,6 @@ Summary: Data for the %{realname} python module.
|
|
|
aada13 |
|
|
|
aada13 |
BuildRequires: systemd
|
|
|
aada13 |
|
|
|
aada13 |
-Conflicts: python-blivet < 1:2.0.0
|
|
|
aada13 |
-Conflicts: python3-blivet < 1:2.0.0
|
|
|
aada13 |
-
|
|
|
aada13 |
%description -n %{realname}-data
|
|
|
aada13 |
The %{realname}-data package provides data files required by the %{realname}
|
|
|
aada13 |
python module.
|
|
|
aada13 |
@@ -75,19 +72,19 @@ Requires: parted >= %{partedver}
|
|
|
aada13 |
Requires: python3-pyparted >= %{pypartedver}
|
|
|
aada13 |
Requires: libselinux-python3
|
|
|
aada13 |
Requires: python3-blockdev >= %{libblockdevver}
|
|
|
aada13 |
+%if 0%{?rhel} > 7 || 0%{?fedora}
|
|
|
aada13 |
Recommends: libblockdev-btrfs >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-crypto >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-dm >= %{libblockdevver}
|
|
|
aada13 |
-Recommends: libblockdev-fs >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-kbd >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-loop >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-lvm >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-mdraid >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-mpath >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-nvdimm >= %{libblockdevver}
|
|
|
aada13 |
-Recommends: libblockdev-part >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-swap >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-s390 >= %{libblockdevver}
|
|
|
aada13 |
+%endif
|
|
|
aada13 |
Requires: python3-bytesize >= %{libbytesizever}
|
|
|
aada13 |
Requires: util-linux >= %{utillinuxver}
|
|
|
aada13 |
Requires: lsof
|
|
|
aada13 |
@@ -126,6 +123,7 @@ Requires: parted >= %{partedver}
|
|
|
aada13 |
Requires: python2-pyparted >= %{pypartedver}
|
|
|
aada13 |
Requires: python2-libselinux
|
|
|
aada13 |
Requires: python2-blockdev >= %{libblockdevver}
|
|
|
aada13 |
+%if 0%{?rhel} > 7 || 0%{?fedora}
|
|
|
aada13 |
Recommends: libblockdev-btrfs >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-crypto >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-dm >= %{libblockdevver}
|
|
|
aada13 |
@@ -139,6 +137,7 @@ Recommends: libblockdev-nvdimm >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-part >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-swap >= %{libblockdevver}
|
|
|
aada13 |
Recommends: libblockdev-s390 >= %{libblockdevver}
|
|
|
aada13 |
+%endif
|
|
|
aada13 |
Requires: python2-bytesize >= %{libbytesizever}
|
|
|
aada13 |
Requires: util-linux >= %{utillinuxver}
|
|
|
aada13 |
Requires: lsof
|
|
|
aada13 |
@@ -148,9 +147,6 @@ Requires: %{realname}-data = %{epoch}:%{version}-%{release}
|
|
|
aada13 |
Requires: systemd-udev
|
|
|
aada13 |
Requires: python2-gobject-base
|
|
|
aada13 |
|
|
|
aada13 |
-Obsoletes: blivet-data < 1:2.0.0
|
|
|
aada13 |
-Obsoletes: python-blivet < 1:2.0.0
|
|
|
aada13 |
-
|
|
|
aada13 |
%description -n python2-%{realname}
|
|
|
aada13 |
The python2-%{realname} is a python2 package for examining and modifying storage
|
|
|
aada13 |
configuration.
|
|
|
aada13 |
--
|
|
|
aada13 |
2.17.2
|
|
|
aada13 |
|