diff --git a/.gitignore b/.gitignore index bca1073..1dfc219 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ xmonad-0.9.1.tar.gz /xmonad-0.13.tar.gz /xmonad-0.15.tar.gz /xmonad-0.17.0.tar.gz +/xmonad-0.17.1.tar.gz +/xmonad-0.17.2.tar.gz +/xmonad-0.18.0.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..188c8fe --- /dev/null +++ b/changelog @@ -0,0 +1,408 @@ +* Wed Sep 14 2022 Jens Petersen - 0.17.1-1 +- https://hackage.haskell.org/package/xmonad-0.17.1/changelog +- disable testsuite (missing dependency) + +* Sat Jul 23 2022 Fedora Release Engineering - 0.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jun 17 2022 Jens Petersen - 0.17.0-2 +- rebuild + +* Mon May 30 2022 Iurii Mykhalskyi - 0.17.0-1 +- https://hackage.haskell.org/package/xmonad-0.17.0/changelog + +* Sat Jan 22 2022 Fedora Release Engineering - 0.15-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 08 2022 Miro Hrončok - 0.15-11 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + +* Fri Aug 06 2021 Jens Petersen - 0.15-10 +- rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 0.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Adam Jackson - 0.15-7 +- Require xmessage not xorg-x11-apps + +* Fri Jul 17 2020 Jens Petersen - 0.15-6 +- refresh to cabal-rpm-2.0.6 + +* Wed Feb 19 2020 Jens Petersen - 0.15-5 +- refresh to cabal-rpm-2.0.2 + +* Fri Jan 31 2020 Fedora Release Engineering - 0.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Aug 02 2019 Jens Petersen - 0.15-3 +- add doc and prof subpackages (cabal-rpm-1.0.0) + +* Sat Jul 27 2019 Fedora Release Engineering - 0.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Feb 21 2019 Jens Petersen - 0.15-1 +- update to 0.15 + +* Sun Feb 17 2019 Jens Petersen - 0.13-9 +- refresh to cabal-rpm-0.13 + +* Sun Feb 03 2019 Fedora Release Engineering - 0.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 28 2018 Jens Petersen - 0.13-7 +- rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Jens Petersen - 0.13-4 +- rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Jens Petersen - 0.13-1 +- update to 0.13 + +* Sat Feb 11 2017 Fedora Release Engineering - 0.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 17 2017 Jens Petersen - 0.12-3 +- xmonad-start now starts gnome-keyring if installed (Simon Guest, #1413338) + +* Thu Jun 30 2016 Jens Petersen - 0.12-2 +- rebuild + +* Sat Apr 23 2016 Ben Boeckel - 0.12-1 +- update to 0.12 +- sync with cabal-rpm-0.9.10 + +* Fri Feb 05 2016 Fedora Release Engineering - 0.11.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Sep 28 2015 Jens Petersen - 0.11.1-3 +- revert adding _JAVA_AWT_WM_NONREPARENTING since it seems unnecessary now +- allow building with utf8-string 1.0 + +* Wed Aug 5 2015 Jens Petersen - 0.11.1-2 +- use _JAVA_AWT_WM_NONREPARENTING=1 to handle Java apps correctly + (#1061568, thanks to Erik Streb del Toro) + +* Sun Jul 19 2015 Ben Boeckel - 0.11.1-1 +- Update to 0.11.1 + +* Fri Jun 19 2015 Fedora Release Engineering - 0.11-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 0.11-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Apr 22 2014 Jens Petersen - 0.11-11 +- no _pkgdocdir in EL7 + +* Sun Dec 22 2013 Jens Petersen - 0.11-10 +- add message about installing xmonad.hs to xmonad-start dialog + +* Fri Sep 13 2013 Jens Petersen - 0.11-9 +- drop the mate-file-manager-schemas requires since mate-panel has it now + (#1007219) + +* Thu Sep 12 2013 Jens Petersen - 0.11-8 +- update README.fedora + +* Thu Sep 12 2013 Jens Petersen - 0.11-7 +- mate-panel requires mate-file-manager-schemas to run (see #1007219) +- popup a zenity dialog for first-time users rather than manpage in terminal + +* Mon Aug 19 2013 Jens Petersen - 0.11-6 +- use new _pkgdocdir to handled unversioned docdir + +* Sun Aug 04 2013 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 07 2013 Jens Petersen - 0.11-5 +- update to new simplified Haskell Packaging Guidelines + +* Fri Mar 22 2013 Jens Petersen - 0.11-4 +- rebuild + +* Mon Feb 25 2013 Jens Petersen - 0.11-3 +- xmonad-gnome subpackage renamed to xmonad-mate + since gnome-panel in f19 is gone +- corresponding renamings from gnome to mate +- forward-port xmonad-start arg from f16 + +* Wed Jan 30 2013 Jens Petersen - 0.11-2 +- try to start gnome-screensaver for gnome sessions (#902850) + +* Fri Jan 18 2013 Jens Petersen - 0.11-1 +- update to 0.11 +- X11-1.6 and WM_TAKE_FOCUS patches no longer needed + +* Thu Dec 13 2012 Jens Petersen - 0.10-17 +- xmonad-gnome now requires gnome-panel and gnome-settings-daemon to start + +* Tue Nov 20 2012 Jens Petersen - 0.10-16 +- rebuild + +* Fri Nov 16 2012 Jens Petersen - 0.10-15 +- add upstream patches for ICCCM WM_TAKE_FOCUS protocol and + tracking currently processing event to fix focus for Java apps: + see http://code.google.com/p/xmonad/issues/detail?id=177 (#874855) +- update to cabal-rpm packaging + +* Sun Jul 22 2012 Fedora Release Engineering - 0.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 Jens Petersen - 0.10-13 +- change prof BRs to devel + +* Mon Jun 11 2012 Jens Petersen - 0.10-12 +- allow building with X11-1.6 + +* Thu May 31 2012 Jens Petersen - 0.10-11 +- really fix xmonad-start to use hardware-platform correctly + +* Tue May 29 2012 Jens Petersen - 0.10-10 +- fix user binary ldd check on i686/i386 using "uname -i" not "arch", + and then recompile directly instead of just touching xmonad.hs first + +* Fri May 25 2012 Jens Petersen - 0.10-9 +- basic subpackage should only obsolete core from before the split + +* Thu May 24 2012 Jens Petersen - 0.10-8 +- move xmonad.desktop from core to basic subpackage + +* Thu May 24 2012 Jens Petersen - 0.10-7 +- xmonad-start: if user binary has missing shared lib dependencies + touch xmonad.hs so it gets recompiled (#806624 reported by Erik Streb) + +* Fri Mar 23 2012 Jens Petersen - 0.10-6 +- try delaying manpage terminal startup 5s to avoid window resize +- add license to ghc_files + +* Mon Feb 20 2012 Jens Petersen - 0.10-5 +- use gnome-terminal to display initial manpage from xmonad-gnome +- change the xmonad-gnome session name to xmonad-gnome + +* Tue Feb 7 2012 Jens Petersen - 0.10-4 +- new "basic" meta-subpackage for pulling in xterm and dmenu for the default + basic upstream config, also used by the base package + +* Tue Feb 7 2012 Jens Petersen - 0.10-3 +- xmonad-gnome sessions now use gnomeConfig in xmonad.hs +- add note about gnome-panel menu activation in README.fedora + +* Fri Jan 6 2012 Jens Petersen - 0.10-2 +- update to cabal2spec-0.25.2 + +* Fri Dec 2 2011 Jens Petersen - 0.10-1 +- update to 0.10 and cabal2spec-0.24.1 +- depends on utf8-string +- re-enable haddock +- replace gnomeConfig in xmonad-start with xmonad.hs in new config subpackage +- drop the dynamic linking patch: dyn libs need to be default first (#744274) +- require dmenu + +* Wed Oct 26 2011 Marcela Mašláňová - 0.9.2-11.2 +- rebuild with new gmp without compat lib + +* Wed Oct 12 2011 Peter Schiffer - 0.9.2-11.1 +- rebuild with new gmp + +* Thu Jul 28 2011 Jens Petersen - 0.9.2-11 +- remove _isa again since it doesn't fix the libX11-devel multilib problem + +* Thu Jul 28 2011 Jens Petersen - 0.9.2-10 +- add _isa to the ghc-xmonad-contrib-devel requires to avoid missing libX11.so + when custom linking (reported by Evan Dale Aromin, #723558) + +* Thu Jun 16 2011 Jens Petersen - 0.9.2-9 +- ignore user configured packages when recompiling user xmonad.hs + to avoid linking errors (#713035) +- don't display README.fedora initially on startup anymore +- drop the ghc-xmonad requires from xmonad-core +- update to cabal2spec-0.23.2 + +* Fri May 13 2011 Jens Petersen - 0.9.2-8 +- add a core subpackage and let the base package can pull in ghc-xmonad*-devel +- add a gnome subpackage for the gnome session +- more README.fedora improvements +- xmonad-start: quote the xterm commands and support ~/.xmonad/session +- fix doc files conflicts by having xmonad-core require ghc-xmonad + +* Wed May 11 2011 Jens Petersen - 0.9.2-7 +- xmonad-start no longer execs xmonad not to confuse gnome-session +- xmonad-start now tries to setup a new xmonad.hs for GNOME desktop + if running a xmonad-gnome session with xmonad-contrib installed +- improvements to README.fedora + +* Fri Apr 22 2011 Jens Petersen - 0.9.2-6 +- drop explicit requires on ghc-xmonad-devel for lighter installs +- update readme to mention gsettings for gnome3 +- enable ppc64 build +- buildrequires desktop-file-utils +- add an xsession file for a gnome-session too +- add a gnome-session-3 .session file + +* Fri Apr 1 2011 Jens Petersen - 0.9.2-5 +- use desktop-file-install to install xmonad.desktop correctly +- update the desktop files for desktop-file-validate + +* Fri Mar 11 2011 Jens Petersen - 0.9.2-4 +- disable haddock for now to build + +* Thu Mar 10 2011 Fabio M. Di Nitto - 0.9.2-3 +- Enable build on sparcv9 + +* Mon Feb 07 2011 Fedora Release Engineering - 0.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 15 2011 Ben Boeckel - 0.9.2-1 +- Update to 0.9.2 + +* Sat Jan 15 2011 Ben Boeckel - 0.9.1-12 +- Update to cabal2spec-0.22.4 +- Rebuild +- Use %%{buildroot} + +* Sun Dec 5 2010 Jens Petersen - 0.9.1-11 +- rebuild + +* Fri Nov 26 2010 Jens Petersen - 0.9.1-10 +- backport exceptions changes from upstream darcs for ghc7 base4 +- update url and drop -o obsoletes + +* Sun Nov 07 2010 Ben Boeckel - 0.9.1-9 +- Rebuild + +* Wed Sep 29 2010 jkeating - 0.9.1-8 +- Rebuilt for gcc bug 634757 + +* Thu Sep 23 2010 Jens Petersen - 0.9.1-7 +- xmonad-start should run xterm in background +- improve README.fedora more + +* Sun Sep 12 2010 Jens Petersen - 0.9.1-6 +- add application desktop file for gnome-session to find xmonad + so setting /desktop/gnome/session/required_components/windowmanager now works +- add xmonad-dynamic-link.patch to dynamically link customized xmonad +- move display of manpage for new users from xmonad.hs to xmonad-start + and only display it when no ~/.xmonad/ +- drop skel file and dont create ~/.xmonad by default + +* Sat Sep 4 2010 Jens Petersen - 0.9.1-5 +- update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2) + +* Fri Jun 25 2010 Jens Petersen - 0.9.1-4 +- strip dynamic files (cabal2spec-0.21.4) + +* Tue Apr 27 2010 Jens Petersen - 0.9.1-3 +- rebuild against ghc-6.12.2 + +* Wed Jan 13 2010 Jens Petersen - 0.9.1-2 +- rebuild against ghc-mtl package + +* Mon Jan 11 2010 Jens Petersen - 0.9.1-1 +- update to 0.9.1 +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common_summary and common_description +- use ghc_name, ghc_binlib_package and ghc_pkg_deps +- build shared library +- drop X11_minver for now: it breaks macros +- drop redundant buildroot and its install cleaning + +* Tue Dec 8 2009 Jens Petersen - 0.9-4 +- drop the ppc build cabal workaround + +* Tue Nov 17 2009 Jens Petersen - 0.9-3 +- use %%ghc_pkg_ver for requires + +* Sun Nov 15 2009 Jens Petersen - 0.9-2 +- also buildrequires and requires ghc-X11-doc + +* Sun Nov 15 2009 Jens Petersen - 0.9-1 +- update to 0.9 (requires ghc-X11 >= 1.4.6.1) +- drop superfluous X11_version from ghc-X11 requires +- rename X11_version to X11_minver +- remove extra xmonad.hs under datadir + +* Thu Jul 30 2009 Yaakov M. Nemoy - 0.8.1-15 +- rebuild against newer packages from the mass rebuild + +* Mon Jul 27 2009 Fedora Release Engineering - 0.8.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat May 16 2009 Jens Petersen - 0.8.1-13 +- buildrequires ghc-rpm-macros (cabal2spec-0.16) +- rebuild for ghc-6.10.3 + +* Wed May 6 2009 Yaakov M. Nemoy - 0.8.1-12 +- applies changes from jens' patch +- renames xmonad.desktop entry +- adds .orig of the xmonad default config +- modifies manpage patch to use 'better' filenames +- renames manpage patch + +* Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-11 +- adds runghc hack taken from haddock + +* Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-10 +- converts the sample config into a patch on the upstream source +- renumbers down the source lines + +* Mon Apr 20 2009 Jens Petersen - 0.8.1-9 +- update to latest macros.ghc without ghc_version (cabal2spec-0.15) +- require xorg-x11-apps for xmessage + +* Mon Apr 6 2009 Jens Petersen +- merge xmonad-session into xmonad-start +- fix with_prof configure test + +* Thu Apr 02 2009 Till Maas - 0.8.1-8 +- remove tabs in spec +- rename start-xmonad to xmonad-start for consistency with xmonad-session +- add directory creation and exec of xmonad to start-xmonad +- install xmonad.hs that only displays manpage in /etc/skel/.xmonad/xmonad.hs +- add xterm dependency + +* Tue Mar 31 2009 Yaakov M. Nemoy - 0.8.1-7 +- added session and start scripts + +* Mon Mar 30 2009 Till Maas - 0.8.1-6 +- add desktop file +- install man page +- include sample config file (xmonad.hs) +- include other documentation files + +* Tue Mar 17 2009 Yaakov M. Nemoy - 0.8.1-5 +- refixes permissions after doing it wrong the first time + +* Fri Mar 13 2009 Yaakov M. Nemoy - 0.8.1-4 +- fixed license to BSD +- fixed version of X11 to be a tad more flexible +- fixes permissions of /usr/bin/xmonad + +* Mon Mar 2 2009 Yaakov M. Nemoy - 0.8.1-3 +- updated to newest cabal2spec 0.12 +- this includes the shiny new devel package + +* Tue Feb 24 2009 Yaakov M. Nemoy - 0.8.1-2 +- updated spec to meet new guidelines ala cabal2spec 0.7 + +* Wed Jan 21 2009 ynemoy - 0.8.1-1 +- initial packaging for Fedora created by cabal2spec diff --git a/sources b/sources index d79d3b3..11d7318 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmonad-0.17.0.tar.gz) = 1ec46ee61f4bf1879ea638e9be83378273050670ed2ee0f00e7d43b188cc29a874aa5b40076162a1ef0038802cc43f675773951f9b7d1f26329f9d105c28b3f7 +SHA512 (xmonad-0.18.0.tar.gz) = a43bacc20f125da79bf47d7ce9bd1c476b85e92360873496b47321634e4281cabc99503b28d27d115379750e831d2d35bb72aee964f8d4132e8663f53115ed2c diff --git a/xmonad-start b/xmonad-start index afd2d4a..fd873cd 100644 --- a/xmonad-start +++ b/xmonad-start @@ -1,38 +1,44 @@ #!/bin/sh -XMONAD_DIR=$HOME/.xmonad +if [ -f "$HOME/.xmonad/xmonad.hs" ]; then + XMONAD_DIR=$HOME/.xmonad + XMONAD_CUSTOM=$XMONAD_DIR/xmonad-$(uname -i)-linux +else + XMONAD_DIR=$HOME/.config/xmonad + XMONAD_CUSTOM=$HOME/.cache/xmonad/xmonad-$(uname -i)-linux +fi + # if no user configuration -if [ ! -d $XMONAD_DIR ]; then +if [ ! -f "$XMONAD_DIR/xmonad.hs" ]; then # add a desktop friendly config if possible if [ -r /usr/share/xmonad/xmonad.hs ]; then - mkdir $XMONAD_DIR - cp -p /usr/share/xmonad/xmonad.hs $XMONAD_DIR + mkdir -p "$XMONAD_DIR" + cp -p /usr/share/xmonad/xmonad.hs "$XMONAD_DIR" else - INFO="Install xmonad, xmonad-mate, or xmonad-config to customize xmonad." - echo "xmonad-start: $INFO" + CUSTOM_INFO="xmonad, xmonad-config, or xmonad-mate to customize xmonad" + echo "xmonad-start: install $CUSTOM_INFO" fi else - XMONAD_CUSTOM=$XMONAD_DIR/xmonad-$(uname -i)-linux # recompile if broken shared libs after an upgrade - if [ -r $XMONAD_DIR/xmonad.hs -a -x $XMONAD_CUSTOM ]; then - if ldd $XMONAD_CUSTOM | grep -q "not found"; then + if [ -x "$XMONAD_CUSTOM" ]; then + if ldd "$XMONAD_CUSTOM" | grep -q "not found"; then xmonad --recompile fi fi fi XMONADSTART_CACHEDIR=$HOME/.cache/xmonad-start -NO_DIALOG_FILE=$HOME/.cache/xmonad-start/no-startup-dialog +NO_DIALOG_FILE=$XMONADSTART_CACHEDIR/no-startup-dialog if [ -x "/usr/bin/zenity" -a ! -r "$NO_DIALOG_FILE" ]; then - if ! zenity --question --text="To open an terminal press: Alt-Shift-Return\n\nFor more keybindings and info see manpage: man xmonad\n\n${INFO:+$INFO\n\n}\nShow this dialog next time?"; then - mkdir -p $XMONADSTART_CACHEDIR - touch $NO_DIALOG_FILE + if ! zenity --question --text="To open an terminal press: Alt-Shift-Return\n\nFor more keybindings and info see manpage: man xmonad\n\n${CUSTOM_INFO:+Install $CUSTOM_INFO.\n\n}\nShow this dialog next time?"; then + mkdir -p "$XMONADSTART_CACHEDIR" + touch "$NO_DIALOG_FILE" fi fi -if [ -r $XMONAD_DIR/session ]; then - sh $XMONAD_DIR/session +if [ -r "$XMONAD_DIR/session" ]; then + sh "$XMONAD_DIR/session" fi if [ -x /usr/bin/gnome-keyring-daemon ]; then @@ -42,7 +48,7 @@ if [ -x /usr/bin/gnome-keyring-daemon ]; then fi if [ -n "$*" ]; then - if [ -d $XMONAD_DIR -a "$(ls -t $XMONAD_DIR | head -1)" = "xmonad.hs" ]; then + if [ -d "$XMONAD_DIR" -a "$(ls -t "$XMONAD_DIR" | head -1)" = "xmonad.hs" ]; then xmonad --recompile fi xmonad & diff --git a/xmonad.spec b/xmonad.spec index efa9bd5..304f0a6 100644 --- a/xmonad.spec +++ b/xmonad.spec @@ -1,21 +1,21 @@ -# generated by cabal-rpm-2.0.11.1 +# generated by cabal-rpm-2.3.0 --stream hackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name xmonad %global pkgver %{pkg_name}-%{version} +%{?haskell_setup} -%bcond_without tests +# testsuite missing deps: quickcheck-classes Name: %{pkg_name} -Version: 0.17.0 -Release: 3%{?dist} +Version: 0.18.0 +Release: %autorelease Summary: A tiling window manager -License: BSD -Url: https://hackage.haskell.org/package/%{name} +License: BSD-3-Clause +URL: https://hackage.haskell.org/package/xmonad # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources Source2: xmonad-session.desktop Source3: xmonad-start @@ -25,9 +25,21 @@ Source6: xmonad-mate-session.desktop Source7: xmonad.hs # Begin cabal-rpm deps: -BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-X11-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-class-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-process-devel +BuildRequires: ghc-setlocale-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-unix-devel +%if %{with ghc_prof} BuildRequires: ghc-X11-prof BuildRequires: ghc-base-prof BuildRequires: ghc-containers-prof @@ -40,8 +52,6 @@ BuildRequires: ghc-setlocale-prof BuildRequires: ghc-time-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-unix-prof -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel %endif # End cabal-rpm deps BuildRequires: desktop-file-utils @@ -90,7 +100,6 @@ Requires: xmonad-core = %{version}-%{release} # required until there is a command to open a system-default xterminal Requires: xterm Requires: dmenu -Obsoletes: xmonad-core < 0.10-5 Requires: zenity %description basic @@ -137,7 +146,6 @@ Summary: xmonad MATE session Requires: xmonad-config = %{version}-%{release} Requires: mate-session-manager, mate-terminal Requires: mate-panel, mate-settings-daemon -Obsoletes: xmonad-gnome < 0.11-3 %description mate xmonad is a tiling window manager for X. Windows are arranged @@ -180,7 +188,6 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -dos2unix -k -n %{SOURCE1} %{name}.cabal # End cabal-rpm setup cp -p %SOURCE5 . @@ -194,11 +201,13 @@ cp -p %SOURCE5 . %install # Begin cabal-rpm install %ghc_lib_install + +mkdir -p %{buildroot}%{_mandir}/man1/ +install -m 644 -p -t %{buildroot}%{_mandir}/man1/ ./man/xmonad.1 # End cabal-rpm install mv %{buildroot}%{_defaultlicensedir}/%{name}{,-core} -install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 install -p -m 0644 -D %SOURCE2 %{buildroot}%{_datadir}/xsessions/%{name}.desktop install -p -m 0755 -D %SOURCE3 %{buildroot}%{_bindir}/%{name}-start desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} @@ -229,7 +238,7 @@ install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs %doc man/xmonad.{hs,1{.html,.markdown}} %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/%{name}-start -%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/xmonad.1* %{_datadir}/applications/%{name}.desktop @@ -238,6 +247,9 @@ install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs %files -n ghc-%{name} -f ghc-%{name}.files +# Begin cabal-rpm files: +%license LICENSE +# End cabal-rpm files %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files @@ -256,407 +268,4 @@ install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs %changelog -* Sat Jul 23 2022 Fedora Release Engineering - 0.17.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jun 17 2022 Jens Petersen - 0.17.0-2 -- rebuild - -* Mon May 30 2022 Iurii Mykhalskyi - 0.17.0-1 -- https://hackage.haskell.org/package/xmonad-0.17.0/changelog - -* Sat Jan 22 2022 Fedora Release Engineering - 0.15-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Jan 08 2022 Miro Hrončok - 0.15-11 -- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 - -* Fri Aug 06 2021 Jens Petersen - 0.15-10 -- rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.15-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 0.15-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Adam Jackson - 0.15-7 -- Require xmessage not xorg-x11-apps - -* Fri Jul 17 2020 Jens Petersen - 0.15-6 -- refresh to cabal-rpm-2.0.6 - -* Wed Feb 19 2020 Jens Petersen - 0.15-5 -- refresh to cabal-rpm-2.0.2 - -* Fri Jan 31 2020 Fedora Release Engineering - 0.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Aug 02 2019 Jens Petersen - 0.15-3 -- add doc and prof subpackages (cabal-rpm-1.0.0) - -* Sat Jul 27 2019 Fedora Release Engineering - 0.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Feb 21 2019 Jens Petersen - 0.15-1 -- update to 0.15 - -* Sun Feb 17 2019 Jens Petersen - 0.13-9 -- refresh to cabal-rpm-0.13 - -* Sun Feb 03 2019 Fedora Release Engineering - 0.13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 28 2018 Jens Petersen - 0.13-7 -- rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.13-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 26 2018 Jens Petersen - 0.13-4 -- rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 23 2017 Jens Petersen - 0.13-1 -- update to 0.13 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 17 2017 Jens Petersen - 0.12-3 -- xmonad-start now starts gnome-keyring if installed (Simon Guest, #1413338) - -* Thu Jun 30 2016 Jens Petersen - 0.12-2 -- rebuild - -* Sat Apr 23 2016 Ben Boeckel - 0.12-1 -- update to 0.12 -- sync with cabal-rpm-0.9.10 - -* Fri Feb 05 2016 Fedora Release Engineering - 0.11.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Sep 28 2015 Jens Petersen - 0.11.1-3 -- revert adding _JAVA_AWT_WM_NONREPARENTING since it seems unnecessary now -- allow building with utf8-string 1.0 - -* Wed Aug 5 2015 Jens Petersen - 0.11.1-2 -- use _JAVA_AWT_WM_NONREPARENTING=1 to handle Java apps correctly - (#1061568, thanks to Erik Streb del Toro) - -* Sun Jul 19 2015 Ben Boeckel - 0.11.1-1 -- Update to 0.11.1 - -* Fri Jun 19 2015 Fedora Release Engineering - 0.11-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 0.11-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.11-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Apr 22 2014 Jens Petersen - 0.11-11 -- no _pkgdocdir in EL7 - -* Sun Dec 22 2013 Jens Petersen - 0.11-10 -- add message about installing xmonad.hs to xmonad-start dialog - -* Fri Sep 13 2013 Jens Petersen - 0.11-9 -- drop the mate-file-manager-schemas requires since mate-panel has it now - (#1007219) - -* Thu Sep 12 2013 Jens Petersen - 0.11-8 -- update README.fedora - -* Thu Sep 12 2013 Jens Petersen - 0.11-7 -- mate-panel requires mate-file-manager-schemas to run (see #1007219) -- popup a zenity dialog for first-time users rather than manpage in terminal - -* Mon Aug 19 2013 Jens Petersen - 0.11-6 -- use new _pkgdocdir to handled unversioned docdir - -* Sun Aug 04 2013 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jun 07 2013 Jens Petersen - 0.11-5 -- update to new simplified Haskell Packaging Guidelines - -* Fri Mar 22 2013 Jens Petersen - 0.11-4 -- rebuild - -* Mon Feb 25 2013 Jens Petersen - 0.11-3 -- xmonad-gnome subpackage renamed to xmonad-mate - since gnome-panel in f19 is gone -- corresponding renamings from gnome to mate -- forward-port xmonad-start arg from f16 - -* Wed Jan 30 2013 Jens Petersen - 0.11-2 -- try to start gnome-screensaver for gnome sessions (#902850) - -* Fri Jan 18 2013 Jens Petersen - 0.11-1 -- update to 0.11 -- X11-1.6 and WM_TAKE_FOCUS patches no longer needed - -* Thu Dec 13 2012 Jens Petersen - 0.10-17 -- xmonad-gnome now requires gnome-panel and gnome-settings-daemon to start - -* Tue Nov 20 2012 Jens Petersen - 0.10-16 -- rebuild - -* Fri Nov 16 2012 Jens Petersen - 0.10-15 -- add upstream patches for ICCCM WM_TAKE_FOCUS protocol and - tracking currently processing event to fix focus for Java apps: - see http://code.google.com/p/xmonad/issues/detail?id=177 (#874855) -- update to cabal-rpm packaging - -* Sun Jul 22 2012 Fedora Release Engineering - 0.10-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Jul 16 2012 Jens Petersen - 0.10-13 -- change prof BRs to devel - -* Mon Jun 11 2012 Jens Petersen - 0.10-12 -- allow building with X11-1.6 - -* Thu May 31 2012 Jens Petersen - 0.10-11 -- really fix xmonad-start to use hardware-platform correctly - -* Tue May 29 2012 Jens Petersen - 0.10-10 -- fix user binary ldd check on i686/i386 using "uname -i" not "arch", - and then recompile directly instead of just touching xmonad.hs first - -* Fri May 25 2012 Jens Petersen - 0.10-9 -- basic subpackage should only obsolete core from before the split - -* Thu May 24 2012 Jens Petersen - 0.10-8 -- move xmonad.desktop from core to basic subpackage - -* Thu May 24 2012 Jens Petersen - 0.10-7 -- xmonad-start: if user binary has missing shared lib dependencies - touch xmonad.hs so it gets recompiled (#806624 reported by Erik Streb) - -* Fri Mar 23 2012 Jens Petersen - 0.10-6 -- try delaying manpage terminal startup 5s to avoid window resize -- add license to ghc_files - -* Mon Feb 20 2012 Jens Petersen - 0.10-5 -- use gnome-terminal to display initial manpage from xmonad-gnome -- change the xmonad-gnome session name to xmonad-gnome - -* Tue Feb 7 2012 Jens Petersen - 0.10-4 -- new "basic" meta-subpackage for pulling in xterm and dmenu for the default - basic upstream config, also used by the base package - -* Tue Feb 7 2012 Jens Petersen - 0.10-3 -- xmonad-gnome sessions now use gnomeConfig in xmonad.hs -- add note about gnome-panel menu activation in README.fedora - -* Fri Jan 6 2012 Jens Petersen - 0.10-2 -- update to cabal2spec-0.25.2 - -* Fri Dec 2 2011 Jens Petersen - 0.10-1 -- update to 0.10 and cabal2spec-0.24.1 -- depends on utf8-string -- re-enable haddock -- replace gnomeConfig in xmonad-start with xmonad.hs in new config subpackage -- drop the dynamic linking patch: dyn libs need to be default first (#744274) -- require dmenu - -* Wed Oct 26 2011 Marcela Mašláňová - 0.9.2-11.2 -- rebuild with new gmp without compat lib - -* Wed Oct 12 2011 Peter Schiffer - 0.9.2-11.1 -- rebuild with new gmp - -* Thu Jul 28 2011 Jens Petersen - 0.9.2-11 -- remove _isa again since it doesn't fix the libX11-devel multilib problem - -* Thu Jul 28 2011 Jens Petersen - 0.9.2-10 -- add _isa to the ghc-xmonad-contrib-devel requires to avoid missing libX11.so - when custom linking (reported by Evan Dale Aromin, #723558) - -* Thu Jun 16 2011 Jens Petersen - 0.9.2-9 -- ignore user configured packages when recompiling user xmonad.hs - to avoid linking errors (#713035) -- don't display README.fedora initially on startup anymore -- drop the ghc-xmonad requires from xmonad-core -- update to cabal2spec-0.23.2 - -* Fri May 13 2011 Jens Petersen - 0.9.2-8 -- add a core subpackage and let the base package can pull in ghc-xmonad*-devel -- add a gnome subpackage for the gnome session -- more README.fedora improvements -- xmonad-start: quote the xterm commands and support ~/.xmonad/session -- fix doc files conflicts by having xmonad-core require ghc-xmonad - -* Wed May 11 2011 Jens Petersen - 0.9.2-7 -- xmonad-start no longer execs xmonad not to confuse gnome-session -- xmonad-start now tries to setup a new xmonad.hs for GNOME desktop - if running a xmonad-gnome session with xmonad-contrib installed -- improvements to README.fedora - -* Fri Apr 22 2011 Jens Petersen - 0.9.2-6 -- drop explicit requires on ghc-xmonad-devel for lighter installs -- update readme to mention gsettings for gnome3 -- enable ppc64 build -- buildrequires desktop-file-utils -- add an xsession file for a gnome-session too -- add a gnome-session-3 .session file - -* Fri Apr 1 2011 Jens Petersen - 0.9.2-5 -- use desktop-file-install to install xmonad.desktop correctly -- update the desktop files for desktop-file-validate - -* Fri Mar 11 2011 Jens Petersen - 0.9.2-4 -- disable haddock for now to build - -* Thu Mar 10 2011 Fabio M. Di Nitto - 0.9.2-3 -- Enable build on sparcv9 - -* Mon Feb 07 2011 Fedora Release Engineering - 0.9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 15 2011 Ben Boeckel - 0.9.2-1 -- Update to 0.9.2 - -* Sat Jan 15 2011 Ben Boeckel - 0.9.1-12 -- Update to cabal2spec-0.22.4 -- Rebuild -- Use %%{buildroot} - -* Sun Dec 5 2010 Jens Petersen - 0.9.1-11 -- rebuild - -* Fri Nov 26 2010 Jens Petersen - 0.9.1-10 -- backport exceptions changes from upstream darcs for ghc7 base4 -- update url and drop -o obsoletes - -* Sun Nov 07 2010 Ben Boeckel - 0.9.1-9 -- Rebuild - -* Wed Sep 29 2010 jkeating - 0.9.1-8 -- Rebuilt for gcc bug 634757 - -* Thu Sep 23 2010 Jens Petersen - 0.9.1-7 -- xmonad-start should run xterm in background -- improve README.fedora more - -* Sun Sep 12 2010 Jens Petersen - 0.9.1-6 -- add application desktop file for gnome-session to find xmonad - so setting /desktop/gnome/session/required_components/windowmanager now works -- add xmonad-dynamic-link.patch to dynamically link customized xmonad -- move display of manpage for new users from xmonad.hs to xmonad-start - and only display it when no ~/.xmonad/ -- drop skel file and dont create ~/.xmonad by default - -* Sat Sep 4 2010 Jens Petersen - 0.9.1-5 -- update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2) - -* Fri Jun 25 2010 Jens Petersen - 0.9.1-4 -- strip dynamic files (cabal2spec-0.21.4) - -* Tue Apr 27 2010 Jens Petersen - 0.9.1-3 -- rebuild against ghc-6.12.2 - -* Wed Jan 13 2010 Jens Petersen - 0.9.1-2 -- rebuild against ghc-mtl package - -* Mon Jan 11 2010 Jens Petersen - 0.9.1-1 -- update to 0.9.1 -- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: -- drop doc and prof bcond -- use common_summary and common_description -- use ghc_name, ghc_binlib_package and ghc_pkg_deps -- build shared library -- drop X11_minver for now: it breaks macros -- drop redundant buildroot and its install cleaning - -* Tue Dec 8 2009 Jens Petersen - 0.9-4 -- drop the ppc build cabal workaround - -* Tue Nov 17 2009 Jens Petersen - 0.9-3 -- use %%ghc_pkg_ver for requires - -* Sun Nov 15 2009 Jens Petersen - 0.9-2 -- also buildrequires and requires ghc-X11-doc - -* Sun Nov 15 2009 Jens Petersen - 0.9-1 -- update to 0.9 (requires ghc-X11 >= 1.4.6.1) -- drop superfluous X11_version from ghc-X11 requires -- rename X11_version to X11_minver -- remove extra xmonad.hs under datadir - -* Thu Jul 30 2009 Yaakov M. Nemoy - 0.8.1-15 -- rebuild against newer packages from the mass rebuild - -* Mon Jul 27 2009 Fedora Release Engineering - 0.8.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat May 16 2009 Jens Petersen - 0.8.1-13 -- buildrequires ghc-rpm-macros (cabal2spec-0.16) -- rebuild for ghc-6.10.3 - -* Wed May 6 2009 Yaakov M. Nemoy - 0.8.1-12 -- applies changes from jens' patch -- renames xmonad.desktop entry -- adds .orig of the xmonad default config -- modifies manpage patch to use 'better' filenames -- renames manpage patch - -* Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-11 -- adds runghc hack taken from haddock - -* Mon Apr 27 2009 Yaakov M. Nemoy - 0.8.1-10 -- converts the sample config into a patch on the upstream source -- renumbers down the source lines - -* Mon Apr 20 2009 Jens Petersen - 0.8.1-9 -- update to latest macros.ghc without ghc_version (cabal2spec-0.15) -- require xorg-x11-apps for xmessage - -* Mon Apr 6 2009 Jens Petersen -- merge xmonad-session into xmonad-start -- fix with_prof configure test - -* Thu Apr 02 2009 Till Maas - 0.8.1-8 -- remove tabs in spec -- rename start-xmonad to xmonad-start for consistency with xmonad-session -- add directory creation and exec of xmonad to start-xmonad -- install xmonad.hs that only displays manpage in /etc/skel/.xmonad/xmonad.hs -- add xterm dependency - -* Tue Mar 31 2009 Yaakov M. Nemoy - 0.8.1-7 -- added session and start scripts - -* Mon Mar 30 2009 Till Maas - 0.8.1-6 -- add desktop file -- install man page -- include sample config file (xmonad.hs) -- include other documentation files - -* Tue Mar 17 2009 Yaakov M. Nemoy - 0.8.1-5 -- refixes permissions after doing it wrong the first time - -* Fri Mar 13 2009 Yaakov M. Nemoy - 0.8.1-4 -- fixed license to BSD -- fixed version of X11 to be a tad more flexible -- fixes permissions of /usr/bin/xmonad - -* Mon Mar 2 2009 Yaakov M. Nemoy - 0.8.1-3 -- updated to newest cabal2spec 0.12 -- this includes the shiny new devel package - -* Tue Feb 24 2009 Yaakov M. Nemoy - 0.8.1-2 -- updated spec to meet new guidelines ala cabal2spec 0.7 - -* Wed Jan 21 2009 ynemoy - 0.8.1-1 -- initial packaging for Fedora created by cabal2spec +%autochangelog