From d4bf3f6323551fd937047a44d40dab1f84d0844d Mon Sep 17 00:00:00 2001 From: Shakthi Kannan Date: Fri, 26 Oct 2012 16:51:59 +0530 Subject: [PATCH 1/2] Updated to 0.1.2 --- .gitignore | 1 + sources | 2 +- ...ch => unlambda-0.1.2-FSF-license-fix.patch | 21 +++++++------------ unlambda.spec | 9 +++++--- 4 files changed, 15 insertions(+), 18 deletions(-) rename unlambda-0.1-FSF-license-fix.patch => unlambda-0.1.2-FSF-license-fix.patch (59%) diff --git a/.gitignore b/.gitignore index 58f42b0..2389cb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /unlambda-0.1.tar.gz +/unlambda-0.1.2.tar.gz diff --git a/sources b/sources index 3532869..f8ba51f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d31c90b3888043b8de77bb87f88bfcb unlambda-0.1.tar.gz +a73b6a70306d028004d257565027fc15 unlambda-0.1.2.tar.gz diff --git a/unlambda-0.1-FSF-license-fix.patch b/unlambda-0.1.2-FSF-license-fix.patch similarity index 59% rename from unlambda-0.1-FSF-license-fix.patch rename to unlambda-0.1.2-FSF-license-fix.patch index 4754b06..23a37ec 100644 --- a/unlambda-0.1-FSF-license-fix.patch +++ b/unlambda-0.1.2-FSF-license-fix.patch @@ -1,7 +1,7 @@ -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 +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 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software @@ -10,16 +10,9 @@ diff -up unlambda-0.1/Language/Unlambda.hs.fix unlambda-0.1/Language/Unlambda.hs -} module Language.Unlambda where -@@ -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 +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 @@ -2,7 +2,7 @@ Version 2, June 1991 diff --git a/unlambda.spec b/unlambda.spec index 3bda0c0..deeb962 100644 --- a/unlambda.spec +++ b/unlambda.spec @@ -10,8 +10,8 @@ written in the pure, lazy, functional language Haskell. Name: %{pkg_name} -Version: 0.1 -Release: 3%{?dist} +Version: 0.1.2 +Release: 1%{?dist} Summary: Haskell interpreter of the Unlambda language Group: Development/Tools @@ -19,7 +19,7 @@ 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 +Patch0: unlambda-0.1.2-FSF-license-fix.patch ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} @@ -62,6 +62,9 @@ iconv -f iso8859-1 -t utf-8 Language/Unlambda.hs > Language/Unlambda.conv && mv %ghc_files LICENSE %changelog +* 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 From 788c062b450b9cc0111987c4638dd5a910ee35b8 Mon Sep 17 00:00:00 2001 From: Shakthi Kannan Date: Fri, 7 Dec 2012 16:11:10 +0530 Subject: [PATCH 2/2] Updated to upstream 0.1.3 --- .gitignore | 1 + sources | 2 +- unlambda.spec | 36 ++++++++++++++++++++---------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 2389cb1..00db855 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /unlambda-0.1.tar.gz /unlambda-0.1.2.tar.gz +/unlambda-0.1.3.tar.gz diff --git a/sources b/sources index f8ba51f..95855cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a73b6a70306d028004d257565027fc15 unlambda-0.1.2.tar.gz +314f0c610d0b71635b453e649d47d73f unlambda-0.1.3.tar.gz diff --git a/unlambda.spec b/unlambda.spec index deeb962..9235192 100644 --- a/unlambda.spec +++ b/unlambda.spec @@ -1,37 +1,35 @@ -# cabal2spec-0.25 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name unlambda -%global common_summary An interpreter of the Unlambda language +%global common_summary Unlambda interpreter -%global common_description An interpreter of the Unlambda language,\ - written in the pure, lazy, functional language Haskell. +%global common_description This is an interpreter of the Unlambda language,\ +written in the pure, lazy, functional language Haskell. Name: %{pkg_name} -Version: 0.1.2 +Version: 0.1.3 Release: 1%{?dist} -Summary: Haskell interpreter of the Unlambda language +Summary: %{common_summary} -Group: Development/Tools -License: GPLv2 -# BEGIN cabal2spec +License: GPL+ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz Patch0: unlambda-0.1.2-FSF-license-fix.patch -ExclusiveArch: %{ghc_arches} -BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-unix-devel +# End cabal-rpm deps %description %{common_description} + %prep %setup -q %patch0 -p1 @@ -43,25 +41,31 @@ iconv -f iso8859-1 -t utf-8 Language/Unlambda.hs > Language/Unlambda.conv && mv %install %ghc_lib_install -# library subpackage %ghc_package %ghc_description -# devel subpackage + %ghc_devel_package %ghc_devel_description + %ghc_devel_post_postun + %files %doc LICENSE -%attr(755,root,root) %{_bindir}/%{name} +%{_bindir}/%{name} + %ghc_files LICENSE + %changelog +* 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