remove useless foreign_filesystem bcond
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
deed0a56c7
commit
e0b59b2512
16
cmake.spec
16
cmake.spec
@ -12,9 +12,6 @@
|
|||||||
# Build with Emacs support
|
# Build with Emacs support
|
||||||
%bcond_without emacs
|
%bcond_without emacs
|
||||||
|
|
||||||
# Use foreign cmake-filesystem package instead of building it here
|
|
||||||
%bcond_with foreign_filesystem
|
|
||||||
|
|
||||||
# Run git tests
|
# Run git tests
|
||||||
%bcond_without git_test
|
%bcond_without git_test
|
||||||
|
|
||||||
@ -173,12 +170,7 @@ BuildRequires: %{name}-rpm-macros
|
|||||||
|
|
||||||
Requires: %{name}-data = %{version}-%{release}
|
Requires: %{name}-data = %{version}-%{release}
|
||||||
Requires: %{name}-rpm-macros = %{version}-%{release}
|
Requires: %{name}-rpm-macros = %{version}-%{release}
|
||||||
|
|
||||||
%if %{with foreign_filesystem}
|
|
||||||
Requires: %{name}-filesystem%{?_isa}
|
|
||||||
%else
|
|
||||||
Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
|
Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
|
||||||
%endif
|
|
||||||
|
|
||||||
# Provide the major version name
|
# Provide the major version name
|
||||||
Provides: %{orig_name}%{major_version} = %{version}-%{release}
|
Provides: %{orig_name}%{major_version} = %{version}-%{release}
|
||||||
@ -202,11 +194,7 @@ generation, code generation, and template instantiation.
|
|||||||
%package data
|
%package data
|
||||||
Summary: Common data-files for %{name}
|
Summary: Common data-files for %{name}
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
%if %{with foreign_filesystem}
|
|
||||||
Requires: %{name}-filesystem
|
|
||||||
%else
|
|
||||||
Requires: %{name}-filesystem = %{version}-%{release}
|
Requires: %{name}-filesystem = %{version}-%{release}
|
||||||
%endif
|
|
||||||
Requires: %{name}-rpm-macros = %{version}-%{release}
|
Requires: %{name}-rpm-macros = %{version}-%{release}
|
||||||
%if %{with emacs}
|
%if %{with emacs}
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
@ -228,13 +216,11 @@ BuildArch: noarch
|
|||||||
This package contains documentation for %{name}.
|
This package contains documentation for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%if !%{with foreign_filesystem}
|
|
||||||
%package filesystem
|
%package filesystem
|
||||||
Summary: Directories used by CMake modules
|
Summary: Directories used by CMake modules
|
||||||
|
|
||||||
%description filesystem
|
%description filesystem
|
||||||
This package owns all directories used by CMake modules.
|
This package owns all directories used by CMake modules.
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with gui}
|
%if %{with gui}
|
||||||
@ -489,9 +475,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||||||
%doc %{_pkgdocdir}
|
%doc %{_pkgdocdir}
|
||||||
|
|
||||||
|
|
||||||
%if !%{with foreign_filesystem}
|
|
||||||
%files filesystem -f data_dirs.mf -f lib_dirs.mf
|
%files filesystem -f data_dirs.mf -f lib_dirs.mf
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with gui}
|
%if %{with gui}
|
||||||
|
Loading…
Reference in New Issue
Block a user