diff --git a/.gitignore b/.gitignore index dd006da..58f42b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ /unlambda-0.1.tar.gz -/unlambda-0.1.2.tar.gz -/unlambda-0.1.3.tar.gz -/unlambda-0.1.4.1.tar.gz -/unlambda-0.1.4.2.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 140ae5f..0000000 --- a/changelog +++ /dev/null @@ -1,112 +0,0 @@ -* Thu Feb 16 2023 Jens Petersen - 0.1.4.2-24 -- refresh to cabal-rpm-2.1.0 including SPDX migration - -* Sat Jul 23 2022 Fedora Release Engineering - 0.1.4.2-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jun 17 2022 Jens Petersen - 0.1.4.2-22 -- rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.1.4.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Jan 08 2022 Miro Hrončok - 0.1.4.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 - -* Fri Aug 06 2021 Jens Petersen - 0.1.4.2-19 -- rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.1.4.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.1.4.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.1.4.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 17 2020 Jens Petersen - 0.1.4.2-15 -- refresh to cabal-rpm-2.0.6 - -* Fri Jan 31 2020 Fedora Release Engineering - 0.1.4.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Aug 02 2019 Jens Petersen - 0.1.4.2-13 -- add doc and prof subpackages (cabal-rpm-1.0.0) - -* Sat Jul 27 2019 Fedora Release Engineering - 0.1.4.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 17 2019 Jens Petersen - 0.1.4.2-11 -- refresh to cabal-rpm-0.13 - -* Sun Feb 03 2019 Fedora Release Engineering - 0.1.4.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 28 2018 Jens Petersen - 0.1.4.2-9 -- rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.1.4.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.1.4.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 26 2018 Jens Petersen - 0.1.4.2-6 -- rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.1.4.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.1.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 24 2017 Jens Petersen - 0.1.4.2-3 -- refresh to cabal-rpm-0.11.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Jun 26 2016 Jens Petersen - 0.1.4.2-1 -- update to 0.1.4.2 - -* Fri Feb 05 2016 Fedora Release Engineering - 0.1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Sep 17 2015 Jens Petersen - 0.1.4.1-1 -- update to 0.1.4.1 - -* Fri Jun 19 2015 Fedora Release Engineering - 0.1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 0.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 11 2013 Jens Petersen - 0.1.3-3 -- update to new simplified Haskell Packaging Guidelines - -* Fri Feb 15 2013 Fedora Release Engineering - 0.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Dec 7 2012 Shakthi Kannan - 0.1.3-1 -- spec file generated by cabal-rpm-0.6.5 - -* Fri Oct 26 2012 Shakthi Kannan - 0.1.2-1 -- Updated to new upstream release 0.1.2 - -* Sun Jul 22 2012 Fedora Release Engineering - 0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 19 2012 Shakthi Kannan - 0.1-2 -- Added patch to fix FSF address. - -* Fri Jun 08 2012 Shakthi Kannan - 0.1-1 -- Added iconv to convert Unlambda.hs to utf-8. -- Added BRs. -- Spec file template generated by cabal2spec-0.25.5 diff --git a/sources b/sources index 540d149..3532869 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e7db868d24d7e192dd9d3f21ca9ee41 unlambda-0.1.4.2.tar.gz +2d31c90b3888043b8de77bb87f88bfcb unlambda-0.1.tar.gz diff --git a/unlambda-0.1.2-FSF-license-fix.patch b/unlambda-0.1-FSF-license-fix.patch similarity index 59% rename from unlambda-0.1.2-FSF-license-fix.patch rename to unlambda-0.1-FSF-license-fix.patch index 23a37ec..4754b06 100644 --- a/unlambda-0.1.2-FSF-license-fix.patch +++ b/unlambda-0.1-FSF-license-fix.patch @@ -1,7 +1,7 @@ -diff -up unlambda-0.1.2/Language/Unlambda.hs.fix unlambda-0.1.2/Language/Unlambda.hs ---- unlambda-0.1.2/Language/Unlambda.hs.fix 2012-10-26 16:20:40.397173788 +0530 -+++ unlambda-0.1.2/Language/Unlambda.hs 2012-10-26 16:23:15.926170223 +0530 -@@ -19,7 +19,7 @@ GNU General Public License for more deta +diff -up unlambda-0.1/Language/Unlambda.hs.fix unlambda-0.1/Language/Unlambda.hs +--- unlambda-0.1/Language/Unlambda.hs.fix 2012-06-19 15:47:29.388841138 +0530 ++++ unlambda-0.1/Language/Unlambda.hs 2012-06-19 15:48:26.298842436 +0530 +@@ -21,7 +21,7 @@ GNU General Public License for more deta You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software @@ -10,9 +10,16 @@ diff -up unlambda-0.1.2/Language/Unlambda.hs.fix unlambda-0.1.2/Language/Unlambd -} module Language.Unlambda where -diff -up unlambda-0.1.2/LICENSE.fix unlambda-0.1.2/LICENSE ---- unlambda-0.1.2/LICENSE.fix 2012-10-26 16:20:35.517174668 +0530 -+++ unlambda-0.1.2/LICENSE 2012-10-26 16:22:44.604170767 +0530 +@@ -141,4 +141,4 @@ apply (Ques c) f = do + apply Pipe f = do + cur <- currentChar + apply f (case cur of Nothing -> V ; Just c -> (Dot c)) +-apply (App _ _) _ = error "Unknown application" +\ No newline at end of file ++apply (App _ _) _ = error "Unknown application" +diff -up unlambda-0.1/LICENSE.fix unlambda-0.1/LICENSE +--- unlambda-0.1/LICENSE.fix 2012-06-19 15:47:24.290841020 +0530 ++++ unlambda-0.1/LICENSE 2012-06-19 15:49:41.795844157 +0530 @@ -2,7 +2,7 @@ Version 2, June 1991 diff --git a/unlambda.spec b/unlambda.spec index 589d695..02f7798 100644 --- a/unlambda.spec +++ b/unlambda.spec @@ -1,129 +1,71 @@ -# generated by cabal-rpm-2.3.2 -# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ +# cabal2spec-0.25 +# https://fedoraproject.org/wiki/Packaging:Haskell +# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name unlambda -%global pkgver %{pkg_name}-%{version} -%{?haskell_setup} + +%global common_summary An interpreter of the Unlambda language + +%global common_description An interpreter of the Unlambda language,\ + written in the pure, lazy, functional language Haskell. Name: %{pkg_name} -Version: 0.1.4.2 -Release: %autorelease -Summary: Unlambda interpreter +Version: 0.1 +Release: 2%{?dist} +Summary: Haskell interpreter of the Unlambda language -License: GPL-2.0-or-later -URL: https://hackage.haskell.org/package/unlambda -# Begin cabal-rpm sources: -Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -# End cabal-rpm sources -Patch0: unlambda-0.1.2-FSF-license-fix.patch - -# Begin cabal-rpm deps: -BuildRequires: ghc-rpm-macros +Group: Development/Tools +License: GPLv2 +# BEGIN cabal2spec +URL: http://hackage.haskell.org/package/%{name} +Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz +Patch0: unlambda-0.1-FSF-license-fix.patch +ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} +# END cabal2spec + BuildRequires: ghc-array-devel -BuildRequires: ghc-base-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-unix-devel -%if %{with ghc_prof} -BuildRequires: ghc-array-prof -BuildRequires: ghc-base-prof -BuildRequires: ghc-mtl-prof -BuildRequires: ghc-unix-prof -%endif -# End cabal-rpm deps %description -This is an interpreter of the Unlambda language, written in the pure, lazy, -functional language Haskell. - - -%package -n ghc-%{name} -Summary: Haskell %{name} library - -%description -n ghc-%{name} -This package provides the Haskell %{name} shared library. - - -%package -n ghc-%{name}-devel -Summary: Haskell %{name} library development files -Provides: ghc-%{name}-static = %{version}-%{release} -Provides: ghc-%{name}-static%{?_isa} = %{version}-%{release} -%if %{defined ghc_version} -Requires: ghc-compiler = %{ghc_version} -%endif -Requires: ghc-%{name}%{?_isa} = %{version}-%{release} - -%description -n ghc-%{name}-devel -This package provides the Haskell %{name} library development files. - - -%if %{with haddock} -%package -n ghc-%{name}-doc -Summary: Haskell %{name} library documentation -BuildArch: noarch -Requires: ghc-filesystem - -%description -n ghc-%{name}-doc -This package provides the Haskell %{name} library documentation. -%endif - - -%if %{with ghc_prof} -%package -n ghc-%{name}-prof -Summary: Haskell %{name} profiling library -Requires: ghc-%{name}-devel%{?_isa} = %{version}-%{release} -Supplements: (ghc-%{name}-devel and ghc-prof) - -%description -n ghc-%{name}-prof -This package provides the Haskell %{name} profiling library. -%endif - +%{common_description} %prep -# Begin cabal-rpm setup: %setup -q -# End cabal-rpm setup -%patch -P0 -p1 +%patch0 -p1 iconv -f iso8859-1 -t utf-8 Language/Unlambda.hs > Language/Unlambda.conv && mv -f Language/Unlambda.conv Language/Unlambda.hs %build -# Begin cabal-rpm build: %ghc_lib_build -# End cabal-rpm build - %install -# Begin cabal-rpm install %ghc_lib_install -# End cabal-rpm install +# library subpackage +%ghc_package + +%ghc_description + +# devel subpackage +%ghc_devel_package + +%ghc_devel_description + +%ghc_devel_post_postun %files -# Begin cabal-rpm files: -%license LICENSE -%{_bindir}/%{name} -# End cabal-rpm files - - -%files -n ghc-%{name} -f ghc-%{name}.files -# Begin cabal-rpm files: -%license LICENSE -# End cabal-rpm files - - -%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files - - -%if %{with haddock} -%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files -%license LICENSE -%endif - - -%if %{with ghc_prof} -%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files -%endif +%doc LICENSE +%attr(755,root,root) %{_bindir}/%{name} +%ghc_files LICENSE %changelog -%autochangelog +* Tue Jun 19 2012 Shakthi Kannan - 0.1-2 +- Added patch to fix FSF address. + +* Fri Jun 08 2012 Shakthi Kannan - 0.1-1 +- Added iconv to convert Unlambda.hs to utf-8. +- Added BRs. +- Spec file template generated by cabal2spec-0.25.5