[highlighting-kate] use patch to set executable flag and refresh metadata with cabal-rpm
Jens Petersen
petersen at fedoraproject.org
Wed Oct 31 10:36:26 UTC 2012
commit 5bdd218d1cd52ebbb80819a587c1311eeb508c2c
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Oct 31 19:36:20 2012 +0900
use patch to set executable flag and refresh metadata with cabal-rpm
highlighting-kate-flags.patch | 16 ++++++++++++++++
highlighting-kate-use-pcre-light.patch | 12 ------------
highlighting-kate.spec | 21 +++++++++------------
3 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/highlighting-kate-flags.patch b/highlighting-kate-flags.patch
new file mode 100644
index 0000000..5ff9301
--- /dev/null
+++ b/highlighting-kate-flags.patch
@@ -0,0 +1,16 @@
+--- highlighting-kate-0.5.3.3/highlighting-kate.cabal.orig 2012-10-13 01:46:07.000000000 +0900
++++ highlighting-kate-0.5.3.3/highlighting-kate.cabal 2012-10-31 19:29:58.634656799 +0900
+@@ -126,10 +126,10 @@
+ Default: True
+ Flag executable
+ Description: Build the Highlight executable.
+- Default: False
++ Default: True
+ Flag pcre-light
+ Description: Use the pcre-light library instead of regex-pcre-builtin
+- Default: False
++ Default: True
+
+ Source-repository head
+ type: git
+Diff finished. Wed Oct 31 19:30:26 2012
diff --git a/highlighting-kate.spec b/highlighting-kate.spec
index 542d057..db9baba 100644
--- a/highlighting-kate.spec
+++ b/highlighting-kate.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25.2
# https://fedoraproject.org/wiki/Packaging:Haskell
# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
@@ -16,22 +15,21 @@ Version: 0.5.3.3
Release: 1%{?dist}
Summary: Sourcecode syntax highlighting library
-Group: Applications/Publishing
License: GPLv2+
-# BEGIN cabal2spec
URL: http://hackage.haskell.org/package/%{name}
Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-ExclusiveArch: %{ghc_arches}
+
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
-BuildRequires: ghc-blaze-html-devel >= 0.4.2
+BuildRequires: ghc-rpm-macros
+# Begin cabal-rpm deps:
+BuildRequires: ghc-blaze-html-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-filepath-devel
+BuildRequires: ghc-mtl-devel
BuildRequires: ghc-parsec-devel
BuildRequires: ghc-pcre-light-devel
-BuildRequires: ghc-xhtml-devel
-Patch1: highlighting-kate-use-pcre-light.patch
+# End cabal-rpm deps
+Patch1: highlighting-kate-flags.patch
%description
%{common_description}
@@ -43,8 +41,8 @@ The package provides the Highlighting commandline program.
%setup -q
%patch1 -p1 -b .orig
+
%build
-%define cabal_configure_options -f executable
%ghc_lib_build
@@ -57,8 +55,6 @@ The package provides the Highlighting commandline program.
%ghc_description
-
-
%ghc_devel_package
%ghc_devel_description
@@ -79,6 +75,7 @@ The package provides the Highlighting commandline program.
%changelog
* Wed Oct 31 2012 Jens Petersen <petersen at redhat.com> - 0.5.3.3-1
- update to 0.5.3.3
+- turn on .cabal executable flag with patch
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list