new upstream release

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

x/xmobar/xmobar-vl.spec

@@ -1,11 +1,8 @@
 %define pkg_name    xmobar
-%define pkg_version 0.24.3
+%define pkg_version 0.24.5
 %define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
-# 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): テキストを基礎とした最小のステータスバー
@@ -23,11 +20,13 @@ Source1: packages
 # num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
 Source11: cereal-0.5.4.0.tar.gz
 Source12: hinotify-0.3.9.tar.gz
-Source13: libmpd-0.9.0.6.tar.gz
+Source13: libmpd-0.9.0.7.tar.gz
-Source14: timezone-series-0.1.6.1.tar.gz
+Source14: timezone-series-0.1.8.tar.gz
-Source15: timezone-olson-0.1.7.tar.gz
+Source15: timezone-olson-0.1.8.tar.gz
 
 # to fix wrong dependencies in cabal files
+# do not use '-'
+%define timezoneolson_version 0.1.7
 Source101: timezone-olson.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -136,6 +135,10 @@ ghc-pkg recache
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.24.5-2
+- update to 0.24.5
+- rebuild using ghc-8.2.2
+
 * 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

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

@@ -1,11 +1,8 @@
 %define pkg_name    xmonad-contrib
-%define pkg_version 0.12
+%define pkg_version 0.13
-%define pkg_release 6%{?_dist_release}
+%define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
-# 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拡張
@@ -25,10 +22,10 @@ Source11: X11-xft-0.3.1.tar.gz
 Source12: old-time-1.1.0.3.tar.gz
 
 # to fix wrong dependencies in cabal files
+# do not use '-'
+%define oldtime_version 1.1.0.3
 Source101: old-time.cabal
 
-
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: ghc haskell-platform
@@ -107,7 +104,7 @@ cabal build
 cabal haddock
 cabal copy --destdir=${RPM_BUILD_ROOT}
 cabal register --inplace
-cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}-%{version}.conf
+cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 
 %install
 %{__cp} CHANGES.md LICENSE README.md \
@@ -131,6 +128,10 @@ ghc-pkg recache
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.13-1
+- update to 0.13
+- rebuild using ghc-8.0.2
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.12-6
 - rebuild using ghc-8.0.1
 

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

@@ -1,8 +1,8 @@
 %define pkg_name    xmonad-extras
-%define pkg_version 0.12.1
+%define pkg_version 0.13.2
-%define pkg_release 6%{?_dist_release}
+%define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
 
 Summary:     Various modules for xmonad
 Summary(ja): xmonadのための様々なモジュール
@@ -15,6 +15,23 @@ Group:   User Interface/Desktops
 URL:     http://hackage.haskell.org
 
 Source0: %{name}-%{version}.tar.gz
+Source1: packages
+
+# num=11; for pkg in `cat packages`; do echo "Source${num}: ${pkg}.tar.gz"; num=`expr ${num} + 1`; done
+Source11: language-c-0.7.1.tar.gz
+Source12: c2hs-0.28.3.tar.gz
+Source13: alsa-core-0.5.0.1.tar.gz
+Source14: ghc-paths-0.1.0.9.tar.gz
+Source15: libmpd-0.9.0.7.tar.gz
+Source16: transformers-compat-0.5.1.4.tar.gz
+Source17: alsa-mixer-0.2.0.3.tar.gz
+Source18: exceptions-0.8.3.tar.gz
+Source19: hint-0.7.0.tar.gz
+
+# to fix wrong dependencies in cabal files
+# do not use '-'
+%define exceptions_version 0.8.3
+Source51: exceptions.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -22,6 +39,8 @@ BuildRequires: ghc haskell-platform
 BuildRequires: xmonad xmonad-contrib
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: ncurses-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
 Requires: xmonad xmonad-contrib
@@ -52,6 +71,35 @@ ghc-pkg init %{_builddir}/package.conf
 PKG_CONF_DIR=${RPM_BUILD_ROOT}%{_libdir}/ghc-%{ghc_version}/package.conf.d
 %{__mkdir_p} ${PKG_CONF_DIR}
 
+export PATH=${RPM_BUILD_ROOT}%{_bindir}:${HOME}/.cabal/bin:${PATH}
+
+# install dependent packages
+cd %{_builddir}
+for pkg in `cat %{SOURCE1}`; do
+  %{__tar} xzf %{_sourcedir}/${pkg}.tar.gz
+  cd ${pkg}
+  # fix wrong dependencies
+  case ${pkg} in
+      "exceptions-%{exceptions_version}") %{__cp} %{SOURCE51} . ;;
+      *) ;;
+  esac
+
+  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 \
@@ -66,7 +114,7 @@ cabal build
 cabal haddock
 cabal copy --destdir=${RPM_BUILD_ROOT}
 cabal register --inplace
-cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}-%{version}.conf
+cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 
 # %install
 # %{__cp} LICENSE ${RPM_BUILD_ROOT}%{_docdir}/%{name}/%{name}-%{version}
@@ -83,12 +131,18 @@ ghc-pkg recache
 
 %files
 %defattr(-, root, root)
+%{_bindir}/
 %{_libdir}/ghc-%{ghc_version}/
 %{_libdir}/ghc-lib/
+%{_datadir}/%{name}/
 %{_docdir}/%{name}/
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.13.2-1
+- update to 0.13.2
+- build using ghc-8.2.2
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.12.1-6
 - rebuild using ghc-8.0.1
 

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 5%{?_dist_release}
+%define pkg_release 6%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
 
 Summary:     a small collection of X utilities when running XMonad
 Summary(ja): XMonadのためのXユーティリティ集
@@ -23,6 +23,7 @@ BuildRequires: xmonad
 
 BuildRequires: libffi-devel gmp-devel zlib-devel
 BuildRequires: xorg-x11-devel
+BuildRequires: ncurses-devel
 
 Requires: xmonad
 
@@ -80,6 +81,9 @@ ghc-pkg recache
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.1.3.3-6
+- rebuild using ghc-8.2.2
+
 * Thu Feb 02 2017 Toshiaki Ara <ara_t@384.jp> 0.1.3.3-5
 - rebuild using ghc-8.0.1
 

x/xmonad/xmonad-vl.spec

@@ -1,12 +1,8 @@
 %define pkg_name    xmonad
-%define pkg_version 0.12
+%define pkg_version 0.13
-%define pkg_release 5%{?_dist_release}
+%define pkg_release 1%{?_dist_release}
 
-%define ghc_version 8.0.1
+%define ghc_version 8.2.2
-# 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で書かれたタイル型ウィンドウマネージャ
@@ -23,15 +19,15 @@ Source1: packages
 Source2: xmonad.desktop
 
 # 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
+Source11: X11-1.8.tar.gz
-Source12: X11-1.6.1.2.tar.gz
+Source12: extensible-exceptions-0.1.1.4.tar.gz
-Source13: setlocale-1.0.0.4.tar.gz
+Source13: setlocale-1.0.0.5.tar.gz
 Source14: utf8-string-1.0.1.1.tar.gz
 
 # to fix wrong dependencies in cabal files
-Source101: setlocale.cabal
+# do not use '-'
-Source102: utf8-string.cabal
+%define utf8string_version 1.0.1.1
-
+Source101: utf8-string.cabal
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -43,11 +39,10 @@ BuildRequires: libghc-dlist
 BuildRequires: libghc-data-default
 
 BuildRequires: xorg-x11-devel
+BuildRequires: libXrandr-devel libXinerama-devel
 BuildRequires: docbook-utils docbook-utils-pdf docbook-style-xsl
 
-Requires: ghc
+Requires: libXrandr-devel libXinerama-devel
-Requires: libghc-dlist
-Requires: libghc-data-default
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -104,8 +99,7 @@ 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} %{SOURCE101} . ;;
-      "utf8-string-%{utf8string_version}") %{__cp} %{SOURCE102} . ;;
       *) ;;
   esac
 
@@ -139,7 +133,7 @@ cabal build
 cabal haddock
 cabal copy --destdir=${RPM_BUILD_ROOT}
 cabal register --inplace
-cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{name}-%{version}.conf
+cabal register --gen-pkg-config=${PKG_CONF_DIR}/%{pkg_name}-%{version}.conf
 
 %install
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/man/man1
@@ -179,6 +173,10 @@ ghc-pkg recache
 
 
 %changelog
+* Tue Jan 09 2018 Toshiaki Ara <ara_t@384.jp> 0.13
+- update to 0.13
+- build using ghc-8.2.2
+
 * Fri Feb 03 2017 Toshiaki Ara <ara_t@384.jp> 0.12-5
 - rebuild using ghc-8.0.1