rpms/ghc-utf8-string/devel .cvsignore, 1.2, 1.3 ghc-utf8-string.spec, 1.3, 1.4 sources, 1.2, 1.3

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc-utf8-string/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26795

Modified Files:
	.cvsignore ghc-utf8-string.spec sources 
Log Message:
- update to 0.3.6
- update packaging for ghc-6.12.1
- added shared library support: needs ghc-rpm-macros 0.3.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc-utf8-string/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jun 2009 20:00:34 -0000	1.2
+++ .cvsignore	22 Dec 2009 15:49:58 -0000	1.3
@@ -1 +1 @@
-utf8-string-0.3.5.tar.gz
+utf8-string-0.3.6.tar.gz


Index: ghc-utf8-string.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-utf8-string/devel/ghc-utf8-string.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-utf8-string.spec	16 Nov 2009 09:31:02 -0000	1.3
+++ ghc-utf8-string.spec	22 Dec 2009 15:49:58 -0000	1.4
@@ -2,23 +2,23 @@
 
 %bcond_without doc
 %bcond_without prof
+%bcond_without shared
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.3.5
-Release:        3%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        Haskell UTF8 layer for IO and Strings
 
-Group:          Development/Libraries
+Group:          System Environment/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
@@ -32,11 +32,14 @@ for encoding UTF8 strings to Word8 lists
 UTF8 without truncation. 
 
 %package devel
-Summary:        Haskell UTF8 layer for IO and Strings
+Summary:        Haskell UTF8 layer for IO and Strings development files
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+Requires(postun): ghc = %{ghc_version}
+%if %{with shared}
+Requires:       %{name} = %{version}-%{release}
+%endif
 
 %description devel
 The utf8-string package provides operations
@@ -84,13 +87,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}
 
 
@@ -99,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post devel
-%ghc_register_pkg
+ghc-pkg recache
 
 
 %if %{with doc}
@@ -108,10 +110,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}
@@ -122,9 +122,18 @@ 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,-)
+%if %{without shared}
 %{_docdir}/%{name}-%{version}
+%endif
 
 
 %if %{with doc}
@@ -140,6 +149,11 @@ fi
 
 
 %changelog
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 0.3.6-1
+- update to 0.3.6
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc-utf8-string/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jun 2009 20:00:34 -0000	1.2
+++ sources	22 Dec 2009 15:49:58 -0000	1.3
@@ -1 +1 @@
-d5198209bd81ea4f8af7692e2467336c  utf8-string-0.3.5.tar.gz
+be8c5ef52a0824babdc89d60c1e9b600  utf8-string-0.3.6.tar.gz