rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix cmake.attr and cmake.req to work properly

Browse Source
This commit is contained in:
Björn Esser 2017-08-02 23:10:30 +02:00
parent 7cb318c85b
commit 6209eeaac2
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake.attr
View File

@ -1,2 +1,3 @@
%__cmake_provides %{_rpmconfigdir}/cmake.prov %__cmake_provides %{_rpmconfigdir}/cmake.prov
%__cmake_path ^/usr/lib(64)?/cmake/.*/.*(Config\.cmake|-config\.cmake)$ %__cmake_requires %{_rpmconfigdir}/cmake.req
%__cmake_path ^(%{_libdir}|%{_datadir})/cmake/.*/.*(Config\.cmake|-config\.cmake)$

3
cmake.req
View File

@ -26,7 +26,6 @@
import sys import sys
import re import re
import glob
import subprocess import subprocess
class CMakeParser: class CMakeParser:
@ -44,7 +43,7 @@ class CMakeParser:
modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path) modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path)
if modulePath and cmakeModule: if modulePath and cmakeModule:
has_module = True has_module = True
if re.match("/usr/lib.*", path): if re.match(".*/usr/lib(64)?/cmake/.*", modulePath):
is_arched = True is_arched = True
if has_module: if has_module:

5
cmake.spec
View File

@ -41,7 +41,7 @@
Name: %{orig_name}%{?name_suffix} Name: %{orig_name}%{?name_suffix}
Version: %{major_version}.%{minor_version}.0 Version: %{major_version}.%{minor_version}.0
Release: 7%{?relsuf}%{?dist} Release: 8%{?relsuf}%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
# most sources are BSD # most sources are BSD
@ -443,6 +443,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Wed Aug 02 2017 Björn Esser <besser82@fedoraproject.org> - 3.9.0-8
- Fix cmake.attr and cmake.req to work properly
* Wed Aug 02 2017 Björn Esser <besser82@fedoraproject.org> - 3.9.0-7 * Wed Aug 02 2017 Björn Esser <besser82@fedoraproject.org> - 3.9.0-7
- Add cmake.req to autogenerate proper depency on cmake-filesystem - Add cmake.req to autogenerate proper depency on cmake-filesystem