Commit Graph

400 Commits

Author SHA1 Message Date
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
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
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
Fedora Release Engineering
ef2992de5f - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild 2017-05-15 20:36:20 +00:00
Orion Poplawski
892d022be2 Update to 3.8.1 final 2017-05-02 16:53:49 -06:00
Orion Poplawski
389edecb94 Add upstream patch to fix FindGLUT library dependencies (bug #1444563) 2017-04-28 13:51:44 -06:00
Karsten Hopp
72fa0d4948 use new _module_build macro to limit dependencies for Modularity 2017-04-21 12:17:17 +02:00
Orion Poplawski
60fdc9ca73 Update to 3.8.0 final 2017-04-10 12:58:37 -06:00
Orion Poplawski
3e5e7a4aee Update to 3.8.0-rc3
Add upstream patch to support rpm build-id dirs
2017-03-27 09:05:49 -06:00
Orion Poplawski
9338710aca Update to 3.8.0-rc2 2017-03-20 21:40:49 -06:00
Orion Poplawski
10e7a4e0f4 Add patch to handle gcc format option changes 2017-02-27 11:30:06 -07:00
Rex Dieter
8f3879e81d Fix ambiguous file lookup in cmake.prov
Don't use glob to lookup cmake config file, because there can
be multiple matches and we might accidentally pick the wrong one.
Instead just work with the filepath passed to us via stdin.
2017-02-20 10:17:02 -06:00
Orion Poplawski
72646fef46 Fix cmake.prov error 2017-02-09 11:24:13 -07:00
Orion Poplawski
ad2cd5b89b Update to 3.7.2 2017-01-13 20:21:52 -07:00
Charalampos Stratakis
aebd6dde35 Rebuild for Python 3.6 2016-12-13 15:26:38 +01:00
Orion Poplawski
2ab55113c8 Update to 3.7.1 2016-11-30 21:13:46 -07:00
Orion Poplawski
3f7549751e Update to 3.7.0 final 2016-11-12 07:38:22 -07:00
Orion Poplawski
3e0543c73f Update to 3.7.0-rc3 2016-11-04 18:01:25 -06:00
Orion Poplawski
e6cfdefbc5 Update to 3.7.0-rc2 2016-10-19 21:14:07 -06:00
Orion Poplawski
8e2a2daaf8 Update to 3.7.0-rc1
- Drop gui, findjni, and riscv patches applied upstream
2016-10-06 15:50:18 -06:00
Björn Esser
c50f25796e Rebuilt with gui enabled 2016-10-03 07:08:37 +02:00
Björn Esser
62d0f3cc32 Bootstrap without gui, due inter-circular dependency in qt5-rpm-macros 2016-10-03 06:49:49 +02:00
Björn Esser
23958a5bb4 Rebuilt for libjsoncpp.so.11 2016-10-03 05:47:26 +02:00
Björn Esser
01775a1307 add compatibility for el6 2016-10-03 05:40:03 +02:00
Richard W.M. Jones
82b4873ab4 Backport upstream RISC-V support.
This is a trivial backport of an upstream patch:

12f000d5b7
2016-09-27 15:53:40 +01:00
Orion Poplawski
a297e21a36 Bump release 2016-09-26 21:49:38 -06:00
Orion Poplawski
3c531e141a Add upstream patch for Qt5 QFileDialog usage 2016-09-26 21:48:50 -06:00
Than Ngo
4f3147d1f4 apply the patch 2016-09-26 16:15:51 +02:00
Than Ngo
305eda7637 Add aarch32 to libarch for arm platform 2016-09-26 16:15:14 +02:00
Orion Poplawski
5e0ae9df7c Provide the major version cmakeX name 2016-09-12 16:07:06 -06:00
Orion Poplawski
bf26fed88d Update to 3.6.2 2016-09-08 09:45:26 -06:00
Orion Poplawski
3476b700ee Do not provide cmake in cmakeX 2016-09-08 09:05:03 -06:00
Orion Poplawski
3bac96b089 Ship symlinks to binaries with major version in name
- Provide %cmakeX macro, where X is cmake major version
2016-08-17 11:07:59 -06:00
Orion Poplawski
f6068065ea Update to 3.6.1 2016-07-25 16:32:04 -06:00
Orion Poplawski
482644acff Update to 3.6.0 2016-07-08 07:39:41 -06:00
Orion Poplawski
08e14f95d5 Update to 3.6.0-rc4 2016-06-29 14:50:20 -06:00
Orion Poplawski
5450a4f066 Add patch to support libarchive 3.2 2016-06-03 10:19:26 -06:00
Than Ngo
7d0c60e2ef drop -O3 and add -O2 for default release 2016-06-02 14:05:49 +02:00
Björn Esser
9f00df0cc2 use macro instead of hardcoded name 2016-04-22 10:08:26 +02:00
Orion Poplawski
ad7513ae29 Do not own /usr/lib/rpm/fileattrs 2016-04-21 10:40:18 -06:00
Björn Esser
63f81dc8f7 fix %%changelog 2016-04-16 07:39:32 +02:00
Orion Poplawski
0461421929 Update to 3.5.2 final 2016-04-15 18:57:07 -06:00
Björn Esser
d1d955e2de Rebuilt for libjsoncpp.so.1 2016-03-25 13:57:29 +01:00
Björn Esser
c05e6542dc Update to 3.5.1 (#1321198) 2016-03-25 09:32:55 +01:00
Björn Esser
3e7824e73e fix emacs-filesystem requires for epel6 2016-03-11 13:59:54 +01:00
Björn Esser
fde2ae1586 add conditional for epel6 2016-03-11 11:35:21 +01:00
Björn Esser
358d5037ae keep Help-directory and its contents in %%_datadir/%%name (#1316306) 2016-03-10 08:14:14 +01:00
Björn Esser
53adb49344 do not provide cmake = %%{version} on EPEL 2016-03-09 15:10:30 +01:00
Orion Poplawski
de26f88046 Update to 3.5.0 final 2016-03-08 19:19:57 -07:00
Björn Esser
e1335d4bc5 cleanup trailing whitespaces
remove el5 stuff
doc-subpkg should be noarch'ed
doc-subpkg should not require main-pkg
add %%{?_isa} to the applicable Requires
replaced %%define with %%global
handle macrosdir for rpm-macros properly
fix ownership of directories, add needed Requires
conditionalize appdata
handle docdir properly
generalize glob for man-pages independent of used compression
generalize for use as EPEL-package, too
use %%license instead of %%doc for license-files
split the common data-files into a noarch'ed subpackage
build html-docs and put them into the doc-subpkg
2016-03-07 22:50:37 +01:00
Orion Poplawski
026befaf78 3.5.0-rc2 no longer installs cmake-gui.1 if not building gui 2016-03-03 17:21:15 -07:00
Orion Poplawski
a095a5694a Update to 3.5.0-rc3 2016-02-20 19:27:11 -07:00
Orion Poplawski
d9dd44f586 Update to 3.5.0-rc2
- Drop dcmtk patch
2016-02-17 09:59:14 -07:00
Orion Poplawski
c17782d9ef Fix build without gui (bug #1305310) 2016-02-07 16:26:49 -07:00
Dennis Gilmore
eff08abe86 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 17:49:26 +00:00
Orion Poplawski
55a452d7d9 Update to 3.4.3 2016-01-25 18:36:08 -07:00
Orion Poplawski
256d595c98 Update to 3.4.2 2016-01-19 18:41:13 -07:00
Ville Skyttä
586c872b46 Use Python 3 on F-23+ 2015-12-12 19:17:40 +02:00