[Gtk2hs-commit] gtk2hs ChangeLog,1.313,1.314 gtk2hs.spec.in,1.12,1.13

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27321

Modified Files:
	ChangeLog gtk2hs.spec.in 
Log Message:
Revert to building the GHCi .o files in a post-install action and removing
them in a uninstall action.


Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gtk2hs.spec.in	18 Jan 2005 12:14:01 -0000	1.12
+++ gtk2hs.spec.in	19 Jan 2005 03:46:18 -0000	1.13
@@ -136,7 +136,7 @@
 %clean
 rm -rf %{buildroot}
 
-%define ghcpkg_inst env pkglibdir=%{gtk2hsdir} ghc-pkg-%{ghc_version} -u -i
+%define ghcpkg_inst env pkglibdir=%{gtk2hsdir} ghc-pkg-%{ghc_version} -u -g -i
 
 %post -n gtk2hs-%{ghcver}
 %{ghcpkg_inst} %{gtk2hsdir}/gtk.pkg
@@ -159,32 +159,38 @@
 
 %preun -n gtk2hs-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/{HSgtk,HSmogul}.o
   ghc-pkg-%{ghc_version} -r mogul || :
   ghc-pkg-%{ghc_version} -r gtk || :
 fi
 
 %preun gconf-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSgconf.o
   ghc-pkg-%{ghc_version} -r gconf || :
 fi
 
 %preun glade-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSglade.o
   ghc-pkg-%{ghc_version} -r glade || :
 fi
 
 %preun glib-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSglib.o
   ghc-pkg-%{ghc_version} -r glib || :
 fi
 
 %preun mozembed-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSmozembed.o
   ghc-pkg-%{ghc_version} -r mozembed || :
 fi
 
 %preun sourceview-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSsourceview.o
   ghc-pkg-%{ghc_version} -r sourceview || :
 fi
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- ChangeLog	19 Jan 2005 03:45:26 -0000	1.313
+++ ChangeLog	19 Jan 2005 03:46:18 -0000	1.314
@@ -39,6 +39,9 @@
 	$(datadir)/doc/gtk2hs/html/ to just $(datadir)/doc/gtk2hs/ to conform
 	with the cabal haddock convention.
 
+	* gtk2hs.spec.in: revert to building the GHCi .o files in a
+	post-install action and removing them in a uninstall action.
+
 2005-01-17 Duncan Coutts <du...@co...>
 
 	* configure.ac: add an extra option --without-pkgreg to allow