From: <ju...@us...> - 2003-05-23 01:01:28
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv16016 Modified Files: ChangeLog Makefile gtk2hs.spec.in Log Message: 2003-05-23 Jens Petersen <pet...@re...> * gendoc/XMLwrite.hs (makeSymDescr): Move colspecs inside the tgroup. * doc/Makefile (html%): Make xsltproc write output directly to subdirectory. Create the directory first if necessary. (fo%): Ditto. (clean): Remove reference xml files. * gtk2hs.spec.in (build): Pass docbook catalog and html xsl to configure and build html docs. (post): Give "-g" option to ghc-pkg to have ghci object files generated. (preun): Always remove any old ghci object files. (files): Include gtk and mogul docs in doc dir. * Makefile (EXTRA_TARFILES): Include gtk2hs.spec after all. Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** ChangeLog 22 May 2003 09:19:18 -0000 1.74 --- ChangeLog 23 May 2003 01:01:24 -0000 1.75 *************** *** 1,2 **** --- 1,21 ---- + 2003-05-23 Jens Petersen <pet...@re...> + + * gendoc/XMLwrite.hs (makeSymDescr): Move colspecs inside the + tgroup. + + * doc/Makefile (html%): Make xsltproc write output directly to + subdirectory. Create the directory first if necessary. + (fo%): Ditto. + (clean): Remove reference xml files. + + * gtk2hs.spec.in (build): Pass docbook catalog and html xsl to + configure and build html docs. + (post): Give "-g" option to ghc-pkg to have ghci object files + generated. + (preun): Always remove any old ghci object files. + (files): Include gtk and mogul docs in doc dir. + + * Makefile (EXTRA_TARFILES): Include gtk2hs.spec after all. + 2003-05-22 Axel Simon <A....@ke...> *************** *** 7,11 **** 2003-05-17 Axel Simon <A....@ke...> ! * gtk/gdk/Pixbuf.chs: Fixed dcumentation on creating inline pictures. 2003-05-18 Jens Petersen <pet...@re...> --- 26,30 ---- 2003-05-17 Axel Simon <A....@ke...> ! * gtk/gdk/Pixbuf.chs: Fixed documentation on creating inline pictures. 2003-05-18 Jens Petersen <pet...@re...> Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 16 May 2003 06:30:07 -0000 1.12 --- Makefile 23 May 2003 01:01:25 -0000 1.13 *************** *** 90,94 **** mk/config.mk.in mk/common.mk mk/application.mk \ mk/library.mk mk/chsDepend.in install-sh \ ! config.sub config.guess gtk2hs.spec.in ) dist : --- 90,94 ---- mk/config.mk.in mk/common.mk mk/application.mk \ mk/library.mk mk/chsDepend.in install-sh \ ! config.sub config.guess gtk2hs.spec.in gtk2hs.spec ) dist : Index: gtk2hs.spec.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gtk2hs.spec.in 16 May 2003 05:53:33 -0000 1.3 --- gtk2hs.spec.in 23 May 2003 01:01:25 -0000 1.4 *************** *** 31,37 **** %build ! ./configure %{?_with_c2hs} --with-hcflags="-O" ! make BUILDDOCS=no prefix=%{_prefix} libdir=%{_libdir}/ghc-%{_ghc_version} ! #make -Cdoc htmlGTK %install --- 31,36 ---- %build ! ./configure %{?_with_c2hs} --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 *************** *** 47,54 **** # %{_libdir}/ghc-%{_ghc_version}/{%{name}/gtk2.conf,mogul.conf} ! ghc-pkg-%{_ghc_version} -u -i %{_libdir}/ghc-%{_ghc_version}/%{name}/gtk2.conf ! ghc-pkg-%{_ghc_version} -u -i %{_libdir}/ghc-%{_ghc_version}/mogul.conf %preun if [ "$1" = 0 ]; then ghc-pkg-%{_ghc_version} -r mogul --- 46,54 ---- # %{_libdir}/ghc-%{_ghc_version}/{%{name}/gtk2.conf,mogul.conf} ! ghc-pkg-%{_ghc_version} -u -g -i %{_libdir}/ghc-%{_ghc_version}/%{name}/gtk2.conf ! ghc-pkg-%{_ghc_version} -u -g -i %{_libdir}/ghc-%{_ghc_version}/mogul.conf %preun + rm -f %{_libdir}/ghc-%{_ghc_version}/{%{name}/gtk2hs.o,mogul.o} if [ "$1" = 0 ]; then ghc-pkg-%{_ghc_version} -r mogul *************** *** 60,70 **** %doc ChangeLog TODO AUTHORS COPYING.LIB %doc demo/*/*.hs ! #%doc doc/GTK %{_prefix}/lib/* %changelog * Thu May 15 2003 Jens Petersen <pet...@re...> - use new DESTDIR make variable, so no longer need to fix config files in post - remove buildroot before install * Fri Jan 10 2003 Jens Petersen <pet...@ha...> --- 60,77 ---- %doc ChangeLog TODO AUTHORS COPYING.LIB %doc demo/*/*.hs ! %doc doc/GTK ! %doc doc/MOGUL %{_prefix}/lib/* %changelog + * Wed May 21 2003 Jens Petersen <pet...@re...> + - add -g option to ghc-pkg -u so that ghci object gets generated + - delete them when uninstalling + - build and include mogul documentation + * Thu May 15 2003 Jens Petersen <pet...@re...> - use new DESTDIR make variable, so no longer need to fix config files in post - remove buildroot before install + - build and include gtk docs * Fri Jan 10 2003 Jens Petersen <pet...@ha...> |