Compare commits

..

No commits in common. "rawhide" and "f22" have entirely different histories.
rawhide ... f22

4 changed files with 64 additions and 309 deletions

19
.gitignore vendored
View File

@ -2,22 +2,3 @@
/shake-0.13.2.tar.gz /shake-0.13.2.tar.gz
/shake-0.13.3.tar.gz /shake-0.13.3.tar.gz
/shake-0.13.4.tar.gz /shake-0.13.4.tar.gz
/shake-0.15.11.tar.gz
/js-jquery-3.1.1.tar.gz
/js-flot-0.8.3.tar.gz
/shake-0.16.tar.gz
/js-jquery-3.2.1.tar.gz
/shake-0.16.4.tar.gz
/js-jquery-3.3.1.tar.gz
/shake-0.17.9.tar.gz
/filepattern-0.1.1.tar.gz
/heaps-0.3.6.1.tar.gz
/js-dgtable-0.5.2.tar.gz
/shake-0.18.5.tar.gz
/shake-0.19.1.tar.gz
/filepattern-0.1.2.tar.gz
/shake-0.19.4.tar.gz
/shake-0.19.5.tar.gz
/heaps-0.4.tar.gz
/shake-0.19.6.tar.gz
/shake-0.19.7.tar.gz

View File

@ -1,43 +0,0 @@
diff -up shake-0.13.4/Development/Shake/FilePath.hs~ shake-0.13.4/Development/Shake/FilePath.hs
--- shake-0.13.4/Development/Shake/FilePath.hs~ 2014-09-20 05:31:36.000000000 +0900
+++ shake-0.13.4/Development/Shake/FilePath.hs 2016-07-11 17:01:35.869453434 +0900
@@ -18,7 +18,7 @@ module Development.Shake.FilePath(
import System.FilePath.Posix hiding
(normalise, (</>), combine
- ,searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath)
+ ,searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath, (-<.>))
import System.FilePath(searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath)
import General.Base
import qualified System.FilePath as Native
diff -up shake-0.13.4/Development/Shake.hs~ shake-0.13.4/Development/Shake.hs
--- shake-0.13.4/Development/Shake.hs~ 2014-09-20 05:31:36.000000000 +0900
+++ shake-0.13.4/Development/Shake.hs 2016-07-11 17:07:18.543454380 +0900
@@ -159,3 +159,5 @@ import Development.Shake.Rules.Files
import Development.Shake.Rules.Oracle
import Development.Shake.Rules.OrderOnly
import Development.Shake.Rules.Rerun
+
+import Prelude hiding ((*>))
diff -up shake-0.13.4/Development/Shake/Rules/File.hs~ shake-0.13.4/Development/Shake/Rules/File.hs
--- shake-0.13.4/Development/Shake/Rules/File.hs~ 2014-09-20 05:31:36.000000000 +0900
+++ shake-0.13.4/Development/Shake/Rules/File.hs 2016-07-11 17:06:01.447454178 +0900
@@ -32,6 +32,7 @@ import Data.Maybe
import System.FilePath(takeDirectory) -- important that this is the system local filepath, or wrong slashes go wrong
import System.IO.Unsafe(unsafeInterleaveIO)
+import Prelude hiding ((*>))
infix 1 *>, ?>, |*>, **>, ~>
diff -up shake-0.13.4/Development/Shake/Rules/Files.hs~ shake-0.13.4/Development/Shake/Rules/Files.hs
--- shake-0.13.4/Development/Shake/Rules/Files.hs~ 2014-09-20 05:31:36.000000000 +0900
+++ shake-0.13.4/Development/Shake/Rules/Files.hs 2016-07-11 17:25:14.706417609 +0900
@@ -19,6 +19,7 @@ import Development.Shake.Types
import System.FilePath(takeDirectory) -- important that this is the system local filepath, or wrong slashes go wrong
+import Prelude hiding ((*>))
infix 1 ?>>, *>>, &?>, &*>

View File

@ -1,47 +1,33 @@
# generated by cabal-rpm-2.1.0 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name shake %global pkg_name shake
%global pkgver %{pkg_name}-%{version}
%global heaps heaps-0.4 %ifarch %{ix86} x86_64
%global jsdgtable js-dgtable-0.5.2 %bcond_without tests
%global subpkgs %{heaps} %{jsdgtable} %endif
# failing to build # no useful debuginfo for Haskell packages without C sources
%bcond_with tests %global debug_package %{nil}
Name: %{pkg_name} Name: %{pkg_name}
Version: 0.19.7 Version: 0.13.4
# can only be reset when all subpkgs bumped Release: 1%{?dist}
Release: 25%{?dist} Summary: Make-like build system
Summary: Build system library, like Make, but more accurate dependencies
License: BSD-3-Clause License: BSD
Url: https://hackage.haskell.org/package/%{name} URL: http://hackage.haskell.org/package/%{name}
# Begin cabal-rpm sources: Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{heaps}/%{heaps}.tar.gz
Source2: https://hackage.haskell.org/package/%{jsdgtable}/%{jsdgtable}.tar.gz
# End cabal-rpm sources
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-rpm-macros
BuildRequires: ghc-base-devel # Begin cabal-rpm deps:
BuildRequires: ghc-binary-devel BuildRequires: ghc-binary-devel
BuildRequires: ghc-bytestring-devel BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-deepseq-devel BuildRequires: ghc-deepseq-devel
BuildRequires: ghc-directory-devel BuildRequires: ghc-directory-devel
BuildRequires: ghc-extra-devel
BuildRequires: ghc-filepath-devel BuildRequires: ghc-filepath-devel
BuildRequires: ghc-filepattern-devel
BuildRequires: ghc-hashable-devel BuildRequires: ghc-hashable-devel
#BuildRequires: ghc-heaps-devel BuildRequires: ghc-old-time-devel
#BuildRequires: ghc-js-dgtable-devel
BuildRequires: ghc-js-flot-devel
BuildRequires: ghc-js-jquery-devel
BuildRequires: ghc-primitive-devel
BuildRequires: ghc-process-devel BuildRequires: ghc-process-devel
BuildRequires: ghc-random-devel BuildRequires: ghc-random-devel
BuildRequires: ghc-time-devel BuildRequires: ghc-time-devel
@ -49,41 +35,39 @@ BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-devel BuildRequires: ghc-unix-devel
BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-utf8-string-devel BuildRequires: ghc-utf8-string-devel
%if %{with ghc_prof}
BuildRequires: ghc-base-prof
BuildRequires: ghc-binary-prof
BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-deepseq-prof
BuildRequires: ghc-directory-prof
BuildRequires: ghc-extra-prof
BuildRequires: ghc-filepath-prof
BuildRequires: ghc-filepattern-prof
BuildRequires: ghc-hashable-prof
#BuildRequires: ghc-heaps-prof
#BuildRequires: ghc-js-dgtable-prof
BuildRequires: ghc-js-flot-prof
BuildRequires: ghc-js-jquery-prof
BuildRequires: ghc-primitive-prof
BuildRequires: ghc-process-prof
BuildRequires: ghc-random-prof
BuildRequires: ghc-template-haskell-prof
BuildRequires: ghc-time-prof
BuildRequires: ghc-transformers-prof
BuildRequires: ghc-unix-prof
BuildRequires: ghc-unordered-containers-prof
BuildRequires: ghc-utf8-string-prof
%endif
%if %{with tests} %if %{with tests}
BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-QuickCheck-devel
%endif %endif
Requires: %{name}-common = %{version}-%{release}
# End cabal-rpm deps # End cabal-rpm deps
%description %description
Shake is a Haskell library for writing build systems - designed as a Shake is a Haskell library for writing build systems - designed as a
replacement for 'make'. See "Development.Shake" for an introduction, including replacement for 'make'. See "Development.Shake" for an introduction, including
an example. The homepage contains links to a user manual, an academic paper and an example. Further examples are included in the Cabal tarball, under the
further information: <https://shakebuild.com> 'Examples' directory. The homepage contains links to a user manual, an academic
paper and further information: <https://github.com/ndmitchell/shake>
This package provides the shake tool which can handle most ninja files
faster than ninja and simple makefiles.
%package -n ghc-%{name}
Summary: Haskell %{name} library
%description -n ghc-%{name}
This package provides the Haskell %{name} shared library.
%package -n ghc-%{name}-devel
Summary: Haskell %{name} library development files
Provides: ghc-%{name}-static = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
Requires: ghc-%{name}%{?_isa} = %{version}-%{release}
%description -n ghc-%{name}-devel
This package provides the Haskell %{name} library development files.
To use Shake the user writes a Haskell program that imports To use Shake the user writes a Haskell program that imports
"Development.Shake", defines some build rules, and calls the "Development.Shake", defines some build rules, and calls the
@ -98,222 +82,57 @@ including seamless support for generated files, and dependencies on system
information (e.g. compiler version). information (e.g. compiler version).
%package common
Summary: %{name} common files
BuildArch: noarch
%description common
This package provides the %{name} common data files.
%package -n ghc-%{name}
Summary: Haskell %{name} library
Requires: %{name}-common = %{version}-%{release}
%description -n ghc-%{name}
This package provides the Haskell %{name} shared library.
%package -n ghc-%{name}-devel
Summary: Haskell %{name} library development files
Provides: ghc-%{name}-static = %{version}-%{release}
Provides: ghc-%{name}-static%{?_isa} = %{version}-%{release}
%if %{defined ghc_version}
Requires: ghc-compiler = %{ghc_version}
%endif
Requires: ghc-%{name}%{?_isa} = %{version}-%{release}
%description -n ghc-%{name}-devel
This package provides the Haskell %{name} library development files.
%if %{with haddock}
%package -n ghc-%{name}-doc
Summary: Haskell %{name} library documentation
BuildArch: noarch
Requires: ghc-filesystem
%description -n ghc-%{name}-doc
This package provides the Haskell %{name} library documentation.
%endif
%if %{with ghc_prof}
%package -n ghc-%{name}-prof
Summary: Haskell %{name} profiling library
Requires: ghc-%{name}-devel%{?_isa} = %{version}-%{release}
Supplements: (ghc-%{name}-devel and ghc-prof)
%description -n ghc-%{name}-prof
This package provides the Haskell %{name} profiling library.
%endif
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage %{heaps}
%ghc_lib_subpackage %{jsdgtable}
%endif
%global version %{main_version}
%prep %prep
# Begin cabal-rpm setup: %setup -q
%setup -q -a1 -a2
# End cabal-rpm setup cd Test/Ninja
for i in test4 test3-win test3-sub test3-inc test5 test3 lint test2 test3-unix; do
sed -i 's/\r$//' $i.ninja
done
%build %build
# Begin cabal-rpm build:
%ghc_libs_build %{subpkgs}
%ghc_lib_build %ghc_lib_build
# End cabal-rpm build
%install %install
# Begin cabal-rpm install
%ghc_libs_install %{subpkgs}
%ghc_lib_install %ghc_lib_install
mv %{buildroot}%{_ghcdocdir}{,-common}
# End cabal-rpm install
echo "%{_datadir}/%{jsdgtable}/" >> %{jsdgtable}/ghc-js-dgtable.files # remove bundled jquery*.js, report.html, *.js
# (this breaks report generation)
rm %{buildroot}%{_datadir}/%{pkgver}/docs/manual/* rm %{buildroot}%{_datadir}/%{name}-%{version}/html/*
rm %{buildroot}%{_datadir}/%{name}-%{version}/docs/manual/*
%check %check
%if %{with tests} %if %{with tests}
%cabal_test %cabal test
%endif %endif
%post -n ghc-%{name}-devel
%ghc_pkg_recache
%postun -n ghc-%{name}-devel
%ghc_pkg_recache
%files %files
# Begin cabal-rpm files: %doc LICENSE
%{_bindir}/%{name} %{_bindir}/%{name}
# End cabal-rpm files
%files common
# Begin cabal-rpm files:
%license LICENSE
%doc CHANGES.txt README.md
%{_datadir}/%{pkgver}
# End cabal-rpm files
%files -n ghc-%{name} -f ghc-%{name}.files %files -n ghc-%{name} -f ghc-%{name}.files
%doc LICENSE
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%doc README.md
%doc docs
%if %{with haddock}
%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
%license LICENSE
%endif
%if %{with ghc_prof}
%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
%endif
%changelog %changelog
* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 0.19.7-25
- https://hackage.haskell.org/package/shake-0.19.7/changelog
- refresh to cabal-rpm-2.1.0 with SPDX migration
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.6-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 0.19.6-23
- https://hackage.haskell.org/package/shake-0.19.6/changelog
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.5-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 0.19.5-21
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
* Thu Aug 5 2021 Jens Petersen <petersen@redhat.com> - 0.19.5-20
- update to 0.19.5
* Thu Aug 5 2021 Jens Petersen <petersen@redhat.com> - 0.19.4-19
- update to 0.19.4
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.1-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 19 2020 Jens Petersen <petersen@redhat.com> - 0.19.1-15
- update to 0.19.1
- disable js embedding
- filepattern, js-flot, and js-jquery were packaged
* Fri Feb 14 2020 Jens Petersen <petersen@redhat.com> - 0.18.5-14
- update to 0.18.5
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.9-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Jens Petersen <petersen@redhat.com>
- update to 0.17.9
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.16.4-10
- refresh to cabal-rpm-0.13
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 0.16.4-8
- update to 0.16.4
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 0.16-5
- rebuild
* Tue Jan 09 2018 Jens Petersen <petersen@redhat.com> - 0.16-4
- update to 0.16
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Feb 23 2017 Jens Petersen <petersen@redhat.com> - 0.13.4-1
- update to 0.15.11
- subpackage js-flot and js-jquery
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Jul 11 2016 Jens Petersen <petersen@redhat.com> - 0.13.4-4
- patch for ghc8 Prelude.(*>)
- disable tests due to -Wall -Werror
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.13.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu Sep 25 2014 Jens Petersen <petersen@redhat.com> - 0.13.4-1 * Thu Sep 25 2014 Jens Petersen <petersen@redhat.com> - 0.13.4-1
- update to 0.13.4 - update to 0.13.4

View File

@ -1,3 +1 @@
SHA512 (js-dgtable-0.5.2.tar.gz) = 5854b5083af33ae533fb90c12f88e1b7b777a9a02fc9f38551033f1b31e580b2839453f137bb71e7c7a54ab7ccf652c7eddb60d3f5d30a0ac71bfb668ebe4337 d2d1ce9f2308a8a35bec3af9a03b31d3 shake-0.13.4.tar.gz
SHA512 (heaps-0.4.tar.gz) = d99ee37d884010e266c05bd7de3a14f494f3dfa3f4801dfa97ce82f7b80304ad349aee407b4a8a4d3d3f46a3fab40f86377061a046e1d507969a911132625454
SHA512 (shake-0.19.7.tar.gz) = 7d519431301193e99d34cae7be61ff94a503eae156efa116d9f8f05934ebd39a1baab17e988340c9059b1eed972b1d8df3813a86064de92e347b2cb53f72e24a