Hello community,
here is the log from the commit of package xmonad for openSUSE:Factory checked
in at 2016-07-21 08:01:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmonad (Old)
and /work/SRC/openSUSE:Factory/.xmonad.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmonad"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes 2015-12-24
12:17:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2016-07-21
08:01:24.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:30:24 UTC 2016 - psim...@suse.com
+
+- Update to version 0.12 revision 0 with cabal2obs.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmonad.spec ++++++
--- /var/tmp/diff_new_pack.QugLVz/_old 2016-07-21 08:01:25.000000000 +0200
+++ /var/tmp/diff_new_pack.QugLVz/_new 2016-07-21 08:01:25.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xmonad
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,18 @@
%global pkg_name xmonad
-# no useful debuginfo for Haskell packages without C sources
-%global debug_package %{nil}
-Name: xmonad
+%bcond_with tests
+Name: %{pkg_name}
Version: 0.12
Release: 0
Summary: A tiling window manager
License: BSD-3-Clause
-Group: System/GUI/Other
+Group: Development/Languages/Other
Url: https://hackage.haskell.org/package/%{name}
-Source0: %{name}-%{version}.tar.gz
-Source1: xmonad.desktop
+Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source10: xmonad.desktop
+# Begin cabal-rpm deps:
+BuildRequires: chrpath
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-X11-devel
BuildRequires: ghc-containers-devel
@@ -41,11 +42,16 @@
BuildRequires: ghc-setlocale-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-utf8-string-devel
+# End cabal-rpm deps
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(xinerama)
Suggests: ghc-xmonad-contrib-devel
Suggests: ghc-xmonad-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with tests}
+BuildRequires: ghc-QuickCheck-devel
+%endif
%description
Xmonad is a tiling window manager for X. Windows are arranged automatically to
@@ -68,6 +74,9 @@
Summary: Haskell %{name} library development files
Group: Development/Libraries/Other
Requires: ghc-%{name} = %{version}-%{release}
+Requires: ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
%description -n ghc-%{name}-devel
This package provides the Haskell %{name} library development files.
@@ -75,20 +84,32 @@
%prep
%setup -q
+
%build
%ghc_lib_build
+
%install
-%{ghc_lib_install}
+%ghc_lib_install
+
install -d %{buildroot}%{_mandir}/man1/
mv %{buildroot}%{_datadir}/%{name}-%{version}/man/%{name}.1
%{buildroot}%{_mandir}/man1/
gzip %{buildroot}%{_mandir}/man1/%{name}.1
# Gzipping here because when we gzip it in %%build step, it breaks cabal setup
%define desktop_src %{buildroot}%{_datadir}/xsessions/xmonad.desktop
-install -m0644 -D %{SOURCE1} %{desktop_src}
+install -m0644 -D %{SOURCE10} %{desktop_src}
%suse_update_desktop_file %{desktop_src}
+%ghc_fix_dynamic_rpath %{pkg_name}
+
+
+%check
+%if %{with tests}
+%{cabal} test
+%endif
+
+
%post -n ghc-%{name}-devel
%ghc_pkg_recache
@@ -100,8 +121,11 @@
%doc LICENSE
%doc README.md TODO
%{_bindir}/%{name}
-%{_datadir}/%{name}-%{version}
-%{_mandir}/man1/xmonad.1.gz
+%dir %{_datadir}/%{name}-%{version}
+%dir %{_datadir}/%{name}-%{version}/man
+%{_datadir}/%{name}-%{version}/man/xmonad.hs
+%{_mandir}/man1/xmonad.1%{ext_man}
+%{_datadir}/%{name}-%{version}/man/xmonad.1.html
%{_datadir}/xsessions/xmonad.desktop
%files -n ghc-%{name} -f ghc-%{name}.files
