xmonad/xmobar: rebuild with ghc-8.0.1

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

x/xmobar/xmobar-vl.spec

@@ -1,8 +1,11 @@
 %define pkg_name    xmobar
-%define pkg_version 0.23.1
+%define pkg_version 0.24.3
-%define pkg_release 6%{?_dist_release}
+%define pkg_release 1%{?_dist_release}
 
-%define ghc_version 7.10.3
+%define ghc_version 8.0.1
+# to fix wrong dependencies in cabal files
+# do not use '-'
+%define timezoneolson_version 0.1.7
 
 Summary:     a minimalistic text based status bar
 Summary(ja): テキストを基礎とした最小のステータスバー
@@ -15,18 +18,21 @@ Group:   User Interface/Desktops
 URL:     http://hackage.haskell.org
 
 Source0: %{name}-%{version}.tar.gz
+Source1: packages
 
-Source1: cereal-0.5.1.0.tar.gz
+# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
-Source2: hinotify-0.3.8.1.tar.gz
+Source11: cereal-0.5.4.0.tar.gz
-Source3: libmpd-0.9.0.4.tar.gz
+Source12: hinotify-0.3.9.tar.gz
-Source4: timezone-series-0.1.5.1.tar.gz
+Source13: libmpd-0.9.0.6.tar.gz
-Source5: timezone-olson-0.1.7.tar.gz
+Source14: timezone-series-0.1.6.1.tar.gz
+Source15: timezone-olson-0.1.7.tar.gz
 
-Source100: packages
+# to fix wrong dependencies in cabal files
+Source101: timezone-olson.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+BuildRequires: ghc haskell-platform
 BuildRequires: xmonad-contrib
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
@@ -52,6 +58,8 @@ Xmobarはテキストを基礎とした最小のステータスバーです。
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
 
 # Initialise the package db
@@ -59,13 +67,19 @@ ghc-pkg init %{_builddir}/package.conf
 
 %build
 PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
+%{__rm} -rf ${PKG_CONF_DIR}
 %{__mkdir_p} ${PKG_CONF_DIR}
 
 # install dependent packages
 cd %{_builddir}
-for pkg in `cat %{SOURCE100}`; do
+for pkg in `cat %{SOURCE1}`; do
   %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
   cd ${pkg}
+  # fix wrong dependencies
+  case ${pkg} in
+      "timezone-olson-%{timezoneolson_version}") %{__cp} %{SOURCE101} . ;;
+      *) ;;
+  esac
   cabal configure \
     --prefix=%{_prefix} \
     --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
@@ -122,6 +136,10 @@ ghc-pkg recache
 
 
 %changelog
+* Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.24.3-1
+- update to 0.24.3
+- build using ghc-8.0.1
+
 * Wed May 04 2016 Toshiaki Ara <ara_t@384.jp> 0.23.1-6
 - rebuilt
 

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

@@ -1,8 +1,11 @@
 %define pkg_name    xmonad-contrib
 %define pkg_version 0.12
-%define pkg_release 5%{?_dist_release}
+%define pkg_release 6%{?_dist_release}
 
-%define ghc_version 7.10.3
+%define ghc_version 8.0.1
+# to fix wrong dependencies in cabal files
+# do not use '-'
+%define oldtime_version 1.1.0.3
 
 Summary:     Third party extensions for xmonad
 Summary(ja): サードパーティーによるxmonad拡張
@@ -15,26 +18,31 @@ Group:   User Interface/Desktops
 URL:     http://hackage.haskell.org
 
 Source0: %{name}-%{version}.tar.gz
-Source1: X11-xft-0.3.1.tar.gz
+Source1: packages
+
+# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
+Source11: X11-xft-0.3.1.tar.gz
+Source12: old-time-1.1.0.3.tar.gz
+
+# to fix wrong dependencies in cabal files
+Source101: old-time.cabal
 
-Source100: packages
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+BuildRequires: ghc haskell-platform
 BuildRequires: xmonad
 
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
-BuildRequires: hscolour
 
 Requires: xmonad
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: Toshiaki Ara <ara_t@384.jp>
+Packager: ara_t
 
 %description
 Third party tiling algorithms, configurations and scripts to xmonad,
@@ -47,6 +55,8 @@ Third party tiling algorithms, configurations and scripts to xmonad,
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
 
 # Initialise the package db
@@ -58,16 +68,22 @@ PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
 
 # install dependent packages
 cd %{_builddir}
-for pkg in `cat %{SOURCE100}`; do
+for pkg in `cat %{SOURCE1}`; do
   %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
   cd ${pkg}
+  # fix wrong dependencies
+  case ${pkg} in
+      "old-time-%{oldtime_version}") %{__cp} %{SOURCE101} . ;;
+      *) ;;
+  esac
+
   cabal configure \
-    --prefix=%{_prefix} \
+        --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
+        --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
-    --libsubdir= \
+        --libsubdir= \
-    --datadir=%{_datadir}/%{name}/${pkg} \
+        --datadir=%{_datadir}/%{name}/${pkg} \
-    --datasubdir= \
+        --datasubdir= \
-    --docdir=%{_docdir}/%{name}/${pkg}
+        --docdir=%{_docdir}/%{name}/${pkg}
 
   cabal build
   cabal haddock
@@ -115,6 +131,9 @@ ghc-pkg recache
 
 
 %changelog
+* Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.12-6
+- rebuild using ghc-8.0.1
+
 * Wed May 04 2016 Toshiaki Ara <ara_t@384.jp> 0.12-5
 - rebuilt
 

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

@@ -1,8 +1,8 @@
 %define pkg_name    xmonad-extras
 %define pkg_version 0.12.1
-%define pkg_release 5%{?_dist_release}
+%define pkg_release 6%{?_dist_release}
 
-%define ghc_version 7.10.3
+%define ghc_version 8.0.1
 
 Summary:     Various modules for xmonad
 Summary(ja): xmonadのための様々なモジュール
@@ -15,20 +15,14 @@ Group:   User Interface/Desktops
 URL:     http://hackage.haskell.org
 
 Source0: %{name}-%{version}.tar.gz
-Source1: ghc-mtl-1.2.1.0.tar.gz
-Source2: ghc-paths-0.1.0.9.tar.gz
-Source3: hint-0.4.2.3.tar.gz
-
-Source100: packages
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+BuildRequires: ghc haskell-platform
 BuildRequires: xmonad xmonad-contrib
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
-BuildRequires: hscolour
 
 Requires: xmonad xmonad-contrib
 
@@ -47,6 +41,8 @@ xmonad-contribに含まれなかったモジュールを含みます。
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
 
 # Initialise the package db
@@ -56,27 +52,6 @@ ghc-pkg init %{_builddir}/package.conf
 PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
 %{__mkdir_p} ${PKG_CONF_DIR}
 
-# install dependent packages
-cd %{_builddir}
-for pkg in `cat %{SOURCE100}`; do
-  %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
-  cd ${pkg}
-  cabal configure \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
-    --libsubdir= \
-    --datadir=%{_datadir}/%{name}/${pkg} \
-    --datasubdir= \
-    --docdir=%{_docdir}/%{name}/${pkg}
-
-  cabal build
-  cabal haddock
-  cabal copy --destdir=${RPM_BUILD_ROOT}
-  cabal register --inplace
-  cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}_${pkg}.conf
-  cd ..
-done
-
 # build xmonad-extras
 cd %{_builddir}/%{name}-%{version}
 cabal configure \
@@ -114,6 +89,9 @@ ghc-pkg recache
 
 
 %changelog
+* Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.12.1-6
+- rebuild using ghc-8.0.1
+
 * Wed May 04 2016 Toshiaki Ara <ara_t@384.jp> 0.12.1-5
 - rebuilt
 

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

@@ -1,8 +1,8 @@
 %define pkg_name    xmonad-utils
 %define pkg_version 0.1.3.3
-%define pkg_release 4%{?_dist_release}
+%define pkg_release 5%{?_dist_release}
 
-%define ghc_version 7.10.3
+%define ghc_version 8.0.1
 
 Summary:     a small collection of X utilities when running XMonad
 Summary(ja): XMonadのためのXユーティリティ集
@@ -18,7 +18,7 @@ Source0: %{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+BuildRequires: ghc haskell-platform
 BuildRequires: xmonad
 
 BuildRequires: libffi-devel gmp-devel zlib-devel
@@ -28,7 +28,7 @@ Requires: xmonad
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: arat
+Packager: ara_t
 
 %description
 A small collection of X utilities useful when running XMonad. It includes:
@@ -41,6 +41,8 @@ A small collection of X utilities useful when running XMonad. It includes:
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
 
 # Initialise the package db
@@ -78,6 +80,9 @@ ghc-pkg recache
 
 
 %changelog
+* Thu Feb 02 2017 Toshiaki Ara <ara_t@384.jp> 0.1.3.3-5
+- rebuild using ghc-8.0.1
+
 * Wed May 04 2016 Toshiaki Ara <ara_t@384.jp> 0.1.3.3-4
 - rebuilt
 

x/xmonad/xmonad-vl.spec

@@ -1,8 +1,12 @@
 %define pkg_name    xmonad
 %define pkg_version 0.12
-%define pkg_release 4%{?_dist_release}
+%define pkg_release 5%{?_dist_release}
 
-%define ghc_version 7.10.3
+%define ghc_version 8.0.1
+# to fix wrong dependencies in cabal files
+# do not use '-'
+%define setlocale_version 1.0.0.4
+%define utf8string_version 1.0.1.1
 
 Summary:     Lightweight X11 window manager written in Haskell
 Summary(ja): Haskellで書かれたタイル型ウィンドウマネージャ
@@ -15,17 +19,23 @@ Group:   User Interface/Desktops
 URL:     http://hackage.haskell.org
 
 Source0: %{name}-%{version}.tar.gz
-Source1: X11-1.6.1.2.tar.gz
+Source1: packages
-Source2: extensible-exceptions-0.1.1.4.tar.gz
+Source2: xmonad.desktop
-Source3: setlocale-1.0.0.3.tar.gz
+
-Source4: utf8-string-1.0.1.1.tar.gz
+# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
+Source11: extensible-exceptions-0.1.1.4.tar.gz
+Source12: X11-1.6.1.2.tar.gz
+Source13: setlocale-1.0.0.4.tar.gz
+Source14: utf8-string-1.0.1.1.tar.gz
+
+# to fix wrong dependencies in cabal files
+Source101: setlocale.cabal
+Source102: utf8-string.cabal
 
-Source100: packages
-Source200: xmonad.desktop
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: ghc haskell-platform-base cabal-install
+BuildRequires: ghc haskell-platform
 BuildRequires: libffi-devel gmp-devel zlib-devel
 
 BuildRequires: libghc-data-default-class
@@ -34,14 +44,14 @@ BuildRequires: libghc-data-default
 
 BuildRequires: xorg-x11-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
-BuildRequires: hscolour
 
 Requires: ghc
+Requires: libghc-dlist
 Requires: libghc-data-default
 
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: Toshiaki Ara <ara_t@384.jp>
+Packager: ara_t
 
 
 %description
@@ -76,19 +86,29 @@ XmonadはHaskellで設定され、ユーザーが設定ファイルを書くこ
 
 %prep
 %{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{_builddir}/package.conf
+%{__rm} -rf ${HOME}/.ghc
 %setup -q
+
 # Initialise the package db
 ghc-pkg init %{_builddir}/package.conf
 
 %build
 PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
+%{__rm} -rf ${PKG_CONF_DIR}
 %{__mkdir_p} ${PKG_CONF_DIR}
 
 # install dependent packages
 cd %{_builddir}
-for pkg in `cat %{SOURCE100}`; do
+for pkg in `cat %{SOURCE1}`; do
   %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
   cd ${pkg}
+  case ${pkg} in
+      "setlocale-%{setlocale_version}")    %{__cp} %{SOURCE101} . ;;
+      "utf8-string-%{utf8string_version}") %{__cp} %{SOURCE102} . ;;
+      *) ;;
+  esac
+
   cabal configure \
     --prefix=%{_prefix} \
     --libdir=%{_libdir}/ghc-lib/%{name}/${pkg} \
@@ -132,7 +152,7 @@ cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}-%{version}.conf
 
 # xsession desktop entry
 %{__mkdir_p} %{buildroot}%{_datadir}/xsessions/
-%{__install} -m 644 %{SOURCE200} ${RPM_BUILD_ROOT}%{_datadir}/xsessions/
+%{__install} -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/xsessions/
 
 %{__cp} CHANGES.md LICENSE README.md STYLE \
  ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{name}-%{version}
@@ -159,6 +179,9 @@ ghc-pkg recache
 
 
 %changelog
+* Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.12-5
+- rebuild using ghc-8.0.1
+
 * Wed May 04 2016 Toshiaki Ara <ara_t@384.jp> 0.12-4
 - rebuilt