From: Jens-Ulrik P. <ju...@us...> - 2005-01-18 12:14:12
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17480 Modified Files: gtk2hs.spec.in Log Message: more minor spec file cleaning: - remove buildrequirement of ghc-doc for now - improve -doc summary Index: gtk2hs.spec.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gtk2hs.spec.in 17 Jan 2005 18:40:37 -0000 1.11 +++ gtk2hs.spec.in 18 Jan 2005 12:14:01 -0000 1.12 @@ -18,9 +18,7 @@ Source: gtk2hs-%{version}.tar.gz URL: http://gtk2hs.sourceforge.net/ BuildRoot: /var/tmp/gtk2hs-%{version}-root -# --with-c2hs not currently supported -#BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{?_with_c2hs: c2hs >= 0.13.4}, %{ghcver}-doc = %{ghc_version} -BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{ghcver}-doc = %{ghc_version} +BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock BuildRequires: gtk2-devel, gtksourceview-devel, libglade2-devel, GConf2-devel, mozilla-devel = %{mozver} %description @@ -46,7 +44,7 @@ This package contains the libraries compiled for ghc-%{ghc_version}. %package doc -Summary: A Haskell GUI library based on the Gtk+ GUI toolkit +Summary: Haskell Gtk+ GUI library documentation Group: Development/Languages/Haskell %description doc @@ -127,11 +125,8 @@ %setup -q %build -# --with-c2hs not currently supported -#./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-docs --without-pkgreg --prefix=%{_prefix} --libdir=%{ghclibdir} ./configure --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-docs --without-pkgreg --prefix=%{_prefix} --libdir=%{ghclibdir} - LANG=C make all %install @@ -142,6 +137,7 @@ rm -rf %{buildroot} %define ghcpkg_inst env pkglibdir=%{gtk2hsdir} ghc-pkg-%{ghc_version} -u -i + %post -n gtk2hs-%{ghcver} %{ghcpkg_inst} %{gtk2hsdir}/gtk.pkg %{ghcpkg_inst} %{gtk2hsdir}/mogul.pkg @@ -249,7 +245,7 @@ %{gtk2hsdir}/imports/sourceview %changelog -* Thu Aug 19 2004 Jens Petersen <pet...@re...> +* Thu Aug 19 2004 Jens Petersen <pet...@ha...> - use suffix -ghc621 instead of -ghc6.2.1 and conflict with old packages - buildrequire ghc-doc and gtk2hs-doc-ghc621 requires ghc-doc - move docs and demo files to %{_defaultdocdir}/gtk2hs |