From b8738e54503497619167223aac67b7477ad0f1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Wed, 17 Jun 2009 16:38:19 +0000 Subject: [PATCH 01/70] Setup of module ghc-utf8-string --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f4f1688 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: ghc-utf8-string +# $Id$ +NAME := ghc-utf8-string +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 63b1bafa3c0b5f40a85167e915ace1b86ce9dd04 Mon Sep 17 00:00:00 2001 From: Zach Oglesby Date: Wed, 17 Jun 2009 20:00:34 +0000 Subject: [PATCH 02/70] Jun 12 2009 Zachary Oglesby - 0.3.5-2 - Added patch from Jens Petersen for better descriptions --- .cvsignore | 1 + ghc-utf8-string.spec | 154 +++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 157 insertions(+) create mode 100644 ghc-utf8-string.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..514e093 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +utf8-string-0.3.5.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec new file mode 100644 index 0000000..05e4885 --- /dev/null +++ b/ghc-utf8-string.spec @@ -0,0 +1,154 @@ +%global pkg_name utf8-string + +%bcond_without doc +%bcond_without prof + +# ghc does not emit debug information +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 0.3.5 +Release: 2%{?dist} +Summary: Haskell UTF8 layer for IO and Strings. + +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 +%if %{with doc} +BuildRequires: ghc-doc +%endif +%if %{with prof} +BuildRequires: ghc-prof +%endif + +%description +The utf8-string package provides operations +for encoding UTF8 strings to Word8 lists and back, and for reading and writing +UTF8 without truncation. + +%package devel +Summary: Haskell UTF8 layer for IO and Strings. +Group: Development/Libraries +Requires: ghc = %{ghc_version} +Requires(post): ghc = %{ghc_version} +Requires(preun): ghc = %{ghc_version} + +%description devel +The utf8-string package provides operations +for encoding UTF8 strings to Word8 lists and back, and for reading and writing +UTF8 without truncation. + +This package contains the development files for %{name} +built for ghc-%{ghc_version}. + + +%if %{with doc} +%package doc +Summary: Documentation for %{name} +Group: Development/Libraries +Requires: ghc-doc = %{ghc_version} +Requires(post): ghc-doc = %{ghc_version} +Requires(postun): ghc-doc = %{ghc_version} + +%description doc +This package contains development documentation files +for the %{name} library. +%endif + + +%if %{with prof} +%package prof +Summary: Profiling libraries for %{name} +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: ghc-prof = %{ghc_version} + +%description prof +This package contains profiling libraries for %{name} +built for ghc-%{ghc_version}. +%endif + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%cabal_configure --ghc %{?with_prof:-p} +%cabal build +%if %{with doc} +%cabal haddock +%endif +%ghc_gen_scripts + + +%install +rm -rf $RPM_BUILD_ROOT +%cabal_install +%ghc_install_scripts +%ghc_gen_filelists %{name} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post devel +%ghc_register_pkg + + +%if %{with doc} +%post doc +%ghc_reindex_haddock +%endif + + +%preun devel +if [ "$1" -eq 0 ] ; then + %ghc_unregister_pkg +fi + + +%if %{with doc} +%postun doc +if [ "$1" -eq 0 ] ; then + %ghc_reindex_haddock +fi +%endif + + +%files devel -f %{name}-devel.files +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version} + + +%if %{with doc} +%files doc -f %{name}-doc.files +%defattr(-,root,root,-) +%endif + + +%if %{with prof} +%files prof -f %{name}-prof.files +%defattr(-,root,root,-) +%endif + + +%changelog +* Fri Jun 12 2009 Zachary Oglesby - 0.3.5-2 +- Added patch from Jens Petersen for better descriptions + +* Fri Jun 12 2009 Zachary Oglesby - 0.3.5-1 +- Updated to version 0.3.5 + +* Fri Jun 5 2009 Zachary Oglesby - 0.3.4-2 +- Updated to new cabal2spec + +* Fri May 29 2009 Zachary Oglesby - 0.3.4-1 +- initial packaging for Fedora created by cabal2spec + diff --git a/import.log b/import.log new file mode 100644 index 0000000..15125bf --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ghc-utf8-string-0_3_5-2_fc11:HEAD:ghc-utf8-string-0.3.5-2.fc11.src.rpm:1245268784 diff --git a/sources b/sources index e69de29..9d8ac64 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d5198209bd81ea4f8af7692e2467336c utf8-string-0.3.5.tar.gz From 011f9af616cdf158d3ec963f6630b483f0a23815 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 00:05:42 +0000 Subject: [PATCH 03/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 05e4885..40aeeed 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Haskell UTF8 layer for IO and Strings. Group: Development/Libraries @@ -140,6 +140,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Jun 12 2009 Zachary Oglesby - 0.3.5-2 - Added patch from Jens Petersen for better descriptions From 805c66c98227863b98bbc4f7dce31951b1d590af Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2009 09:31:02 +0000 Subject: [PATCH 04/70] remove trailing .'s from summaries --- ghc-utf8-string.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 40aeeed..f3860bb 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} Version: 0.3.5 Release: 3%{?dist} -Summary: Haskell UTF8 layer for IO and Strings. +Summary: Haskell UTF8 layer for IO and Strings Group: Development/Libraries License: BSD @@ -32,7 +32,7 @@ for encoding UTF8 strings to Word8 lists and back, and for reading and writing UTF8 without truncation. %package devel -Summary: Haskell UTF8 layer for IO and Strings. +Summary: Haskell UTF8 layer for IO and Strings Group: Development/Libraries Requires: ghc = %{ghc_version} Requires(post): ghc = %{ghc_version} From a06ec18b88d88d88dc4f048a67a87875f33feca4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:25 +0000 Subject: [PATCH 05/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f4f1688..f12b1a0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ghc-utf8-string SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 665aefbc5c589fc64e80b206311b052ab1c5b302 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 22 Dec 2009 15:49:58 +0000 Subject: [PATCH 06/70] - update to 0.3.6 - update packaging for ghc-6.12.1 - added shared library support: needs ghc-rpm-macros 0.3.1 --- .cvsignore | 2 +- ghc-utf8-string.spec | 44 +++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index 514e093..0583a5e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -utf8-string-0.3.5.tar.gz +utf8-string-0.3.6.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index f3860bb..e15ed80 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -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 and back, and for reading and writing 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 - 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 - 0.3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 9d8ac64..ffc9ed1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5198209bd81ea4f8af7692e2467336c utf8-string-0.3.5.tar.gz +be8c5ef52a0824babdc89d60c1e9b600 utf8-string-0.3.6.tar.gz From ddbf5a95d7f8ed53a5608ca2c2df295e967d7f35 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 11 Jan 2010 04:38:12 +0000 Subject: [PATCH 07/70] - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: - drop doc and prof bcond - use common summary and common_description - use ghc_lib_package --- ghc-utf8-string.spec | 128 ++++++++----------------------------------- 1 file changed, 22 insertions(+), 106 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index e15ed80..6df0d07 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,16 +1,20 @@ %global pkg_name utf8-string -%bcond_without doc -%bcond_without prof +%global common_summary Haskell UTF8 layer for IO and Strings + +%global common_description The utf8-string package provides operations\ +for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ +UTF8 without truncation. + %bcond_without shared -# ghc does not emit debug information +# debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 1%{?dist} -Summary: Haskell UTF8 layer for IO and Strings +Release: 2%{?dist} +Summary: %{common_summary} Group: System Environment/Libraries License: BSD @@ -18,63 +22,19 @@ URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.3.1 -%if %{with doc} +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 BuildRequires: ghc-doc -%endif -%if %{with prof} BuildRequires: ghc-prof -%endif +%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description -The utf8-string package provides operations -for encoding UTF8 strings to Word8 lists and back, and for reading and writing -UTF8 without truncation. - -%package devel -Summary: Haskell UTF8 layer for IO and Strings development files -Group: Development/Libraries -Requires: ghc = %{ghc_version} -Requires(post): ghc = %{ghc_version} -Requires(postun): ghc = %{ghc_version} +%{common_description} %if %{with shared} -Requires: %{name} = %{version}-%{release} +This package provides the shared library. %endif -%description devel -The utf8-string package provides operations -for encoding UTF8 strings to Word8 lists and back, and for reading and writing -UTF8 without truncation. - -This package contains the development files for %{name} -built for ghc-%{ghc_version}. - -%if %{with doc} -%package doc -Summary: Documentation for %{name} -Group: Development/Libraries -Requires: ghc-doc = %{ghc_version} -Requires(post): ghc-doc = %{ghc_version} -Requires(postun): ghc-doc = %{ghc_version} - -%description doc -This package contains development documentation files -for the %{name} library. -%endif - - -%if %{with prof} -%package prof -Summary: Profiling libraries for %{name} -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: ghc-prof = %{ghc_version} - -%description prof -This package contains profiling libraries for %{name} -built for ghc-%{ghc_version}. -%endif +%ghc_lib_package %prep @@ -82,73 +42,29 @@ built for ghc-%{ghc_version}. %build -%cabal_configure --ghc %{?with_prof:-p} +%cabal_configure --ghc -p %cabal build -%if %{with doc} %cabal haddock -%endif %install %cabal_install %cabal_pkg_conf -%ghc_gen_filelists %{name} +%ghc_gen_filelists %clean rm -rf $RPM_BUILD_ROOT -%post devel -ghc-pkg recache - - -%if %{with doc} -%post doc -%ghc_reindex_haddock -%endif - - -%postun devel -ghc-pkg recache - - -%if %{with doc} -%postun doc -if [ "$1" -eq 0 ] ; then - %ghc_reindex_haddock -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} -%files doc -f %{name}-doc.files -%defattr(-,root,root,-) -%endif - - -%if %{with prof} -%files prof -f %{name}-prof.files -%defattr(-,root,root,-) -%endif - - %changelog +* Mon Jan 11 2010 Jens Petersen - 0.3.6-2 +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common summary and common_description +- use ghc_lib_package + * Wed Dec 23 2009 Jens Petersen - 0.3.6-1 - update to 0.3.6 - update packaging for ghc-6.12.1 From 4ae31aae4a168b46e621eb81125ff1d32ff99192 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Jan 2010 04:42:55 +0000 Subject: [PATCH 08/70] ghc-utf8-string package is deprecated - included in ghc now --- .cvsignore | 1 - Makefile | 21 ----------- dead.package | 1 + ghc-utf8-string.spec | 87 -------------------------------------------- import.log | 1 - sources | 1 - 6 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 ghc-utf8-string.spec delete mode 100644 import.log delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 0583a5e..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -utf8-string-0.3.6.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index f12b1a0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-utf8-string -# $Id$ -NAME := ghc-utf8-string -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f1464f6 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +removed for f13: utf8-string is part of ghc since 6.10.3 \ No newline at end of file diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec deleted file mode 100644 index 6df0d07..0000000 --- a/ghc-utf8-string.spec +++ /dev/null @@ -1,87 +0,0 @@ -%global pkg_name utf8-string - -%global common_summary Haskell UTF8 layer for IO and Strings - -%global common_description The utf8-string package provides operations\ -for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ -UTF8 without truncation. - -%bcond_without shared - -# debuginfo is not useful for ghc -%global debug_package %{nil} - -Name: ghc-%{pkg_name} -Version: 0.3.6 -Release: 2%{?dist} -Summary: %{common_summary} - -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 -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha -BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 -BuildRequires: ghc-doc -BuildRequires: ghc-prof -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} - -%description -%{common_description} -%if %{with shared} -This package provides the shared library. -%endif - - -%ghc_lib_package - - -%prep -%setup -q -n %{pkg_name}-%{version} - - -%build -%cabal_configure --ghc -p -%cabal build -%cabal haddock - - -%install -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%changelog -* Mon Jan 11 2010 Jens Petersen - 0.3.6-2 -- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: -- drop doc and prof bcond -- use common summary and common_description -- use ghc_lib_package - -* Wed Dec 23 2009 Jens Petersen - 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 - 0.3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Jun 12 2009 Zachary Oglesby - 0.3.5-2 -- Added patch from Jens Petersen for better descriptions - -* Fri Jun 12 2009 Zachary Oglesby - 0.3.5-1 -- Updated to version 0.3.5 - -* Fri Jun 5 2009 Zachary Oglesby - 0.3.4-2 -- Updated to new cabal2spec - -* Fri May 29 2009 Zachary Oglesby - 0.3.4-1 -- initial packaging for Fedora created by cabal2spec - diff --git a/import.log b/import.log deleted file mode 100644 index 15125bf..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -ghc-utf8-string-0_3_5-2_fc11:HEAD:ghc-utf8-string-0.3.5-2.fc11.src.rpm:1245268784 diff --git a/sources b/sources deleted file mode 100644 index ffc9ed1..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -be8c5ef52a0824babdc89d60c1e9b600 utf8-string-0.3.6.tar.gz From cc5605ba55ad8d6b96838041c98048b009c4946d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Apr 2010 02:08:58 +0000 Subject: [PATCH 09/70] resurrect package for ghc-6.12.2 - ghc-6.12.2 doesn't provide utf8-string again - condition ghc_lib_package --- .cvsignore | 1 + Makefile | 21 +++++++++++ dead.package | 1 - ghc-utf8-string.spec | 90 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 .cvsignore create mode 100644 Makefile delete mode 100644 dead.package create mode 100644 ghc-utf8-string.spec create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..0583a5e --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +utf8-string-0.3.6.tar.gz diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f12b1a0 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: ghc-utf8-string +# $Id$ +NAME := ghc-utf8-string +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package deleted file mode 100644 index f1464f6..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -removed for f13: utf8-string is part of ghc since 6.10.3 \ No newline at end of file diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec new file mode 100644 index 0000000..6a3d4bd --- /dev/null +++ b/ghc-utf8-string.spec @@ -0,0 +1,90 @@ +%global pkg_name utf8-string + +%global common_summary Haskell UTF8 layer for IO and Strings + +%global common_description The utf8-string package provides operations\ +for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ +UTF8 without truncation. + +%bcond_without shared + +# debuginfo is not useful for ghc +%global debug_package %{nil} + +Name: ghc-%{pkg_name} +Version: 0.3.6 +Release: 3%{?dist} +Summary: %{common_summary} + +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 +# fedora ghc archs: +ExclusiveArch: %{ix86} x86_64 ppc alpha +BuildRequires: ghc, ghc-rpm-macros >= 0.5.1 +BuildRequires: ghc-doc +BuildRequires: ghc-prof + +%description +%{common_description} +%if %{with shared} +This package provides the shared library. +%endif + + +%{?ghc_lib_package} + + +%prep +%setup -q -n %{pkg_name}-%{version} + + +%build +%cabal_configure --ghc -p +%cabal build +%cabal haddock + + +%install +%cabal_install +%cabal_pkg_conf + +%ghc_gen_filelists + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%changelog +* Tue Apr 27 2010 Jens Petersen - 0.3.6-3 +- ghc-6.12.2 doesn't provide utf8-string again +- condition ghc_lib_package + +* Mon Jan 11 2010 Jens Petersen - 0.3.6-2 +- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: +- drop doc and prof bcond +- use common summary and common_description +- use ghc_lib_package + +* Wed Dec 23 2009 Jens Petersen - 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 - 0.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jun 12 2009 Zachary Oglesby - 0.3.5-2 +- Added patch from Jens Petersen for better descriptions + +* Fri Jun 12 2009 Zachary Oglesby - 0.3.5-1 +- Updated to version 0.3.5 + +* Fri Jun 5 2009 Zachary Oglesby - 0.3.4-2 +- Updated to new cabal2spec + +* Fri May 29 2009 Zachary Oglesby - 0.3.4-1 +- initial packaging for Fedora created by cabal2spec + diff --git a/sources b/sources new file mode 100644 index 0000000..ffc9ed1 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +be8c5ef52a0824babdc89d60c1e9b600 utf8-string-0.3.6.tar.gz From af1aeda3b4045236dbca240fcb89a6b9c8259b4e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 23 Jun 2010 11:39:56 +0000 Subject: [PATCH 10/70] use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0) --- ghc-utf8-string.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 6a3d4bd..c789fda 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -13,18 +13,18 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} 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 >= 0.5.1 -BuildRequires: ghc-doc -BuildRequires: ghc-prof +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.6.0 %description %{common_description} @@ -47,10 +47,12 @@ This package provides the shared library. %install +rm -rf $RPM_BUILD_ROOT %cabal_install %cabal_pkg_conf %ghc_gen_filelists +%ghc_strip_dynlinked %clean @@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 23 2010 Jens Petersen - 0.3.6-4 +- use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0) + * Tue Apr 27 2010 Jens Petersen - 0.3.6-3 - ghc-6.12.2 doesn't provide utf8-string again - condition ghc_lib_package From 9c00c6a052b036af5aa48dcf71cbdee23709d117 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:35:03 +0000 Subject: [PATCH 11/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f12b1a0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ghc-utf8-string -# $Id$ -NAME := ghc-utf8-string -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From f574ce667fc33385066dec31b91419729a2434e8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 4 Sep 2010 17:19:46 +1000 Subject: [PATCH 12/70] update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) --- ghc-utf8-string.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index c789fda..3abb9b1 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -13,7 +13,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -24,7 +24,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.6.0 +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with hscolour} +BuildRequires: hscolour +%endif %description %{common_description} @@ -33,33 +36,30 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists -%ghc_strip_dynlinked +%ghc_lib_install %clean rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 0.3.6-5 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 0.3.6-5 +- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) + * Wed Jun 23 2010 Jens Petersen - 0.3.6-4 - use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0) From 5a7d0080d528c06809786dc04ecde753139513c9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Nov 2010 11:12:50 +1000 Subject: [PATCH 13/70] rebuild with ghc-7.0.1 --- ghc-utf8-string.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 3abb9b1..af8539b 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -13,7 +13,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -53,10 +53,13 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT -%ghc_lib_package -o 0.3.6-5 +%ghc_lib_package %changelog +* Thu Nov 25 2010 Jens Petersen - 0.3.6-6 +- rebuild with ghc-7.0.1 + * Sat Sep 4 2010 Jens Petersen - 0.3.6-5 - update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) From 33fbcc8a66c30cf187db5283803fc23e3b136a4b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Nov 2010 11:46:29 +1000 Subject: [PATCH 14/70] build with hscolour and drop -o obsoletes --- ghc-utf8-string.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index af8539b..2baeba8 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,6 +6,7 @@ for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ UTF8 without truncation. +%bcond_without hscolour %bcond_without shared # debuginfo is not useful for ghc @@ -58,7 +59,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Nov 25 2010 Jens Petersen - 0.3.6-6 -- rebuild with ghc-7.0.1 +- drop -o obsoletes +- build with hscolour * Sat Sep 4 2010 Jens Petersen - 0.3.6-5 - update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) From 5d08e6a2e49f464a48aec1c1672b82771bf6a896 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 15 Jan 2011 21:26:42 +0900 Subject: [PATCH 15/70] update to cabal2spec-0.22.4 --- ghc-utf8-string.spec | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 2baeba8..860c931 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,29 +6,23 @@ for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ UTF8 without truncation. -%bcond_without hscolour -%bcond_without shared - # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD -URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name} +URL: http://hackage.haskell.org/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-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.8.1 -%if %{with hscolour} +BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour -%endif %description %{common_description} @@ -46,18 +40,16 @@ This package provides the shared library. %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install -%clean -rm -rf $RPM_BUILD_ROOT - - %ghc_lib_package %changelog +* Sat Jan 15 2011 Jens Petersen - 0.3.6-7 +- update to cabal2spec-0.22.4 + * Thu Nov 25 2010 Jens Petersen - 0.3.6-6 - drop -o obsoletes - build with hscolour From 73b274886242f5826374824056cfb8b257335d61 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 19:39:05 -0600 Subject: [PATCH 16/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 860c931..a0c725a 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -11,7 +11,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -47,6 +47,9 @@ This package provides the shared library. %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.3.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jan 15 2011 Jens Petersen - 0.3.6-7 - update to cabal2spec-0.22.4 From 152a7850a3a74e0c173eb98c37e88aba451490ba Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Thu, 10 Mar 2011 09:15:38 +0100 Subject: [PATCH 17/70] Enable build on sparcv9 Signed-off-by: Fabio M. Di Nitto --- ghc-utf8-string.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index a0c725a..b36d269 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -11,7 +11,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -19,7 +19,7 @@ License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha +ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 BuildRequires: ghc, ghc-doc, ghc-prof BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour @@ -47,6 +47,9 @@ This package provides the shared library. %changelog +* Thu Mar 10 2011 Fabio M. Di Nitto - 0.3.6-9 +- Enable build on sparcv9 + * Tue Feb 08 2011 Fedora Release Engineering - 0.3.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 54ded396a35d7367ab8604b581654ab37bd3c566 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2011 15:16:14 +0900 Subject: [PATCH 18/70] BR ghc-Cabal-devel and use ghc_excluded_archs --- ghc-utf8-string.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index b36d269..4de88de 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,29 +6,23 @@ for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ UTF8 without truncation. -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.3 +# ghc_excluded_archs is defined in redhat-rpm-config +ExcludeArch: %{ghc_excluded_archs} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros BuildRequires: hscolour %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -47,6 +41,9 @@ This package provides the shared library. %changelog +* Mon Jun 20 2011 Jens Petersen - 0.3.6-10 +- BR ghc-Cabal-devel and use ghc_excluded_archs + * Thu Mar 10 2011 Fabio M. Di Nitto - 0.3.6-9 - Enable build on sparcv9 From fc988f5c8fa6662bcb43873012c837a25bee12c8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Jun 2011 15:25:58 +0900 Subject: [PATCH 19/70] also BR bytestring --- ghc-utf8-string.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 4de88de..43672bc 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -20,6 +20,7 @@ ExcludeArch: %{ghc_excluded_archs} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour +BuildRequires: ghc-bytestring-prof %description %{common_description} From 8a334643e5d0bb6d88fd30792f1ad9b8c1cf49a9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Jun 2011 17:42:57 +0900 Subject: [PATCH 20/70] ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2) --- ghc-utf8-string.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 43672bc..2a08fb4 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -8,15 +8,14 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# ghc_excluded_archs is defined in redhat-rpm-config -ExcludeArch: %{ghc_excluded_archs} +ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: hscolour @@ -42,6 +41,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Tue Jun 21 2011 Jens Petersen - 0.3.6-11 +- ghc_arches replaces ghc_excluded_archs + * Mon Jun 20 2011 Jens Petersen - 0.3.6-10 - BR ghc-Cabal-devel and use ghc_excluded_archs From 91833cae14f92c62de1eb273b13abe198640abf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 11 Oct 2011 20:56:01 +0200 Subject: [PATCH 21/70] rebuild with new gmp --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 2a08fb4..0e07644 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -8,7 +8,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 11%{?dist} +Release: 11%{?dist}.1 Summary: %{common_summary} Group: System Environment/Libraries @@ -41,6 +41,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Tue Oct 11 2011 Peter Schiffer - 0.3.6-11.1 +- rebuild with new gmp + * Tue Jun 21 2011 Jens Petersen - 0.3.6-11 - ghc_arches replaces ghc_excluded_archs From 60698ec9336f0933d5fc4418b3b2299eeaff4fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 21 Oct 2011 05:36:55 +0200 Subject: [PATCH 22/70] rebuild with new gmp without compat lib --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 0e07644..41f8b77 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -8,7 +8,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 11%{?dist}.1 +Release: 11%{?dist}.2 Summary: %{common_summary} Group: System Environment/Libraries @@ -41,6 +41,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Fri Oct 21 2011 Marcela Mašláňová - 0.3.6-11.2 +- rebuild with new gmp without compat lib + * Tue Oct 11 2011 Peter Schiffer - 0.3.6-11.1 - rebuild with new gmp From 50bb3e4c3c2b9a6bd83f4e5d2a6b24791758cb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 24 Oct 2011 12:17:06 +0200 Subject: [PATCH 23/70] rebuild with new gmp without compat lib --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 41f8b77..f737093 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -8,7 +8,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.6 -Release: 11%{?dist}.2 +Release: 11%{?dist}.3 Summary: %{common_summary} Group: System Environment/Libraries @@ -41,6 +41,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Mon Oct 24 2011 Marcela Mašláňová - 0.3.6-11.3 +- rebuild with new gmp without compat lib + * Fri Oct 21 2011 Marcela Mašláňová - 0.3.6-11.2 - rebuild with new gmp without compat lib From 04a67b3508a3af4236b931af6305349aee7905df Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Jan 2012 12:05:22 +0900 Subject: [PATCH 24/70] update to 0.3.7 and cabal2spec-0.25.2 --- .gitignore | 1 + ghc-utf8-string.spec | 26 +++++++++++++++++++++----- sources | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0583a5e..3836ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ utf8-string-0.3.6.tar.gz +/utf8-string-0.3.7.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index f737093..85bb02a 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,3 +1,7 @@ +# cabal2spec-0.25.2 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell + %global pkg_name utf8-string %global common_summary Haskell UTF8 layer for IO and Strings @@ -7,18 +11,19 @@ for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ UTF8 without truncation. Name: ghc-%{pkg_name} -Version: 0.3.6 -Release: 11%{?dist}.3 +Version: 0.3.7 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD +# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: hscolour +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec BuildRequires: ghc-bytestring-prof %description @@ -37,10 +42,21 @@ BuildRequires: ghc-bytestring-prof %ghc_lib_install -%ghc_lib_package +%ghc_devel_package + +%ghc_devel_description + + +%ghc_devel_post_postun + + +%ghc_files %changelog +* Fri Jan 6 2012 Jens Petersen - 0.3.7-1 +- update to 0.3.7 and cabal2spec-0.25.2 + * Mon Oct 24 2011 Marcela Mašláňová - 0.3.6-11.3 - rebuild with new gmp without compat lib diff --git a/sources b/sources index ffc9ed1..9c8cf85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be8c5ef52a0824babdc89d60c1e9b600 utf8-string-0.3.6.tar.gz +50e5c395713e716e0e4a56da73f87ccd utf8-string-0.3.7.tar.gz From 3298643f5424c1e4d7f3ae4ac24c15c9121807cc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Mar 2012 14:06:02 +0900 Subject: [PATCH 25/70] add license to ghc_files --- ghc-utf8-string.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 85bb02a..63afdaa 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -12,7 +12,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -50,10 +50,13 @@ BuildRequires: ghc-bytestring-prof %ghc_devel_post_postun -%ghc_files +%ghc_files LICENSE %changelog +* Fri Mar 23 2012 Jens Petersen - 0.3.7-2 +- add license to ghc_files + * Fri Jan 6 2012 Jens Petersen - 0.3.7-1 - update to 0.3.7 and cabal2spec-0.25.2 From fe04b57e811cd2a17c43a1953015743f2eb2f988 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2012 11:15:55 +0900 Subject: [PATCH 26/70] change prof BRs to devel --- ghc-utf8-string.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 63afdaa..6de0e3d 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -12,7 +12,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -24,7 +24,7 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-bytestring-devel %description %{common_description} @@ -54,6 +54,9 @@ BuildRequires: ghc-bytestring-prof %changelog +* Mon Jul 16 2012 Jens Petersen - 0.3.7-3 +- change prof BRs to devel + * Fri Mar 23 2012 Jens Petersen - 0.3.7-2 - add license to ghc_files From 46ceb4040e0689f09ef0b1c7b66798134aee2548 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 01:19:02 -0500 Subject: [PATCH 27/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 6de0e3d..2a12848 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -12,7 +12,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -54,6 +54,9 @@ BuildRequires: ghc-bytestring-devel %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.3.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 16 2012 Jens Petersen - 0.3.7-3 - change prof BRs to devel From 7c612efb35df34091068f62c30bf9e715ff3657c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 18 Nov 2012 02:05:26 +0900 Subject: [PATCH 28/70] update with cabal-rpm - unset bytestring-in-base flag --- ghc-utf8-string.spec | 22 +++++++++++-------- ...string-0.3.7-bytestring-in-base-flag.patch | 10 +++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 utf8-string-0.3.7-bytestring-in-base-flag.patch diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 2a12848..16380c9 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,30 +1,29 @@ -# cabal2spec-0.25.2 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name utf8-string -%global common_summary Haskell UTF8 layer for IO and Strings +%global common_summary Support for reading and writing UTF8 Strings -%global common_description The utf8-string package provides operations\ +%global common_description A UTF8 layer for IO and Strings. The utf8-string package provides operations\ for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} -Group: System Environment/Libraries License: BSD -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} +Patch0: utf8-string-0.3.7-bytestring-in-base-flag.patch + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel +# End cabal-rpm deps %description %{common_description} @@ -32,6 +31,7 @@ BuildRequires: ghc-bytestring-devel %prep %setup -q -n %{pkg_name}-%{version} +%patch0 -p1 -b .orig %build @@ -54,6 +54,10 @@ BuildRequires: ghc-bytestring-devel %changelog +* Sat Nov 17 2012 Jens Petersen - 0.3.7-5 +- update with cabal-rpm +- unset bytestring-in-base flag + * Thu Jul 19 2012 Fedora Release Engineering - 0.3.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/utf8-string-0.3.7-bytestring-in-base-flag.patch b/utf8-string-0.3.7-bytestring-in-base-flag.patch new file mode 100644 index 0000000..d5ed8b3 --- /dev/null +++ b/utf8-string-0.3.7-bytestring-in-base-flag.patch @@ -0,0 +1,10 @@ +--- utf8-string-0.3.7/utf8-string.cabal~ 2011-08-25 21:26:51.000000000 +0900 ++++ utf8-string-0.3.7/utf8-string.cabal 2012-11-18 02:01:06.366515676 +0900 +@@ -15,6 +15,7 @@ + cabal-version: >= 1.2 + + flag bytestring-in-base ++ default: False + + library + Ghc-options: -W -O2 From 2570f64d5e91ad9b3be0bb02cf86e4504ddbadd4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 17:21:24 -0600 Subject: [PATCH 29/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 16380c9..9984e5c 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -11,7 +11,7 @@ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} License: BSD @@ -54,6 +54,9 @@ BuildRequires: ghc-bytestring-devel %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.3.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Nov 17 2012 Jens Petersen - 0.3.7-5 - update with cabal-rpm - unset bytestring-in-base flag From 34c42ddbf4077db34be9e4d0b43c3fa9b037cdc2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 3 Jun 2013 16:18:00 +0900 Subject: [PATCH 30/70] update to new simplified Haskell Packaging Guidelines --- ghc-utf8-string.spec | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 9984e5c..814b036 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,18 +1,11 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name utf8-string -%global common_summary Support for reading and writing UTF8 Strings - -%global common_description A UTF8 layer for IO and Strings. The utf8-string package provides operations\ -for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ -UTF8 without truncation. - Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 6%{?dist} -Summary: %{common_summary} +Release: 7%{?dist} +Summary: Support for reading and writing UTF8 Strings License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} @@ -26,7 +19,20 @@ BuildRequires: ghc-bytestring-devel # End cabal-rpm deps %description -%{common_description} +A UTF8 layer for IO and Strings. The utf8-string package provides operations +for encoding UTF8 strings to Word8 lists and back, and for reading and writing +UTF8 without truncation. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name} = %{version}-%{release} + +%description devel +This package provides the Haskell utf8-string library development files. %prep @@ -42,18 +48,25 @@ BuildRequires: ghc-bytestring-devel %ghc_lib_install -%ghc_devel_package +%post devel +%ghc_pkg_recache + -%ghc_devel_description +%postun devel +%ghc_pkg_recache -%ghc_devel_post_postun +%files -f %{name}.files +%doc LICENSE -%ghc_files LICENSE +%files devel -f %{name}-devel.files %changelog +* Mon Jun 3 2013 Jens Petersen - 0.3.7-7 +- update to new simplified Haskell Packaging Guidelines + * Wed Feb 13 2013 Fedora Release Engineering - 0.3.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From af0b7ee510e92e0b10963a0f609b18c3d6fa821a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:08:12 -0500 Subject: [PATCH 31/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 814b036..ab95310 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -64,6 +64,9 @@ This package provides the Haskell utf8-string library development files. %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.3.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Jun 3 2013 Jens Petersen - 0.3.7-7 - update to new simplified Haskell Packaging Guidelines From 4d7b62157fdbd12823ae4a31a1c39d164fd8ea89 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 10:25:11 -0500 Subject: [PATCH 32/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index ab95310..d1971da 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -64,6 +64,9 @@ This package provides the Haskell utf8-string library development files. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.3.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 0.3.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 9c1a3f00d2a5e69db28c692d7b725d40a378c429 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 16:05:28 +0000 Subject: [PATCH 33/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index d1971da..6e7697e 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -64,6 +64,9 @@ This package provides the Haskell utf8-string library development files. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.3.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.3.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a1be3cfa0280a95f076bd2f096089b4822b958ca Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Jan 2015 13:17:18 +0900 Subject: [PATCH 34/70] update to 0.3.8 --- .gitignore | 1 + ghc-utf8-string.spec | 18 ++++++++++-------- sources | 2 +- ...-string-0.3.7-bytestring-in-base-flag.patch | 10 ---------- 4 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 utf8-string-0.3.7-bytestring-in-base-flag.patch diff --git a/.gitignore b/.gitignore index 3836ffd..52788b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ utf8-string-0.3.6.tar.gz /utf8-string-0.3.7.tar.gz +/utf8-string-0.3.8.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 6e7697e..dfc32ec 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -3,14 +3,13 @@ %global pkg_name utf8-string Name: ghc-%{pkg_name} -Version: 0.3.7 -Release: 10%{?dist} +Version: 0.3.8 +Release: 1%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -Patch0: utf8-string-0.3.7-bytestring-in-base-flag.patch +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -26,18 +25,18 @@ UTF8 without truncation. %package devel Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -This package provides the Haskell utf8-string library development files. +This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -%patch0 -p1 -b .orig %build @@ -64,6 +63,9 @@ This package provides the Haskell utf8-string library development files. %changelog +* Fri Jan 23 2015 Jens Petersen - 0.3.8-1 +- update to 0.3.8 + * Sat Aug 16 2014 Fedora Release Engineering - 0.3.7-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 9c8cf85..4bbfc37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50e5c395713e716e0e4a56da73f87ccd utf8-string-0.3.7.tar.gz +674d0052e88e6b2030915e30cf06b171 utf8-string-0.3.8.tar.gz diff --git a/utf8-string-0.3.7-bytestring-in-base-flag.patch b/utf8-string-0.3.7-bytestring-in-base-flag.patch deleted file mode 100644 index d5ed8b3..0000000 --- a/utf8-string-0.3.7-bytestring-in-base-flag.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- utf8-string-0.3.7/utf8-string.cabal~ 2011-08-25 21:26:51.000000000 +0900 -+++ utf8-string-0.3.7/utf8-string.cabal 2012-11-18 02:01:06.366515676 +0900 -@@ -15,6 +15,7 @@ - cabal-version: >= 1.2 - - flag bytestring-in-base -+ default: False - - library - Ghc-options: -W -O2 From 65a31e6a98b48ac839aac5f25c8f5ab3a699ea5c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:04:19 +0000 Subject: [PATCH 35/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index dfc32ec..dc901ff 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -63,6 +63,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jan 23 2015 Jens Petersen - 0.3.8-1 - update to 0.3.8 From c1da0e3b1f51f64324a5d43fc22731e2953b3901 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 09:50:12 +0900 Subject: [PATCH 36/70] update to 1.0.1.1 --- .gitignore | 1 + ghc-utf8-string.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 52788b1..962668b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ utf8-string-0.3.6.tar.gz /utf8-string-0.3.7.tar.gz /utf8-string-0.3.8.tar.gz +/utf8-string-1.0.1.1.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index dc901ff..54d1860 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -3,8 +3,8 @@ %global pkg_name utf8-string Name: ghc-%{pkg_name} -Version: 0.3.8 -Release: 2%{?dist} +Version: 1.0.1.1 +Release: 1%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -18,9 +18,9 @@ BuildRequires: ghc-bytestring-devel # End cabal-rpm deps %description -A UTF8 layer for IO and Strings. The utf8-string package provides operations -for encoding UTF8 strings to Word8 lists and back, and for reading and writing -UTF8 without truncation. +A UTF8 layer for Strings. The utf8-string package provides operations for +encoding UTF8 strings to Word8 lists and back, and for reading and writing UTF8 +without truncation. %package devel @@ -46,6 +46,8 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %post devel %ghc_pkg_recache @@ -56,13 +58,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Thu Sep 17 2015 Jens Petersen - 1.0.1.1-1 +- update to 1.0.1.1 + * Wed Jun 17 2015 Fedora Release Engineering - 0.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 4bbfc37..3b743ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -674d0052e88e6b2030915e30cf06b171 utf8-string-0.3.8.tar.gz +fe24e26bd4b09731af66ef27b18b5177 utf8-string-1.0.1.1.tar.gz From 7f16777484ca193e16168cacbdb5aed536680a55 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:42:18 +0900 Subject: [PATCH 37/70] Reverting "update to 1.0.1.1" This reverts commit c1da0e3b1f51f64324a5d43fc22731e2953b3901. --- .gitignore | 1 - ghc-utf8-string.spec | 17 ++++++----------- sources | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 962668b..52788b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ utf8-string-0.3.6.tar.gz /utf8-string-0.3.7.tar.gz /utf8-string-0.3.8.tar.gz -/utf8-string-1.0.1.1.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 54d1860..dc901ff 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -3,8 +3,8 @@ %global pkg_name utf8-string Name: ghc-%{pkg_name} -Version: 1.0.1.1 -Release: 1%{?dist} +Version: 0.3.8 +Release: 2%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -18,9 +18,9 @@ BuildRequires: ghc-bytestring-devel # End cabal-rpm deps %description -A UTF8 layer for Strings. The utf8-string package provides operations for -encoding UTF8 strings to Word8 lists and back, and for reading and writing UTF8 -without truncation. +A UTF8 layer for IO and Strings. The utf8-string package provides operations +for encoding UTF8 strings to Word8 lists and back, and for reading and writing +UTF8 without truncation. %package devel @@ -46,8 +46,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %post devel %ghc_pkg_recache @@ -58,16 +56,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files %changelog -* Thu Sep 17 2015 Jens Petersen - 1.0.1.1-1 -- update to 1.0.1.1 - * Wed Jun 17 2015 Fedora Release Engineering - 0.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 3b743ab..4bbfc37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe24e26bd4b09731af66ef27b18b5177 utf8-string-1.0.1.1.tar.gz +674d0052e88e6b2030915e30cf06b171 utf8-string-0.3.8.tar.gz From 794c3dd53f0b40691416e6f4e4602648ed704f6f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:47:43 +0000 Subject: [PATCH 38/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index dc901ff..be3642a 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 0.3.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -63,6 +63,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.3.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 24876b790a6f9742669acfbb0a0451e77db523f3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 16 Jun 2016 12:34:32 +0900 Subject: [PATCH 39/70] update to 1.0.1.1 This reverts commit 7f16777484ca193e16168cacbdb5aed536680a55. --- .gitignore | 1 + ghc-utf8-string.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 52788b1..962668b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ utf8-string-0.3.6.tar.gz /utf8-string-0.3.7.tar.gz /utf8-string-0.3.8.tar.gz +/utf8-string-1.0.1.1.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index be3642a..bedb92c 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -3,8 +3,8 @@ %global pkg_name utf8-string Name: ghc-%{pkg_name} -Version: 0.3.8 -Release: 3%{?dist} +Version: 1.0.1.1 +Release: 1%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -18,9 +18,9 @@ BuildRequires: ghc-bytestring-devel # End cabal-rpm deps %description -A UTF8 layer for IO and Strings. The utf8-string package provides operations -for encoding UTF8 strings to Word8 lists and back, and for reading and writing -UTF8 without truncation. +A UTF8 layer for Strings. The utf8-string package provides operations for +encoding UTF8 strings to Word8 lists and back, and for reading and writing UTF8 +without truncation. %package devel @@ -46,6 +46,8 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %post devel %ghc_pkg_recache @@ -56,13 +58,16 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Thu Jun 16 2016 Jens Petersen - 1.0.1.1-1 +- update to 1.0.1.1 + * Wed Feb 03 2016 Fedora Release Engineering - 0.3.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 4bbfc37..3b743ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -674d0052e88e6b2030915e30cf06b171 utf8-string-0.3.8.tar.gz +fe24e26bd4b09731af66ef27b18b5177 utf8-string-1.0.1.1.tar.gz From 9fbd390068adb0c87da34c67d887f219c7bbd779 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Aug 2016 12:33:23 +0900 Subject: [PATCH 40/70] allow base 4.9 --- ghc-utf8-string.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index bedb92c..ae05671 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -37,6 +37,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cabal-tweak-dep-ver base '< 4.9' '< 4.10' %build From 6130d2ce4fcfaa253fc2ec45060ba7de03b49427 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:54 +0900 Subject: [PATCH 41/70] no longer remove license --- ghc-utf8-string.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index ae05671..d6b16ef 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -47,8 +47,6 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.10' %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %post devel %ghc_pkg_recache From 933202e2472dd953637bd3fbb66b726f1a4621ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:52:16 +0000 Subject: [PATCH 42/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index d6b16ef..b1430f1 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -4,7 +4,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -64,6 +64,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.10' %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.0.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jun 16 2016 Jens Petersen - 1.0.1.1-1 - update to 1.0.1.1 From 9aecb4d3483212973c59cf194646cab0399f75d1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Feb 2017 17:48:25 +0900 Subject: [PATCH 43/70] refresh to cabal-rpm-0.11.1 --- ghc-utf8-string.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index b1430f1..83b7835 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,15 +1,17 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name utf8-string +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -36,7 +38,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} cabal-tweak-dep-ver base '< 4.9' '< 4.10' @@ -61,9 +63,13 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.10' %files devel -f %{name}-devel.files +%doc CHANGELOG.markdown %changelog +* Fri Feb 24 2017 Jens Petersen - 1.0.1.1-3 +- refresh to cabal-rpm-0.11.1 + * Fri Feb 10 2017 Fedora Release Engineering - 1.0.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9d1d9d7f4a2ec48b515a0273a17e8643a7d04ed9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:00:16 +0000 Subject: [PATCH 44/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 83b7835..5162235 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -67,6 +67,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.10' %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 24 2017 Jens Petersen - 1.0.1.1-3 - refresh to cabal-rpm-0.11.1 From 7201ed1bcfa9dfb7c219d726a3f9b966ada07792 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:35:56 +0000 Subject: [PATCH 45/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 5162235..b37459b 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -67,6 +67,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.10' %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.0.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.0.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a217bbafdd93504977499596b99fa79633f0c3b4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:15 +0100 Subject: [PATCH 46/70] refresh to cabal-rpm-0.12.1 --- ghc-utf8-string.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index b37459b..ea419dc 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name utf8-string @@ -28,9 +28,12 @@ without truncation. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -50,6 +53,12 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.10' %ghc_lib_install +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 64843f690573d1198ee5095bdfb02943285fcc92 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 09:53:36 +0100 Subject: [PATCH 47/70] refresh to cabal-rpm-0.12.1 --- ghc-utf8-string.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index ea419dc..ac6d080 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -42,7 +42,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} -cabal-tweak-dep-ver base '< 4.9' '< 4.10' +cabal-tweak-dep-ver base '< 4.9' '< 4.11' %build From d4851fa59a825fff9ec8087147a4c4183cbd4dbe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 26 Jan 2018 12:03:03 +0100 Subject: [PATCH 48/70] bump release --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index ac6d080..e61f1ae 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -76,6 +76,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.11' %changelog +* Fri Jan 26 2018 Jens Petersen - 1.0.1.1-6 +- rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 1.0.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 8a2436524d6e2861527e848bcd8db108df908718 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:42 +0900 Subject: [PATCH 49/70] drop ldconfig scriptlets --- ghc-utf8-string.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index e61f1ae..174027f 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -53,12 +53,6 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.11' %ghc_lib_install -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 756cfccbecd976883e3b53beecee5b67eb610eaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:18:07 +0000 Subject: [PATCH 50/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 174027f..7f606e3 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -70,6 +70,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.11' %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Jan 26 2018 Jens Petersen - 1.0.1.1-6 - rebuild From 238691669625289b777ce72c43edf0afaf9cf86c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:14:08 +0000 Subject: [PATCH 51/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 7f606e3..1a4c9d0 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -70,6 +70,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.11' %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.0.1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ffa019d2aeb22de965f017a7ce79fda7d270b513 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:11:29 +0000 Subject: [PATCH 52/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 1a4c9d0..ae25855 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -70,6 +70,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.11' %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.0.1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 77af04b7ac7068dafa5882dd591f9a0ed61d255a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 16 Feb 2019 13:13:25 +0800 Subject: [PATCH 53/70] use revised .cabal --- ghc-utf8-string.spec | 10 +++++++--- utf8-string-1.0.1.1.cabal | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 utf8-string-1.0.1.1.cabal diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index ae25855..6f85877 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name utf8-string @@ -6,12 +6,13 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -42,7 +43,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkgver} -cabal-tweak-dep-ver base '< 4.9' '< 4.11' +cp -p %{SOURCE1} %{pkg_name}.cabal %build @@ -70,6 +71,9 @@ cabal-tweak-dep-ver base '< 4.9' '< 4.11' %changelog +* Sat Feb 16 2019 Jens Petersen - 1.0.1.1-10 +- use revised .cabal file + * Thu Jan 31 2019 Fedora Release Engineering - 1.0.1.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/utf8-string-1.0.1.1.cabal b/utf8-string-1.0.1.1.cabal new file mode 100644 index 0000000..8dbad05 --- /dev/null +++ b/utf8-string-1.0.1.1.cabal @@ -0,0 +1,30 @@ +Name: utf8-string +Version: 1.0.1.1 +x-revision: 3 +Author: Eric Mertens +Maintainer: emertens@galois.com +License: BSD3 +License-file: LICENSE +Homepage: http://github.com/glguy/utf8-string/ +Synopsis: Support for reading and writing UTF8 Strings +Description: A UTF8 layer for Strings. The utf8-string + package provides operations for encoding UTF8 + strings to Word8 lists and back, and for reading and + writing UTF8 without truncation. +Category: Codec +Build-type: Simple +cabal-version: >= 1.2 +Extra-Source-Files: CHANGELOG.markdown +Tested-With: GHC==7.0.4, GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.2 + +library + Ghc-options: -W -O2 + + build-depends: base >= 4.3 && < 5, bytestring >= 0.9 + + Extensions: CPP + Exposed-modules: Codec.Binary.UTF8.String + Codec.Binary.UTF8.Generic + Data.String.UTF8 + Data.ByteString.UTF8 + Data.ByteString.Lazy.UTF8 From 6b72c5b5d00e31bc53a74fc4d05d880da8a64b45 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:47:41 +0800 Subject: [PATCH 54/70] refresh to cabal-rpm-0.13 --- ghc-utf8-string.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 6f85877..e0e94ba 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name utf8-string @@ -6,17 +6,19 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel # End cabal-rpm deps @@ -42,16 +44,22 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -p %{SOURCE1} %{pkg_name}.cabal +cp -bp %{SOURCE1} %{pkg_name}.cabal +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %post devel @@ -63,7 +71,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -71,6 +81,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Feb 17 2019 Jens Petersen - 1.0.1.1-11 +- refresh to cabal-rpm-0.13 + * Sat Feb 16 2019 Jens Petersen - 1.0.1.1-10 - use revised .cabal file From 0625bd333cb798a3d617d4c513db38f920333d2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:10:59 +0000 Subject: [PATCH 55/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index e0e94ba..dc972ca 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -81,6 +81,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 1.0.1.1-11 - refresh to cabal-rpm-0.13 From 06596b15e923a3f4c245eb1ffd77c1b228da6362 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:26:43 +0000 Subject: [PATCH 56/70] cabal-rpm-1.0.0: add doc and prof subpkgs --- ghc-utf8-string.spec | 53 +++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index dc972ca..89597ef 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name utf8-string @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -18,6 +18,12 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-bytestring-devel # End cabal-rpm deps @@ -31,11 +37,8 @@ without truncation. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} @@ -43,6 +46,25 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -62,14 +84,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -80,7 +94,20 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %doc CHANGELOG.markdown +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog +* Fri Aug 02 2019 Jens Petersen - 1.0.1.1-13 +- add doc and prof subpackages (cabal-rpm-1.0.0) + * Thu Jul 25 2019 Fedora Release Engineering - 1.0.1.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 567f733b836d2bd859e91382679f283e59e88de4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:32:42 +0800 Subject: [PATCH 57/70] BR prof for lib and static for executable --- ghc-utf8-string.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 89597ef..06788fa 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name utf8-string @@ -18,14 +18,9 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof # End cabal-rpm deps %description @@ -37,6 +32,7 @@ without truncation. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From 5ca31ef58083cd4ce6069163109f6cc6a90684c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:37:51 +0000 Subject: [PATCH 58/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 06788fa..f995c02 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -101,6 +101,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.1.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 02 2019 Jens Petersen - 1.0.1.1-13 - add doc and prof subpackages (cabal-rpm-1.0.0) From 31e63214405be5661d4057aaf48a4a610bd163a9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:52:40 +0800 Subject: [PATCH 59/70] refresh to cabal-rpm-2.0.2 --- ghc-utf8-string.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index f995c02..bdf7355 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name utf8-string @@ -45,6 +45,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -55,6 +56,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -80,6 +82,16 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -92,6 +104,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From 6c235bf406fa126d2dc7cdfe55c86910082329ff Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:28:52 +0800 Subject: [PATCH 60/70] refresh to cabal-rpm-2.0.5 --- ghc-utf8-string.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index bdf7355..1ef1a68 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name utf8-string %global pkgver %{pkg_name}-%{version} From a4a84c4f78b2dc8647358cf7013c1d99b8e63dea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:57:31 +0800 Subject: [PATCH 61/70] refresh to cabal-rpm-2.0.6 --- ghc-utf8-string.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 1ef1a68..a1703fc 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name utf8-string @@ -82,16 +82,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From 6bae4a9a070f369df6300b542914151f4d2098b6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:46:37 +0800 Subject: [PATCH 62/70] bump release --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index a1703fc..57582be 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -104,6 +104,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Jul 17 2020 Jens Petersen - 1.0.1.1-15 +- refresh to cabal-rpm-2.0.6 + * Tue Jan 28 2020 Fedora Release Engineering - 1.0.1.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8f28ccece5a51c94111e43a9acef80848b3c9ef6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:49:53 +0000 Subject: [PATCH 63/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 57582be..78ca64f 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -104,6 +104,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.1.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 1.0.1.1-15 - refresh to cabal-rpm-2.0.6 From 3fb2c2d55572105c9c41f6f387821d2214f82eae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:39:47 +0000 Subject: [PATCH 64/70] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 78ca64f..dcdfd1e 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -104,6 +104,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.0.1.1-17 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.0.1.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2b3d329ed31ac2aa7b6eb5b20bd5ad8ad0ea181b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:53:53 +0000 Subject: [PATCH 65/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index dcdfd1e..b2fae2e 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -104,6 +104,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.1.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 1.0.1.1-17 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ae930fcd778feea608d72530a5277964a4b52a32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:26:02 +0000 Subject: [PATCH 66/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index b2fae2e..4f835c6 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -6,7 +6,7 @@ Name: ghc-%{pkg_name} Version: 1.0.1.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -104,6 +104,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.0.1.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.0.1.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 81d0f122a52e437d4f0cc7f99d45ec24bf3cae21 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 12:58:42 +0800 Subject: [PATCH 67/70] update to 1.0.2 --- .gitignore | 1 + ghc-utf8-string.spec | 19 ++++++++++++++----- sources | 2 +- utf8-string-1.0.1.1.cabal | 30 ------------------------------ 4 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 utf8-string-1.0.1.1.cabal diff --git a/.gitignore b/.gitignore index 962668b..03c5544 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ utf8-string-0.3.6.tar.gz /utf8-string-0.3.7.tar.gz /utf8-string-0.3.8.tar.gz /utf8-string-1.0.1.1.tar.gz +/utf8-string-1.0.2.tar.gz diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 4f835c6..bf1a33f 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -4,16 +4,17 @@ %global pkg_name utf8-string %global pkgver %{pkg_name}-%{version} +%bcond_without tests + Name: ghc-%{pkg_name} -Version: 1.0.1.1 -Release: 19%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -21,6 +22,9 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof +%if %{with tests} +BuildRequires: ghc-HUnit-devel +%endif # End cabal-rpm deps %description @@ -66,7 +70,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -82,6 +85,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install +%check +%cabal_test + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -104,6 +111,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Aug 5 2021 Jens Petersen - 1.0.2-1 +- update to 1.0.2 + * Thu Jul 22 2021 Fedora Release Engineering - 1.0.1.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -265,4 +275,3 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal * Fri May 29 2009 Zachary Oglesby - 0.3.4-1 - initial packaging for Fedora created by cabal2spec - diff --git a/sources b/sources index 3b743ab..73b8cc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe24e26bd4b09731af66ef27b18b5177 utf8-string-1.0.1.1.tar.gz +SHA512 (utf8-string-1.0.2.tar.gz) = b20b61e942a77848d12f9105f88790b3f02e3e2835b87e0ce1900b5ea1e97c4b055003603e435415e7fbbc9586f9c6ca2402f86cf5d2b7b6ced2ddcae3968d24 diff --git a/utf8-string-1.0.1.1.cabal b/utf8-string-1.0.1.1.cabal deleted file mode 100644 index 8dbad05..0000000 --- a/utf8-string-1.0.1.1.cabal +++ /dev/null @@ -1,30 +0,0 @@ -Name: utf8-string -Version: 1.0.1.1 -x-revision: 3 -Author: Eric Mertens -Maintainer: emertens@galois.com -License: BSD3 -License-file: LICENSE -Homepage: http://github.com/glguy/utf8-string/ -Synopsis: Support for reading and writing UTF8 Strings -Description: A UTF8 layer for Strings. The utf8-string - package provides operations for encoding UTF8 - strings to Word8 lists and back, and for reading and - writing UTF8 without truncation. -Category: Codec -Build-type: Simple -cabal-version: >= 1.2 -Extra-Source-Files: CHANGELOG.markdown -Tested-With: GHC==7.0.4, GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.2 - -library - Ghc-options: -W -O2 - - build-depends: base >= 4.3 && < 5, bytestring >= 0.9 - - Extensions: CPP - Exposed-modules: Codec.Binary.UTF8.String - Codec.Binary.UTF8.Generic - Data.String.UTF8 - Data.ByteString.UTF8 - Data.ByteString.Lazy.UTF8 From 84526b2fab3471070326993093d6f1a83b42ee62 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:14 +0800 Subject: [PATCH 68/70] refresh to cabal-rpm-2.0.9 --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index bf1a33f..65082b7 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name utf8-string @@ -50,6 +50,7 @@ This package provides the Haskell %{pkg_name} library development files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -86,7 +87,9 @@ This package provides the Haskell %{pkg_name} profiling library. %check +%if %{with tests} %cabal_test +%endif %files -f %{name}.files From 9af0139a1f5b421e3d536ba04fd9c71aa11af056 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:45:10 +0000 Subject: [PATCH 69/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-utf8-string.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 65082b7..006b568 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Support for reading and writing UTF8 Strings License: BSD @@ -114,6 +114,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 1.0.2-1 - update to 1.0.2 From c6ea547f419a0d8749168e5be2d181f16ac9d789 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:07:56 +0300 Subject: [PATCH 70/70] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 73b8cc1..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (utf8-string-1.0.2.tar.gz) = b20b61e942a77848d12f9105f88790b3f02e3e2835b87e0ce1900b5ea1e97c4b055003603e435415e7fbbc9586f9c6ca2402f86cf5d2b7b6ced2ddcae3968d24