xmonad-*/xmobar: rebuild with ghc-8.4.3-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11763 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xmobar/xmobar-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    xmobar
 %define pkg_version 0.27
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
 Summary:     a minimalistic text based status bar
 Summary(ja): テキストを基礎とした最小のステータスバー
@@ -31,13 +31,14 @@ Source20: xmobar.cabal
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: ghc haskell-platform
-BuildRequires: xmonad-contrib
+BuildRequires: xmonad
+BuildRequires: libXScrnSaver-devel
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
 BuildRequires: libXpm-devel
 
 Requires: haskell-platform-dep
-Requires: xmonad-contrib
+Requires: xmonad
 Requires: libXpm
 
 Vendor: Project Vine
@@ -121,6 +122,11 @@ popd
 
 
 %changelog
+* Wed Aug 08 2018 Toshiaki Ara <ara_t@384.jp> 0.27-2
+- build using ghc-8.4.3-2
+- add BuildRequires: libXScrnSaver-devel
+- correct BuildRequires
+
 * Fri Jul 20 2018 Toshiaki Ara <ara_t@384.jp> 0.27-1
 - update to 0.27
 - drop Patch2 (fixed at upstream)

x/xmonad-contrib/xmonad-contrib-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    xmonad-contrib
-%define pkg_version 0.13
-%define pkg_release 4%{?_dist_release}
+%define pkg_version 0.14
+%define pkg_release 2%{?_dist_release}
 
 Summary:     Third party extensions for xmonad
 Summary(ja): サードパーティーによるxmonad拡張
@@ -14,8 +14,8 @@ URL:     http://hackage.haskell.org
 
 Source0: packages
 
-# Patch for building ghc-8.4
-Source1: xmonad-contrib-0.13_using_ghc-8.4.patch
+# # Patch for building ghc-8.4
+# Source1: xmonad-contrib-0.13_using_ghc-8.4.patch
 
 Source11: X11-xft-0.3.1.tar.gz
 Source12: X11-xft.cabal
@@ -23,7 +23,7 @@ Source13: old-time-1.1.0.3.tar.gz
 Source14: old-time.cabal
 Source15: random-1.1.tar.gz
 Source16: random.cabal
-Source17: xmonad-contrib-0.13.tar.gz
+Source17: xmonad-contrib-0.14.tar.gz
 Source18: xmonad-contrib.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -33,9 +33,11 @@ BuildRequires: xmonad
 
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
+BuildRequires: libXScrnSaver-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: haskell-platform-dep
+Requires: libXScrnSaver-devel
 Requires: xmonad
 
 Vendor: Project Vine
@@ -63,12 +65,6 @@ for pkg in `cat %{SOURCE0}`; do
     %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
     pushd ${pkg}
         %ghc_fix_dependencies ${pkg}
-
-        case ${pkg} in
-            "%{name}-%{version}") %{__patch} -p1 < %{SOURCE1} ;;
-            *) ;;
-        esac
-
         %cabal_configure2 %{name} ${pkg}
         %cabal_build
         %cabal_haddock
@@ -103,6 +99,14 @@ popd
 
 
 %changelog
+* Wed Aug 08 2018 Toshiaki Ara <ara_t@384.jp> 0.14-2
+- add BuildRequires: and Requires: libXScrnSaver-devel
+
+* Wed Aug 08 2018 Toshiaki Ara <ara_t@384.jp> 0.14-1
+- update to 0.14
+- build using ghc-8.4.3-2
+- drop Source1
+
 * Fri Jul 20 2018 Toshiaki Ara <ara_t@384.jp> 0.13-4
 - build using ghc-8.4.3
 

x/xmonad-extras/xmonad-extras-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    xmonad-extras
-%define pkg_version 0.13.3
-%define pkg_release 3%{?_dist_release}
+%define pkg_version 0.14
+%define pkg_release 1%{?_dist_release}
 
 Summary:     Various modules for xmonad
 Summary(ja): xmonadのための様々なモジュール
@@ -16,16 +16,26 @@ Source0: packages
 
 Source11: alsa-core-0.5.0.1.tar.gz
 Source12: alsa-core.cabal
-Source13: libmpd-0.9.0.8.tar.gz
-Source14: libmpd.cabal
-Source15: language-c-0.7.2.tar.gz
+Source13: ghc-paths-0.1.0.9.tar.gz
+Source14: ghc-paths.cabal
+Source15: language-c-0.8.1.tar.gz
 Source16: language-c.cabal
-Source17: c2hs-0.28.3.tar.gz
-Source18: c2hs.cabal
-Source19: alsa-mixer-0.2.0.3.tar.gz
-Source20: alsa-mixer.cabal
-Source21: xmonad-extras-0.13.3.tar.gz
-Source22: xmonad-extras.cabal
+Source17: libmpd-0.9.0.8.tar.gz
+Source18: libmpd.cabal
+Source19: transformers-compat-0.6.2.tar.gz
+Source20: transformers-compat.cabal
+Source21: c2hs-0.28.5.tar.gz
+Source22: c2hs.cabal
+Source23: alsa-mixer-0.2.0.3.tar.gz
+Source24: alsa-mixer.cabal
+Source25: exceptions-0.10.0.tar.gz
+Source26: exceptions.cabal
+Source27: temporary-1.3.tar.gz
+Source28: temporary.cabal
+Source29: hint-0.8.0.tar.gz
+Source30: hint.cabal
+Source31: xmonad-extras-0.14.tar.gz
+Source32: xmonad-extras.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -34,11 +44,13 @@ BuildRequires: xmonad xmonad-contrib
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
 BuildRequires: alsa-lib-devel
+BuildRequires: libXScrnSaver-devel
 BuildRequires: ncurses-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: haskell-platform-dep
 Requires: xmonad xmonad-contrib
+Requires: libXScrnSaver-devel
 
 
 Vendor: Project Vine
@@ -102,6 +114,10 @@ popd
 
 
 %changelog
+* Wed Aug 08 2018 Toshiaki Ara <ara_t@384.jp> 0.14-1
+- update to 0.14
+- add BuildRequires: libXScrnSaver-devel
+
 * Fri Jul 20 2018 Toshiaki Ara <ara_t@384.jp> 0.13.3-3
 - build using ghc-8.4.3
 

x/xmonad-utils/xmonad-utils-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    xmonad-utils
 %define pkg_version 0.1.3.3
-%define pkg_release 8%{?_dist_release}
+%define pkg_release 9%{?_dist_release}
 
 Summary:     a small collection of X utilities when running XMonad
 Summary(ja): XMonadのためのXユーティリティ集
@@ -81,6 +81,9 @@ done
 
 
 %changelog
+* Wed Aug 08 2018 Toshiaki Ara <ara_t@384.jp> 0.1.3.3-9
+- build using ghc-8.4.3-2
+
 * Fri Jul 20 2018 Toshiaki Ara <ara_t@384.jp> 0.1.3.3-8
 - build using ghc-8.4.3
 

x/xmonad/xmonad-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    xmonad
-%define pkg_version 0.13
-%define pkg_release 3%{?_dist_release}
+%define pkg_version 0.14
+%define pkg_release 2%{?_dist_release}
 
 Summary:     Lightweight X11 window manager written in Haskell
 Summary(ja): Haskellで書かれたタイル型ウィンドウマネージャ
@@ -15,10 +15,10 @@ URL:     http://hackage.haskell.org
 Source0: packages
 Source1: xmonad.desktop
 
-# Patch for building ghc-8.4
-Source2: xmonad-0.13_using_ghc-8.4.patch
+# # Patch for building ghc-8.4
+# Source2: xmonad-0.13_using_ghc-8.4.patch
 
-Source11: X11-1.8.tar.gz
+Source11: X11-1.9.tar.gz
 Source12: X11.cabal
 Source13: extensible-exceptions-0.1.1.4.tar.gz
 Source14: extensible-exceptions.cabal
@@ -26,7 +26,7 @@ Source15: setlocale-1.0.0.6.tar.gz
 Source16: setlocale.cabal
 Source17: utf8-string-1.0.1.1.tar.gz
 Source18: utf8-string.cabal
-Source19: xmonad-0.13.tar.gz
+Source19: xmonad-0.14.tar.gz
 Source20: xmonad.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -42,10 +42,17 @@ BuildRequires: libghc-semigroups
 
 BuildRequires: xorg-x11-devel
 BuildRequires: libXrandr-devel libXinerama-devel
+BuildRequires: libXScrnSaver-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: libXrandr-devel libXinerama-devel
+Requires: libXScrnSaver-devel
 Requires: haskell-platform-dep
+Requires: libghc-data-default-class
+Requires: libghc-dlist
+Requires: libghc-old-locale
+Requires: libghc-data-default
+Requires: libghc-semigroups
 
 
 Vendor: Project Vine
@@ -106,10 +113,6 @@ for pkg in `tail -n 1 %{SOURCE0}`; do
     %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
     pushd ${pkg}
         %ghc_fix_dependencies ${pkg}
-
-        # Patch for building ghc-8.4
-        %{__patch} -p1 < %{SOURCE2}
-
         %cabal_configure2 %{name} %{name}-%{version}
         %cabal_build
         %cabal_haddock
@@ -162,6 +165,14 @@ popd
 
 
 %changelog
+* Wed Aug 08 2018 Toshiaki Ara <ara_t@384.jp> 0.14-2
+- add Requires: libXScrnSaver-devel
+
+* Wed Aug 08 2018 Toshiaki Ara <ara_t@384.jp> 0.14-1
+- update to 0.14
+- add BuildRequires: libXScrnSaver-devel for X11-1.9
+- drop Patch2
+
 * Fri Jul 20 2018 Toshiaki Ara <ara_t@384.jp> 0.13-3
 - build using ghc-8.4.3