dist-git conversion

- condition ghc_lib_package
- depend on utf8-string again

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ghc-xmonad-contrib
-# $Id: Makefile,v 1.1 2009/09/22 16:36:10 kevin Exp $
-NAME := ghc-xmonad-contrib
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ghc-xmonad-contrib.spec

@@ -13,7 +13,7 @@ extensions, see "XMonad.Doc". In particular:\
 "XMonad.Doc.Developing", introduction to xmonad internals and writing\
 your own extensions.
 
-%global ghc_pkg_deps ghc-X11-xft-devel, ghc-xmonad-devel
+%global ghc_pkg_deps ghc-X11-xft-devel, ghc-utf8-string-devel, ghc-xmonad-devel
 
 %bcond_without shared
 
@@ -22,7 +22,7 @@ your own extensions.
 
 Name:           ghc-%{pkg_name}
 Version:        0.9.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -43,7 +43,7 @@ This package provides the shared library.
 %endif
 
 
-%ghc_lib_package
+%{?ghc_lib_package}
 
 
 %prep
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 29 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-4
+- condition ghc_lib_package
+- depend on utf8-string again
+
 * Fri Jan 15 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-3
 - utf8-string is part of ghc so drop ghc-utf8-string-devel dependency
 

import.log

@@ -1 +0,0 @@
-ghc-xmonad-contrib-0_8_1-8_fc11:HEAD:ghc-xmonad-contrib-0.8.1-8.fc11.src.rpm:1253827158