Commit Graph

530 Commits

Author SHA1 Message Date
Igor Gnatenko
5a3317177d invert logic to be forward-looking
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 01:17:44 +01:00
Igor Gnatenko
4b3510c3d9 add missing slash in --sphinx-build
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 01:01:21 +01:00
Igor Gnatenko
ad455e5e72 guard BR: cmake-rpm-macros by %without bootstrap
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 00:41:55 +01:00
Igor Gnatenko
45a4213d84 Conflicts was the right choice
rpm-macros doesn't require any of cmake or cmake-data. Also it makes
everything over-complicated. Conflicts is the right choice here.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 00:27:02 +01:00
Björn Esser
eaad71490d
rpm-macros: Keep cmake{,-data} in evr-lock, if they are installed 2018-01-14 17:56:22 +01:00
Björn Esser
e56b7c3eaf
rpm-macros: Use rich boolean Requires instead of Conflicts (#1532293) 2018-01-14 16:29:46 +01:00
Rex Dieter
01dbb03e4b make that cmake-data (where -rpm-macros was split from) 2018-01-13 09:25:00 -06:00
Rex Dieter
f62ee9a360 -rpm-macros: Conflicts: cmake < 3.10.1-2 (#1532293)
when new -rpm-macros subpkg was introduced, helps
avoid conflicts.
2018-01-13 09:20:49 -06:00
Sandro Mani
ad0e43afe6 Add dl to CMAKE_DL_LIBS on MINGW 2018-01-02 12:27:40 +01:00
Richard W.M. Jones
0953dfa2a7 Add small fix for RISC-V support. 2017-12-30 07:19:00 +00:00
Björn Esser
0f3e93bcc7
Rebuilt for jsoncpp.so.20 2017-12-26 09:24:09 +01:00
Björn Esser
e1bc4a625e
Bootstrapping for jsoncpp-1.8.4 2017-12-26 09:09:23 +01:00
Björn Esser
68ba4859ac
Re-add arched requires on filesystem sub-package 2017-12-21 20:02:56 +01:00
Björn Esser
b3b1c52494
Ensure we have our own rpm-macros in place during build 2017-12-21 13:54:21 +01:00
Björn Esser
b77aeb5b46
Move rpm macros to own subpackage (#1498894) 2017-12-21 13:44:45 +01:00
Björn Esser
9f464cfeb1
Update to 3.10.1 (#1526648) 2017-12-16 14:44:50 +01:00
Björn Esser
51cbbee01a
Update to 3.10.0 (#1515793) 2017-11-23 12:43:07 +01:00
Rex Dieter
df5452a402 Update to 3.9.6 2017-11-10 14:14:38 -06:00
Rex Dieter
e368746a2b silent rpm warning
if BR's aren't present, say, when generating src.rpm
2017-11-09 13:29:51 -06:00
Rex Dieter
58fa2e5bc4 Update to 3.9.5 (#1498688) 2017-11-08 14:47:42 -06:00
Petr Písař
57338c141a Disable RunCMake.CPack_RPM test
It fails if disttag contains "+" character as it happens in modular
builds.
2017-10-09 11:33:24 +02:00
Petr Písař
ba9c9d5ef5 Disable curl test because it needs the Internet
curl connects to <http://open.cdash.org/user.php>. Live network tests
are not reliable. This patch disable it.
2017-10-09 11:33:24 +02:00
Petr Písař
3c11a43a0c Allow disabling building filesystem subpackage
cmake-filesystem will be provided by Platform module, other cmake
subpackages by a separate module. Therefore the separate module cannot
provide cmake-filesystem and its packages cannot depend on exact
cmake-filesystem version-release (because release string contains
a "random" hash).

This patch adds a build-condition that allows to build cmake without
cmake-filesystem.
2017-10-09 11:33:24 +02:00
Petr Písař
8983c63ac8 Non-bootstraped build must employ cmake() generators
When building non-boostrapped cmake but with disabled some features,
cmake-data won't get into build root and cmake(FindPkg) and
cmake(UsePkg) Provides will be missing from just-built cmake-data
package. (This bug is not visible with full-fledged build because
cmake-data with the RPM dependency generator is installed
transitively).

This patch ensures that cmake-data is in the build root when not
bootstrapping.
2017-10-09 11:33:16 +02:00
Petr Písař
e0724780f7 Build-require git for optional tests
Tests, e.g. ExternalProject, either need no git command or "git
submodule" command to pass.  This is not true if git-core package is
installed without git package.
2017-09-29 14:12:16 +02:00
Pete Walter
a61d5cd9ee Update to 3.9.3 2017-09-21 08:45:59 +01:00
Petr Písař
7ad9a9f7bc Replace _module_build condition with specific macros
The _module_build condition disables all the features when building
any Modularity module. This is wrong because there are modules that want to
enable some features. Like using system libraries or enabling Qt GUI
or Spinx-generated documentation or RPM dependency generators for
cmake files.

This patch breaks the _module_build condition into various specific
bcond_with conditions defined and documented at the beginning of the
spec file.
2017-09-06 10:34:11 +02:00
Petr Písař
7b73d7e32a Specify all dependencies 2017-09-05 11:26:01 +02:00
Petr Písař
45340ec01a Escape macros in comments 2017-09-05 10:28:17 +02:00
Björn Esser
15cab722e0 Rebuilt for jsoncpp-1.8.3 2017-09-01 22:29:35 +02:00
Björn Esser
70f3c6ff8e Bootstrapping for jsoncpp-1.8.3 2017-09-01 22:21:07 +02:00
Björn Esser
4ff8fb2424 Add patch to restore old style debuginfo creation for rpm >= 4.14 in CPackRPM 2017-08-13 12:08:31 +02:00
Pete Walter
f0f9298328 Update to 3.9.1 2017-08-12 03:12:26 +01:00
Björn Esser
bb8fb23fed RunCMake.File_Generate fails on S390X, skip it temporarily 2017-08-03 12:39:42 +02:00
Björn Esser
6209eeaac2 Fix cmake.attr and cmake.req to work properly 2017-08-02 23:13:46 +02:00
Björn Esser
7cb318c85b Add cmake.req to autogenerate proper depency on cmake-filesystem 2017-08-02 18:53:08 +02:00
Björn Esser
4dec04629a Fix cmake-gui being picked up by main package 2017-08-02 14:39:20 +02:00
Björn Esser
aeac6869c0 Optimizations for filesystem-package 2017-07-30 20:27:37 +02:00
Björn Esser
907e555cfa Temporarily disable RunCMake.CPack_RPM, because it fails for the new way RPM handles debug-stuff 2017-07-28 13:03:43 +02:00
Fedora Release Engineering
1e56cb0b9c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 05:03:47 +00:00
Björn Esser
fde64f334b Add patch to fix warnings from Sphinx 2017-07-24 02:03:42 +02:00
Björn Esser
b4054d50df Update patch for Fedora RELASE-builds 2017-07-24 01:54:21 +02:00
Björn Esser
c42191b46a Some more changes to keep spec similar to EPEL CMake3 2017-07-21 13:43:06 +02:00
Björn Esser
cd2a406fbd Small changes to keep spec similar to EPEL CMake3 2017-07-20 11:48:55 +02:00
Björn Esser
434fe8b1c8 Merge branch 'master' into f26 2017-07-19 11:41:00 +02:00
Björn Esser
10f83bc2fc Update to 3.9.0 final (rhbz#1472503)
Add filesystem package (rhbz#1471153)
2017-07-19 11:38:56 +02:00
Björn Esser
7d43ac2123 Update to 3.9.0 final (rhbz#1472503)
Add filesystem package (rhbz#1471153)
2017-07-19 11:36:46 +02:00
Björn Esser
ad9039f02b Merge branch 'master' into f26 2017-06-01 12:13:01 +02:00
Björn Esser
b0e468af57 Update to 3.8.2 final (rhbz#1447473) 2017-06-01 11:30:22 +02:00
Fedora Release Engineering
d1e8a9ef63 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild 2017-05-15 20:36:25 +00:00