update to 0.15.11 with js subpackages

.gitignore

@@ -2,3 +2,6 @@
 /shake-0.13.2.tar.gz
 /shake-0.13.3.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.spec

@@ -1,32 +1,40 @@
+# generated by cabal-rpm-0.11.1
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name shake
+%global pkgver %{pkg_name}-%{version}
+
+%global jsflot js-flot-0.8.3
+%global jsjquery js-jquery-3.1.1
+%global subpkgs %{jsflot} %{jsjquery}
 
 %bcond_with tests
 
-# no useful debuginfo for Haskell packages without C sources
-%global debug_package %{nil}
-
 Name:           %{pkg_name}
-Version:        0.13.4
+Version:        0.15.11
-Release:        5%{?dist}
+# can only be reset when all subpkgs bumped
+Release:        1%{?dist}
 Summary:        Make-like build system
 
 License:        BSD
-URL:            http://hackage.haskell.org/package/%{name}
+Url:            https://hackage.haskell.org/package/%{name}
-Source0:        http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Patch0:         shake-0.13.4-ghc8-prelude.patch
+Source1:        https://hackage.haskell.org/package/%{jsflot}/%{jsflot}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{jsjquery}/%{jsjquery}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-rpm-macros-extra
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-binary-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-deepseq-devel
 BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-extra-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-hashable-devel
-BuildRequires:  ghc-old-time-devel
+#BuildRequires:  ghc-js-flot-devel
+#BuildRequires:  ghc-js-jquery-devel
+BuildRequires:  ghc-primitive-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-random-devel
 BuildRequires:  ghc-time-devel
@@ -44,7 +52,7 @@ Shake is a Haskell library for writing build systems - designed as a
 replacement for 'make'. See "Development.Shake" for an introduction, including
 an example. Further examples are included in the Cabal tarball, under the
 'Examples' directory. The homepage contains links to a user manual, an academic
-paper and further information: <https://github.com/ndmitchell/shake>
+paper and further information: <http://shakebuild.com>
 
 This package provides the shake tool which can handle most ninja files
 faster than ninja and simple makefiles.
@@ -81,26 +89,39 @@ including seamless support for generated files, and dependencies on system
 information (e.g. compiler version).
 
 
-%prep
+%global main_version %{version}
-%setup -q
-%patch0 -p1 -b .orig
 
-cd Test/Ninja
+%if %{defined ghclibdir}
-for i in test4 test3-win test3-sub test3-inc test5 test3 lint test2 test3-unix; do
+%ghc_lib_subpackage %{jsflot}
-    sed -i 's/\r$//' $i.ninja
+%ghc_lib_subpackage %{jsjquery}
-done
+%endif
+
+%global version %{main_version}
+
+
+%prep
+%setup -q -a1 -a2
+
+#cd src/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
+%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 
 
 %install
+%ghc_libs_install %{subpkgs}
 %ghc_lib_install
 
-# remove bundled jquery*.js, report.html, *.js
+%ghc_fix_rpath %{subpkgs}
-# (this breaks report generation)
+
-rm %{buildroot}%{_datadir}/%{name}-%{version}/html/*
+echo "%{_datadir}/%{jsflot}/" >> %{jsflot}/ghc-js-flot.files
+echo "%{_datadir}/%{jsjquery}/" >> %{jsjquery}/ghc-js-jquery.files
+
 rm %{buildroot}%{_datadir}/%{name}-%{version}/docs/manual/*
 
 
@@ -123,14 +144,17 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/docs/manual/*
 
 %files -n ghc-%{name} -f ghc-%{name}.files
 %license LICENSE
-
+%{_datadir}/%{name}-%{version}
 
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%doc README.md
+%doc CHANGES.txt README.md docs
-%doc docs
 
 
 %changelog
+* 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
 

sources

@@ -1 +1,3 @@
-d2d1ce9f2308a8a35bec3af9a03b31d3  shake-0.13.4.tar.gz
+SHA512 (js-jquery-3.1.1.tar.gz) = cc95bdcf6fe2b45e7d585fcd7d83aee39b8dbed7c8e763c808a07a140203e58441896431920ee14b1861ee09a903cedca140c0a48405ffddaef2a71d11b21359
+SHA512 (js-flot-0.8.3.tar.gz) = 5732938b37e9036156528c0d34cd99b45405db81d1e70b6651b056075ea8d9b616da1ae709c2de1f2f5be044236a3b81fc358d973769fca26993500ff9d0dabf
+SHA512 (shake-0.15.11.tar.gz) = 9fb75331ae7cf607417e046e456b5e6318c1f220c56db889239056fe1e98bf6faf554a862c4aa9682f3aae3089b247389a1ac04e1b2913e294cfd1019cd7934f