[Gtk2hs-commit] gtk2hs gtk2hs.spec.in,1.8,1.9

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv10551

Modified Files:
	gtk2hs.spec.in 
Log Message:
(%build): Instead of "--with c2hs" rpmbuild
option, if %c2hs defined then pass it with --with-c2hs= to configure.
(%install): Install sourceview haskell.lang file.  Clean demo
to prevent binary files in doc dir.


Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtk2hs.spec.in	3 Nov 2003 14:16:26 -0000	1.8
+++ gtk2hs.spec.in	11 Nov 2003 12:03:38 -0000	1.9
@@ -63,13 +63,19 @@
 %setup -q
 
 %build
-./configure %{?_with_c2hs} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
+./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
 make prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version}
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version} install-without-pkg
 
+mkdirhier %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs
+cp -p demo/sourceview/haskell.lang %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs
+
+# hack to avoid demo binaries in docs 
+make clean MAKE_GOALS="demo/concurrent demo/treeList demo/graphic demo/unicode demo/hello demo/sourceview"
+
 %clean
 rm -rf %{buildroot}
 
@@ -93,6 +99,7 @@
 %files ghc%{ghc_version}
 %defattr(-,root,root) 
 %{_prefix}/lib/*
+%{_datadir}/gtksourceview-1.0/language-specs/haskell.lang
 %doc ChangeLog TODO AUTHORS COPYING.LIB
 
 %files doc
@@ -102,6 +109,14 @@
 %doc doc/MOGUL
 
 %changelog
+* Tue Nov 11 2003 Jens Petersen <pet...@ha...>
+- use %%c2hs instead of "--with c2hs" to configure c2hs program
+- clean demo to avoid binary files in docs dir
+
+* Mon Nov  3 2003 Jens Petersen <pet...@ha...>
+- add sourceview package to %%post and %%preun
+- install gtksourceview haskell.lang language-spec
+
 * Thu Jul 31 2003 Jens Petersen <pet...@ha...>
 - build with ghc-6.0.1
 - put demo dir in docs dir rather than individual source files