rpms/ghc-X11/devel .cvsignore, 1.3, 1.4 ghc-X11.spec, 1.18, 1.19 sources, 1.3, 1.4

[Yaakov Meir Nemoy]

Author: ynemoy

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

Modified Files:
	.cvsignore ghc-X11.spec sources 
Log Message:
Updates upstream
Updates spec to use shared libraries and new ghc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	31 Oct 2009 18:22:48 -0000	1.3
+++ .cvsignore	21 Dec 2009 12:57:31 -0000	1.4
@@ -1,2 +1 @@
-X11-1.4.5.tar.gz
-X11-1.4.6.1.tar.gz
+X11-1.5.0.0.tar.gz


Index: ghc-X11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/ghc-X11.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ghc-X11.spec	31 Oct 2009 18:22:48 -0000	1.18
+++ ghc-X11.spec	21 Dec 2009 12:57:31 -0000	1.19
@@ -2,12 +2,13 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        1.4.6.1
+Version:        1.5.0.0
 Release:        1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
@@ -15,10 +16,9 @@ Group:          Development/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc, ghc-rpm-macros >= 0.3.1
 %if %{with doc}
 BuildRequires:  ghc-doc
 %endif
@@ -39,8 +39,11 @@ Summary:        Haskell %{pkg_name} libr
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
 Requires:       libXinerama-devel, libX11-devel, libXext-devel
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description devel
 This package contains the development files for %{name}
@@ -83,13 +86,12 @@ built for ghc-%{ghc_version}.
 %if %{with doc}
 %cabal haddock
 %endif
-%ghc_gen_scripts
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %cabal_install
-%ghc_install_scripts
+%cabal_pkg_conf
+
 %ghc_gen_filelists %{name}
 
 
@@ -98,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -107,10 +109,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%postun devel
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -121,6 +121,13 @@ fi
 %endif
 
 
+%if %{with shared}
+%files -f %{name}.files
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}
+%endif
+
+
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}
@@ -139,6 +146,10 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.5.0.0-1
+- updated to latest upstream
+- updates spec to use shared libraries and new ghc
+
 * Thu Oct 29 2009 Yaakov M. Nemoy <ynemoy at fedoraproject.org> - 1.4.6.1-1
 - update to latest upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-X11/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	31 Oct 2009 18:22:48 -0000	1.3
+++ sources	21 Dec 2009 12:57:31 -0000	1.4
@@ -1 +1 @@
-c60c94847e59895cd4a54e6405375851  X11-1.4.6.1.tar.gz
+ec6670f5ce1812206903c8a0fd9df04c  X11-1.5.0.0.tar.gz