rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.20,1.21

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7091

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
update to new ghcpkgdir and ghcdocdir macros


Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ghc-gtk2hs.spec	25 Apr 2009 23:32:31 -0000	1.20
+++ ghc-gtk2hs.spec	26 Apr 2009 00:20:06 -0000	1.21
@@ -158,7 +158,7 @@
 %endif\
 \
 %post -n ghc-%1-devel\
-ghc-pkg-%{ghc_version} update %{pkg_libdir}/%1.package.conf &>/dev/null || : \
+ghc-pkg-%{ghc_version} update %{ghcpkgdir}/%1.package.conf &>/dev/null || : \
 \
 %preun -n ghc-%1-devel\
 if [ "$1" = 0 ]; then\
@@ -167,16 +167,16 @@
 \
 %files -n ghc-%1-devel\
 %defattr(-,root,root,-)\
-%{pkg_libdir}/%1.cabal\
-%{pkg_libdir}/%1.package.conf\
-%{pkg_libdir}/libHS%1.a\
-%{pkg_libdir}/HS%1.o\
-%{pkg_libdir}/imports/%1\
+%{ghcpkgdir}/%1.cabal\
+%{ghcpkgdir}/%1.package.conf\
+%{ghcpkgdir}/libHS%1.a\
+%{ghcpkgdir}/HS%1.o\
+%{ghcpkgdir}/imports/%1\
 \
 %if %{with prof}\
 %files -n ghc-%1-prof\
 %defattr(-,root,root,-)\
-%{pkg_libdir}/libHS%{1}_p.a\
+%{ghcpkgdir}/libHS%{1}_p.a\
 %endif
 
 %subpackage cairo cairo glib
@@ -246,12 +246,12 @@
 %{nil}
 
 # C locale to workaround c2hs failing in CJK locale
-LANG=C make all pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
+LANG=C make all pkglibdir=%{ghcpkgdir} htmldocdir=%{ghcdocdir}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
+make install DESTDIR=%{buildroot} pkglibdir=%{ghcpkgdir} htmldocdir=%{ghcdocdir}
 
 
 %clean
@@ -274,17 +274,17 @@
 %files common
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING*
-%dir %{pkg_libdir}
-%dir %{pkg_libdir}/imports
-%dir %{pkg_libdir}/include
-%{pkg_libdir}/include/gtk2hs-config.h
+%dir %{ghcpkgdir}
+%dir %{ghcpkgdir}/imports
+%dir %{ghcpkgdir}/include
+%{ghcpkgdir}/include/gtk2hs-config.h
 
 
 %if %{with docs}
 %files doc
 %defattr(-,root,root,-)
 %doc ChangeLog TODO demo
-%{pkg_docdir}
+%{ghcdocdir}
 %endif
 
 
@@ -292,6 +292,7 @@
 * Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-5
 - rebuild against ghc-6.10.2
 - use haddock-2.4.2
+- update to new ghcpkgdir and ghcdocdir macros
 
 * Tue Apr 14 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-4
 - use define not global to define subpackage since it broke ?3: expansion