Defining a macro to define the release is overkill; just use %release. This
then pulls in the disttag and fixes the broken deps
This commit is contained in:
parent
6a5cec461c
commit
c660effe67
22
lvm2.spec
22
lvm2.spec
@ -1,10 +1,9 @@
|
|||||||
%define device_mapper_version 1.02.23
|
%define device_mapper_version 1.02.23
|
||||||
%define rel 2
|
|
||||||
|
|
||||||
Summary: Userland logical volume management tools
|
Summary: Userland logical volume management tools
|
||||||
Name: lvm2
|
Name: lvm2
|
||||||
Version: 2.02.29
|
Version: 2.02.29
|
||||||
Release: %{rel}%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: http://sources.redhat.com/lvm2
|
URL: http://sources.redhat.com/lvm2
|
||||||
@ -17,7 +16,7 @@ BuildRequires: ncurses-devel
|
|||||||
BuildRequires: ncurses-static
|
BuildRequires: ncurses-static
|
||||||
BuildRequires: readline-devel, readline-static
|
BuildRequires: readline-devel, readline-static
|
||||||
BuildRequires: cman-devel
|
BuildRequires: cman-devel
|
||||||
Requires: device-mapper >= %{device_mapper_version}-%{rel}
|
Requires: device-mapper >= %{device_mapper_version}-%{release}
|
||||||
Conflicts: lvm
|
Conflicts: lvm
|
||||||
Obsoletes: lvm
|
Obsoletes: lvm
|
||||||
|
|
||||||
@ -179,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
Summary: Cluster extensions for userland logical volume management tools
|
Summary: Cluster extensions for userland logical volume management tools
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Requires: lvm2 >= %{version}-%{rel}
|
Requires: lvm2 >= %{version}-%{release}
|
||||||
Requires(post): chkconfig
|
Requires(post): chkconfig
|
||||||
Requires(preun): chkconfig
|
Requires(preun): chkconfig
|
||||||
Requires(preun): device-mapper >= %{device_mapper_version}
|
Requires(preun): device-mapper >= %{device_mapper_version}
|
||||||
@ -212,11 +211,11 @@ fi
|
|||||||
%package -n device-mapper
|
%package -n device-mapper
|
||||||
Summary: Device mapper utility
|
Summary: Device mapper utility
|
||||||
Version: %{device_mapper_version}
|
Version: %{device_mapper_version}
|
||||||
Release: %{rel}%{?dist}
|
Release: %{release}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: http://sources.redhat.com/dm
|
URL: http://sources.redhat.com/dm
|
||||||
Requires: device-mapper-libs = %{device_mapper_version}-%{rel}
|
Requires: device-mapper-libs = %{device_mapper_version}-%{release}
|
||||||
|
|
||||||
%description -n device-mapper
|
%description -n device-mapper
|
||||||
This package contains the supporting userspace utility, dmsetup,
|
This package contains the supporting userspace utility, dmsetup,
|
||||||
@ -237,11 +236,11 @@ for the kernel device-mapper.
|
|||||||
%package -n device-mapper-devel
|
%package -n device-mapper-devel
|
||||||
Summary: Development libraries and headers for device-mapper
|
Summary: Development libraries and headers for device-mapper
|
||||||
Version: %{device_mapper_version}
|
Version: %{device_mapper_version}
|
||||||
Release: %{rel}%{?dist}
|
Release: %{release}
|
||||||
License: LGPLv2.1
|
License: LGPLv2.1
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: device-mapper = %{device_mapper_version}-%{rel}
|
Requires: device-mapper = %{device_mapper_version}-%{release}
|
||||||
Requires: device-mapper-libs = %{device_mapper_version}-%{rel}
|
Requires: device-mapper-libs = %{device_mapper_version}-%{release}
|
||||||
|
|
||||||
%description -n device-mapper-devel
|
%description -n device-mapper-devel
|
||||||
This package contains files needed to develop applications that use
|
This package contains files needed to develop applications that use
|
||||||
@ -257,7 +256,7 @@ the device-mapper libraries.
|
|||||||
%package -n device-mapper-libs
|
%package -n device-mapper-libs
|
||||||
Summary: Device-mapper shared library
|
Summary: Device-mapper shared library
|
||||||
Version: %{device_mapper_version}
|
Version: %{device_mapper_version}
|
||||||
Release: %{rel}%{?dist}
|
Release: %{release}
|
||||||
License: LGPLv2.1
|
License: LGPLv2.1
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Obsoletes: device-mapper < 1.02.17-6
|
Obsoletes: device-mapper < 1.02.17-6
|
||||||
@ -274,6 +273,9 @@ This package contains the device-mapper shared library, libdevmapper.
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 6 2007 Jeremy Katz <katzj@redhat.com> - 2.02.29-3
|
||||||
|
- fix requirements
|
||||||
|
|
||||||
* Thu Dec 06 2007 Alasdair Kergon <agk@redhat.com> - 2.02.29-2
|
* Thu Dec 06 2007 Alasdair Kergon <agk@redhat.com> - 2.02.29-2
|
||||||
- Fold device-mapper build into this lvm2 spec file.
|
- Fold device-mapper build into this lvm2 spec file.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user