Commit Graph

166 Commits

Author SHA1 Message Date
Jens Petersen 07fccfd9a1 add comment about for unbootstrapping hscolour; add test-rebuild script for testing changes
so far script gives diffs of requires and provides
2012-10-05 18:55:03 +09:00
Jens Petersen 5d116cb4cc no need to BR hscolour 2012-09-20 12:05:40 +09:00
Jens Petersen a23376405b fix broken duplicate hash output for haskell-platform binaries when locally installed 2012-09-19 20:00:54 +09:00
Jens Petersen e330117e14 fix missing %endif 2012-09-08 21:25:38 +09:00
Jens Petersen b95424a06b ghc-rpm-macros now requires hscolour so packages no longer need to BR it
- this can be disabled for bootstrapping by setting without_hscolour
2012-09-08 21:18:30 +09:00
Jens Petersen befa5e103e make haddock build hoogle files, no longer need to disable building ghci lib files 2012-08-24 22:23:20 +09:00
Jens Petersen ae161ab66c update the upstream comment in the spec file 2012-07-26 16:04:01 +09:00
Dennis Gilmore 1d2eebf689 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 00:59:27 -05:00
Jens Petersen ac776c377e provide doc from devel again to silence rpmlint warning 2012-06-25 11:58:19 +09:00
Jens Petersen 20cbe43332 cabal-tweak-dep-ver: match complete dep name and not beyond "," 2012-06-22 17:03:46 +09:00
Jens Petersen 59008edb14 cabal-tweak-dep-ver: make a backup file the first time 2012-06-22 15:21:43 +09:00
Jens Petersen 1cb0fba5fb cabal-tweak-dep-ver: quote wildcards in match string and show file name when no match 2012-06-22 14:47:51 +09:00
Jens Petersen 7cdea6ff7e replace %cabal_tweak_dep_ver with cabal-tweak-dep-ver script
rpmbuild doesn't handle spaces in quoted args
2012-06-22 13:46:59 +09:00
Jens Petersen 8a8de3a39a new cabal_tweak_dep_ver macro for tweaking versions of depends
%cabal_tweak_dep_ver dep old new [backup]
changes old version bound to new for dep with optional backup suffix

eg %cabal_tweak_dep_ver haskell-src-exts 1.12 1.14 2
2012-06-22 12:49:41 +09:00
Jens Petersen 8e22621418 ghc-dep.sh: only use buildroot package.conf.d if it exists 2012-06-09 22:00:32 +09:00
Jens Petersen 1b8536abf1 ghc-deps.sh: look in buildroot package.conf.d for program deps 2012-06-08 14:00:43 +09:00
Jens Petersen c013051271 add a meta-package option to ghc_devel_package and use in ghc_devel_requires 2012-06-08 11:53:40 +09:00
Jens Petersen dae8fa2606 let ghc_bin_install take an arg to disable implicit stripping for subpackages 2012-06-07 20:14:06 +09:00
Jens Petersen fa247e69af ghc_description, ghc_devel_description, ghc_devel_post_postun can take args 2012-06-07 19:32:38 +09:00
Jens Petersen bbc5f8f364 fix doc handling of subpackages for ghc_without_shared 2012-06-07 17:15:42 +09:00
Jens Petersen 8fc16e2daa without ghc_exclude_docdir include doc dir also for subpackages 2012-06-07 15:00:29 +09:00
Jens Petersen 64b3d676b2 add changelog for previous commit: --disable-library-for-ghci and common_summary 2012-06-07 11:15:52 +09:00
Jens Petersen 88a603f537 disable generating ghci .o files by default; add variable cabal_configure_extra_options to cabal_configure 2012-06-05 19:16:29 +09:00
Jens Petersen 5abcaaca33 add ghc_lib_build_without_haddock; no longer drop into subpackage dirs 2012-06-05 11:40:54 +09:00
Jens Petersen 89972ec757 add changelog about rename ghc_binlib_package to ghc_lib_subpackage 2012-05-25 23:58:01 +09:00
Jens Petersen 6b6cf52f6d don't build .o when no ghci; support meta-packages; optional common_summary and common_description
- only  build ghci .o library files on ghc_arches_with_ghci
- support meta packages like haskell-platform without base lib files
- make it possible not to have to use common_summary and common_description
2012-05-25 22:10:06 +09:00
Jens Petersen 7ffdbdc6d5 change of rpm metadata hash format for new ghc-7.4
- drop prof meta hash data
- no longer include doc files automatically by default
- no longer provide doc subpackage
- do not provide prof when without_prof set
2012-03-21 17:41:59 +09:00
Jens Petersen 8cf968c984 fix handling of devel docdir for non-shared builds
- simplify ghc_bootstrap
2012-02-23 18:10:50 +09:00
Jens Petersen ab41e2f6c8 allow dynamic linking of Setup with ghc_without_shared set 2012-01-19 18:33:08 +09:00
Jens Petersen 488948b8d7 clarify changelog to mention filelist 2012-01-06 22:57:28 +09:00
Jens Petersen fe1a0f23ee ghc_add_basepkg_file adds path to base lib package filelist 2012-01-06 22:56:31 +09:00
Jens Petersen 2089fc7bf1 add ghc_devel_post_postun to help koji 2011-12-28 12:05:32 +09:00
Jens Petersen 19872dc6fe add ghc_package, ghc_description, ghc_devel_package, ghc_devel_description 2011-12-27 23:50:55 +09:00
Jens Petersen 227b33e94e bump to 0.15 2011-12-27 15:08:53 +09:00
Jens Petersen 683aba9d80 new ghc_files wrapper macro which takes base doc files as args
- uses new ghc_shared_files and ghc_devel_files macros
2011-12-27 09:57:08 +09:00
Jens Petersen 72e5db37b5 use ghc system config when compiling Setup; don't setup hscolour if without_hscolour 2011-12-02 22:20:12 +09:00
Jens Petersen d32b4577e8 test for HsColour directly in "cabal haddock" instead of using without_haddock 2011-11-17 14:36:50 +09:00
Jens Petersen b1204c472c fix double listing of docdir in base lib package 2011-11-12 21:59:12 +09:00
Jens Petersen fb65ca3a00 also disable testsuite in ghc_bootstrap 2011-11-01 21:24:30 +09:00
Jens Petersen 7229f10396 replace devel ghc requires with ghc-compiler 2011-11-01 21:18:49 +09:00
Jens Petersen 0b163b3d06 add ghc_bootstrapping to ghc_bootstrap; fix ghc-deps.sh when bootstrapping 2011-10-18 17:43:47 +09:00
Jens Petersen bd7f38e058 add ghc_exclude_docdir to exclude docdir from filelists 2011-10-15 13:01:58 +09:00
Jens Petersen fb1984734b fix devel subpackage's prof and doc obsoletes and provides versions 2011-09-30 10:43:58 +09:00
Jens Petersen 5995766e80 don't use ghc-deps.sh when ghc_bootstrapping; add %ghc_test config 2011-09-13 10:14:17 +09:00
Jens Petersen dfb8f0169d drop without_testsuite from ghc_bootstrap since it breaks koji 2011-08-03 17:14:24 +09:00
Jens Petersen f0b5c1b565 drop defattr's; move depgen setup to ghc_lib_install 2011-07-01 13:54:49 +09:00
Jens Petersen 283779dff1 requires redhat-rpm-config for ghc_arches 2011-06-27 11:55:16 +09:00
Jens Petersen 4773ef18ac ghc_bootstrap: add ghc_without_dynamic and drop without_hscolour 2011-06-17 17:55:06 +09:00
Jens Petersen e6a0b6cbfe change ghc_bootstrap to a macro that disables shared and prof libs, docs, and testsuite
- ghc_bootstrap is now a macro which sets ghc_bootstrapping,
  ghc_without_shared, without_prof, without_haddock, without_hscolour,
  without_manual, without_testsuite
- tweaks to ghc_check_bootstrap
2011-06-17 17:00:17 +09:00
Jens Petersen ed9a00f761 add ghc_check_bootstrap 2011-06-17 12:29:21 +09:00
Jens Petersen 232d0166b5 rename back to macros.ghc again; revert previous devel summary ordering change 2011-06-02 13:35:47 +09:00
Jens Petersen 4b65f2f48e move macros back to /etc/rpm and add %macro_file 2011-05-28 15:02:35 +09:00
Jens Petersen e29cbf2a99 fix the file for macros.ghc move 2011-05-28 12:39:44 +09:00
Jens Petersen da128f954a move macros.ghc to /usr/lib/rpm to avoid conflict with redhat-rpm-config 2011-05-28 12:19:35 +09:00
Jens Petersen 1bc67af711 merge prof subpackages into devel to simplify packaging 2011-05-16 10:58:56 +09:00
Jens Petersen eab5583c0d include ghc_pkg_c_deps even when -c option used 2011-05-09 18:56:37 +09:00
Jens Petersen 8af86b797a drop ghc_pkg_deps from ghc_package_devel and ghc_package_prof 2011-05-08 23:09:07 +09:00
Jens Petersen cbf3d70e56 provides ghc-*-doc still needed for current lib templates 2011-04-01 16:54:19 +09:00
Jens Petersen cd30bb3547 check PKGBASEDIR, ghc bootstrapping, ghc_reindex_haddock nop, drop ghc-*-doc provides
- ghc-deps.sh: check PKGBASEDIR exists to avoid warning for bin package
- abort cabal_configure if ghc is not self-bootstrapped
- make ghc_reindex_haddock a safe no-op
- no longer provide ghc-*-doc
- no longer run ghc_reindex_haddock in ghc-*-devel scripts
2011-03-28 15:57:59 +09:00
Jens Petersen 82b34c5629 add ghc_pkg_obsoletes to shared lib package too 2011-03-10 15:02:39 +09:00
Jens Petersen 30ceea2628 add docdir when subpackaging packages too 2011-03-09 15:12:41 +09:00
Jens Petersen c9936dc158 subminor version bump 2011-02-13 02:11:03 +10:00
Jens Petersen b2d74bab08 fix the defines of ghc_without_dynamic and ghc_without_shared 2011-02-13 02:10:18 +10:00
Jens Petersen 75e22924a6 fix macro.ghc path for cat 2011-02-13 01:19:40 +10:00
Jens Petersen 2c0b10d5d5 disable shared and dynamic on secondary archs
- this package is now arch-dependent
- rename without_shared to ghc_without_shared and without_dynamic
  to ghc_without_dynamic so that they can be globally defined for
  secondary archs without shared libs
- use %%undefined macro
- disable debug_package in ghc_bin_build and ghc_lib_build
- set ghc_without_shared and ghc_without_dynamic on secondary
  (ie non main intel archs)
- disable debuginfo for self
2011-02-13 01:07:05 +10:00
Jens Petersen 26005406d3 revert setting without_shared and without_dynamic on secondary archs 2011-02-11 01:50:04 +10:00
Jens Petersen 30f51fc80d more non-shared fixes to avoid dynamic and shared on secondary archs
- only link Setup dynamically if without_shared and without_dynamic not set
- set without_shared and without_dynamic by default on secondary archs
  in cabal_bin_build and cabal_lib_build
- add cabal_configure_options to pass extra options to cabal_configure
2011-02-11 00:33:37 +10:00
Jens Petersen 1f4312aeaa fix ghc-deps.sh for without_shared libraries 2011-02-10 22:11:02 +10:00
Dennis Gilmore ee9ff3e826 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 19:31:55 -06:00
Jens Petersen 876ea626db simplify adding shared subpackage license file; own ghc-deps.sh not /usr/lib/rpm 2011-01-29 22:34:52 +10:00
Jens Petersen a1abcaaa78 add rpm hash requires for dynamic executables in ghc-deps.sh
- compile Setup in cabal macro
- use _rpmconfigdir
2011-01-23 15:05:38 +10:00
Jens Petersen b13abaef50 bunch of tweaks, cleanup, and improvements
- drop deprecated ghcdocdir and ghcpkgdir
- new ghclibdocdir
- replace some missed RPM_BUILD_ROOT's
- bring back ghc requires in ghc_devel_requires
- improve prof summary and description
- add without_prof and without_haddock option macros
2011-01-22 22:48:18 +10:00
Jens Petersen 0f8bb5330b compile Setup to help speed up builds 2011-01-21 10:48:06 +10:00
Jens Petersen 4d6720d40f make sure license is in binlib shared subpackage and add option to exclude package from ghc_packages_list
- put docdir (license) also into shared lib subpackage
- add ghc_binlib_package option to exclude package from ghc_packages_list
- condition lib base package additional description for srpm
2011-01-20 18:25:37 +10:00
Jens Petersen 086f1bc5e0 more ghc libraries subpackaging fixes and other cleanup
- use buildroot instead of RPM_BUILD_ROOT
- rename ghcpkgbasedir to ghclibdir
- split "[name-version]" args into "[name] [version]" args
- move remaining name and version macro options (-n and -v) to args
- drop deprecated -o options
2011-01-03 20:37:32 +09:00
Jens Petersen abebb6d20d bump version to 0.11 2010-12-30 21:22:35 +09:00
Jens Petersen c6c20a5951 add support for subpackaging multiple libraries for ghc 2010-12-30 21:19:29 +09:00
Jens Petersen 7d50a02159 revert disabling debug_package since it behaves inconsistently with redhat-rpm-config 2010-12-20 19:05:33 +10:00
Jens Petersen 21e17e3468 drop with_devhelp since html-help option gone from haddock-2.8.0 2010-11-26 12:29:14 +10:00
Jens Petersen 2f1663e620 ignore ghc's builtin pseudo-libs 2010-11-23 23:48:16 +10:00
Jens Petersen 3ca7af736f bring back the explicit n-v-r internal package requires for devel and prof packages 2010-11-23 17:08:28 +10:00
Jens Petersen 7232a81da9 implement rpm ghc-pkg hash metadata for precise automatic library dependency tracking
- add buildroot/ghcpkgbasedir to ghc-deps.sh args
- calculate package and metadata by checking all library files in stdin
- prof depends on devel, devel on base
- update macros.ghc:
  -  rename ghc_requires to ghc_devel_requires
  - drop ghc_doc_requires
  - ghc_reindex_haddock is deprecated and now a no-op
2010-11-23 15:01:27 +10:00
Jens Petersen 02c69a3bd2 fix without_shared build so it actually works 2010-09-30 13:12:47 +10:00
Jens Petersen 742ca58b86 add ghc-deps.sh for hash rpm metadata and add ghc_pkg_obsoletes
- add ghc-deps.sh for ghc package hash rpm metadata provides and requires
- turn on hash provides and disable debuginfo by default
- make shared and hscolour default
- use without_shared and without_hscolour to disble them
- add ghc_pkg_obsoletes for obsoleting old packages
- use ghcpkgbasedir
- always obsolete -doc packages, but keep -o for now for backward compatibility
2010-09-30 12:21:16 +10:00
Jens Petersen 17c8f12bbb improve changelog 2010-07-17 08:09:36 +00:00
Jens Petersen 601aa5ffc1 - fix ghc_strip_dynlinked when no dynlinked files
- devel should provide doc also when not obsoleting
2010-07-17 08:08:37 +00:00
Jens Petersen 4e21230c7d merge -doc into -devel and provide -o obsoletes doc subpackage option 2010-07-15 14:43:34 +00:00
Jens Petersen 428e0de417 - support hscolour'ing of src via haddock
- really remove redundant summary and description option flags
2010-06-28 07:33:22 +00:00
Jens Petersen 28ead10bfc new ghc_bin_build, ghc_bin_install, ghc_lib_build, ghc_lib_install 2010-06-26 08:53:39 +00:00
Jens Petersen 85dddb6d0b couple more fallback summary tweaks 2010-06-24 06:05:43 +00:00
Jens Petersen f7eafbf000 - drop the summary -s and description -d package options since rpm does not
seem to allow white\ space in macro option args anyway
2010-06-24 02:13:22 +00:00
Jens Petersen 4e07127a2c make ghc_strip_dynlinked conditional on no debug_package 2010-06-23 10:24:53 +00:00
Jens Petersen 07f858eab5 replace ghc_strip_shared with ghc_strip_dynlinked 2010-06-23 10:05:24 +00:00
Jens Petersen eaf24211e8 add ghc_strip_shared to strip shared libraries 2010-06-20 12:44:49 +00:00
Jens Petersen a0e7adadfe - add comments over macros
- drop unused cabal_makefile
2010-06-20 12:10:25 +00:00
Jens Petersen d9a9b5f4af - drop unused ghc_pkg_ver macro
- add ghc_pkg_recache macro
2010-04-12 14:52:34 +00:00
Jens Petersen 191657b654 tweak version arg changelog 2010-01-14 14:35:34 +00:00
Jens Petersen 4393386478 - drop optional 2nd version arg from ghcdocdir, ghcpkgdir, and
ghc_gen_filelists: multiversion subpackages are not supported
- add ghcpkgbasedir
- bring back some shared conditions which were dropped temporarily
- test for ghcpkgdir and ghcdocdir in ghc_gen_filelists
- allow optional pkgname arg for cabal_pkg_conf
- can now package gtk2hs
2010-01-14 14:32:25 +00:00
Jens Petersen a0bbde907a use -v in ghc_requires and ghc_prof_requires for version 2010-01-11 06:51:22 +00:00
Jens Petersen 9d7c9aecc0 drop "Library for" from base lib summary 2010-01-11 05:13:02 +00:00