[bluetile] update with cabal-rpm and drop README.fedora

Jens Petersen petersen at fedoraproject.org
Tue Nov 20 08:29:53 UTC 2012


commit bb35d580f65c12f3083356ee0aeeba4b4513a2cc
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Nov 20 17:29:47 2012 +0900

    update with cabal-rpm and drop README.fedora

 README.fedora |   11 -----------
 bluetile.spec |   44 ++++++++++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 29 deletions(-)
---
diff --git a/bluetile.spec b/bluetile.spec
index 0f71130..e52803c 100644
--- a/bluetile.spec
+++ b/bluetile.spec
@@ -1,33 +1,40 @@
-# cabal2spec-0.25.2
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 Name:           bluetile
 Version:        0.6
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Tiling window manager for GNOME
 
-Group:          User Interface/X
 License:        BSD
-# BEGIN cabal2spec
-URL:            http://www.bluetile.org/
+URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-ExclusiveArch:  %{ghc_arches}
+Source1:        gnome-bluetile-session
+
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-# END cabal2spec
-Source1:        README.fedora
-Source2:        gnome-bluetile-session
-BuildRequires:  ghc-xmonad-contrib-devel
-BuildRequires:  ghc-gtk-devel
-BuildRequires:  ghc-glade-devel
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-ConfigFile-devel
+BuildRequires:  ghc-X11-devel
+BuildRequires:  ghc-X11-xft-devel
+BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-filepath-devel
+BuildRequires:  ghc-glade-devel
+BuildRequires:  ghc-gtk-devel
+BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-random-devel
 BuildRequires:  ghc-regex-compat-devel
+BuildRequires:  ghc-unix-devel
+BuildRequires:  ghc-utf8-string-devel
+BuildRequires:  ghc-xmonad-devel
+BuildRequires:  ghc-xmonad-contrib-devel
+# End cabal-rpm deps
 BuildRequires:  desktop-file-utils
 # bluetiledock uses gnome-open
 Requires:       libgnome
 Requires:       gnome-terminal
-#Patch1:         bluetile-0.5.3-WMName.patch
 
 %description
 Bluetile is a tiling window manager for Linux, designed to integrate with
@@ -40,9 +47,6 @@ conventions and providing both mouse and keyboard access for all features.
 
 %prep
 %setup -q
-#%%patch1 -p1 -b .orig
-
-cp -p %{SOURCE1} .
 
 
 %build
@@ -58,14 +62,14 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications misc/%{name}.des
 install -p -m 0644 -D misc/gnome-bluetile-session.desktop %{buildroot}%{_datadir}/xsessions/
 # replace gnome-bluetile-session with script
 rm %{buildroot}%{_bindir}/gnome-%{name}-session
-install -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/gnome-%{name}-session
+install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/gnome-%{name}-session
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -p -m 0644 man/bluetile.1 %{buildroot}%{_mandir}/man1
 
 
 %files
-%doc LICENSE README.fedora
+%doc LICENSE
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/gnome-%{name}-session
 %{_libexecdir}/%{name}*
@@ -76,6 +80,10 @@ install -p -m 0644 man/bluetile.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Tue Nov 20 2012 Jens Petersen <petersen at redhat.com> - 0.6-10
+- update with cabal-rpm
+- drop README.fedora
+
 * Fri Sep 28 2012 Jens Petersen <petersen at redhat.com> - 0.6-9
 - default config assumes gnome-terminal is installed
 


More information about the scm-commits mailing list