commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2020-08-28 21:42:20
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new.3399 (New)
Package is "hscolour"
Fri Aug 28 21:42:20 2020 rev:2 rq:829524 version:1.24.4
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2020-07-09
13:19:21.789268773 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new.3399/hscolour.changes
2020-08-28 21:42:21.460908909 +0200
@@ -1,0 +2,5 @@
+Tue Aug 18 10:46:53 UTC 2020 - Peter Simons
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.7sfpR5/_old 2020-08-28 21:42:22.064909131 +0200
+++ /var/tmp/diff_new_pack.7sfpR5/_new 2020-08-28 21:42:22.068909132 +0200
@@ -51,7 +51,7 @@
This package provides the Haskell %{name} library development files.
%prep
-%setup -q
+%autosetup
%build
%ghc_lib_build
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2017-09-15 22:29:25
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is "hscolour"
Fri Sep 15 22:29:25 2017 rev:14 rq:525779 version:1.24.1
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2016-07-21
08:02:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2017-09-15
22:29:25.779369329 +0200
@@ -1,0 +2,5 @@
+Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com
+
+- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
+
+---
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.1JSKFo/_old 2017-09-15 22:29:26.439276369 +0200
+++ /var/tmp/diff_new_pack.1JSKFo/_new 2017-09-15 22:29:26.439276369 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hscolour
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,15 +22,12 @@
Release:0
Summary:Colourise Haskell code
License:LGPL-2.1+
-Group: Development/Languages/Other
-Url:https://hackage.haskell.org/package/%{name}
+Group: Development/Libraries/Haskell
+URL:https://hackage.haskell.org/package/%{name}
Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-containers-devel
BuildRequires: ghc-rpm-macros
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# End cabal-rpm deps
%description
Hscolour is a small Haskell script to colourise Haskell code. It currently has
@@ -47,7 +44,7 @@
%package -n ghc-%{name}-devel
Summary:Haskell %{name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: ghc-%{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -59,15 +56,12 @@
%prep
%setup -q
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%post -n ghc-%{name}-devel
%ghc_pkg_recache
@@ -75,7 +69,6 @@
%ghc_pkg_recache
%files
-%defattr(-,root,root,-)
%doc LICENCE-LGPL
%{_bindir}/HsColour
%dir %{_datadir}/%{name}-%{version}
@@ -84,10 +77,8 @@
%{_datadir}/%{name}-%{version}/data/rgb24-example-.hscolour
%files -n ghc-%{name} -f ghc-%{name}.files
-%defattr(-,root,root,-)
%doc LICENCE-LGPL
%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%defattr(-,root,root,-)
%changelog
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2016-07-21 08:02:51
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is "hscolour"
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2016-07-01
09:58:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2016-07-21
08:02:54.0 +0200
@@ -1,0 +2,6 @@
+Sun Jul 10 16:58:35 UTC 2016 - psim...@suse.com
+
+- Update to version 1.24.1 revision 0 with cabal2obs.
+ This update obsoletes hscolour-rpmlintrc.
+
+---
Old:
hscolour-rpmlintrc
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.SNO1yL/_old 2016-07-21 08:02:55.0 +0200
+++ /var/tmp/diff_new_pack.SNO1yL/_new 2016-07-21 08:02:55.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hscolour
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,76 +17,77 @@
%global pkg_name hscolour
-
-# link statically to Haskell libs for easier ghc bootstrapping
-%global ghc_without_dynamic 1
-
-Name: hscolour
+Name: %{pkg_name}
Version:1.24.1
Release:0
-Summary:Colorise Haskell code
+Summary:Colourise Haskell code
License:LGPL-2.1+
Group: Development/Languages/Other
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# BEGIN cabal2spec
-Url:http://hackage.haskell.org/package/%{name}
-Source0:
http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source1:hscolour-rpmlintrc
+Url:https://hackage.haskell.org/package/%{name}
+Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
+# Begin cabal-rpm deps:
BuildRequires: ghc-containers-devel
BuildRequires: ghc-rpm-macros
-# END cabal2spec
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# End cabal-rpm deps
%description
-A small Haskell script to colorise Haskell code. It currently has
+Hscolour is a small Haskell script to colourise Haskell code. It currently has
six output formats: ANSI terminal codes (optionally XTerm-256colour codes),
-HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01 with CSS and mouseover
+HTML 3.2 with tags, HTML 4.01 with CSS, HTML 4.01 with CSS and mouseover
annotations, XHTML 1.0 with inline CSS styling, LaTeX, and mIRC chat codes.
-%package -n ghc-%{pkg_name}
-Summary:Haskell %{pkg_name} library
-Group: Development/Languages/Other
+%package -n ghc-%{name}
+Summary:Haskell %{name} library
+Group: System/Libraries
+
+%description -n ghc-%{name}
+This package provides the Haskell %{name} shared library.
+
+%package -n ghc-%{name}-devel
+Summary:Haskell %{name} library development files
+Group: Development/Libraries/Other
+Requires: ghc-%{name} = %{version}-%{release}
+Requires: ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
-%description -n ghc-%{pkg_name}
-Haskell library to colorise Haskell code.
-
-%package -n ghc-%{pkg_name}-devel
-Summary:Haskell %{pkg_name} library development files
-Group: Development/Languages/Other
-Requires: ghc-compiler
-Requires(post): ghc-compiler
-Requires(postun): ghc-compiler
-Requires: ghc-%{pkg_name} = %{version}-%{release}
-
-%description -n ghc-%{pkg_name}-devel
-Development files for Haskell library tocolorise Haskell code.
+%description -n ghc-%{name}-devel
+This package provides the Haskell %{name} library development files.
%prep
%setup -q
+
%build
%ghc_lib_build
+
%install
%ghc_lib_install
-%post -n ghc-%{pkg_name}-devel
+
+%post -n ghc-%{name}-devel
%ghc_pkg_recache
-%postun -n ghc-%{pkg_name}-devel
+%postun -n ghc-%{name}-devel
%ghc_pkg_recache
%files
%defattr(-,root,root,-)
%doc LICENCE-LGPL
-%attr(755,root,root) %{_bindir}/HsColour
-%{_datadir}/%{name}-%{version}
+%{_bindir}/HsColour
+%dir %{_datadir}/%{name}-%{version}
+%dir %{_datadir}/%{name}-%{version}/data
+%{_datadir}/%{name}-%{version}/hscolour.css
+%{_datadir}/%{name}-%{version}/data/rgb24-example-.hscolour
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%files -n ghc-%{name} -f ghc-%{name}.files
%defattr(-,root,root,-)
+%doc LICENCE-LGPL
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2016-07-01 09:58:43
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is "hscolour"
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2016-05-31
12:24:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2016-07-01
09:58:46.0 +0200
@@ -1,0 +2,7 @@
+Mon Jun 27 08:50:49 UTC 2016 - mimi...@gmail.com
+
+- update to 1.24.1
+- revome uselees _service
+- Change Licence to LGPL-2.1+
+
+---
Old:
_service
hscolour-1.24.tar.gz
New:
hscolour-1.24.1.tar.gz
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.DxRyh8/_old 2016-07-01 09:58:47.0 +0200
+++ /var/tmp/diff_new_pack.DxRyh8/_new 2016-07-01 09:58:47.0 +0200
@@ -22,10 +22,10 @@
%global ghc_without_dynamic 1
Name: hscolour
-Version:1.24
+Version:1.24.1
Release:0
Summary:Colorise Haskell code
-License:GPL-2.0
+License:LGPL-2.1+
Group: Development/Languages/Other
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -79,7 +79,7 @@
%files
%defattr(-,root,root,-)
-%doc LICENCE-GPL
+%doc LICENCE-LGPL
%attr(755,root,root) %{_bindir}/HsColour
%{_datadir}/%{name}-%{version}
++ hscolour-1.24.tar.gz -> hscolour-1.24.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hscolour-1.24/LICENCE-GPL
new/hscolour-1.24.1/LICENCE-GPL
--- old/hscolour-1.24/LICENCE-GPL 2016-01-25 21:09:47.0 +0100
+++ new/hscolour-1.24.1/LICENCE-GPL 1970-01-01 01:00:00.0 +0100
@@ -1,343 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and
commit hscolour for openSUSE:Factory
Hello community, here is the log from the commit of package hscolour for openSUSE:Factory checked in at 2016-05-31 12:24:17 Comparing /work/SRC/openSUSE:Factory/hscolour (Old) and /work/SRC/openSUSE:Factory/.hscolour.new (New) Package is "hscolour" Changes: --- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2015-08-23 17:40:32.0 +0200 +++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2016-05-31 12:24:20.0 +0200 @@ -1,0 +2,6 @@ +Wed Jan 27 22:46:23 UTC 2016 - mimi...@gmail.com + +- update to 1.24 +* support anchors for type/data families + +--- Old: hscolour-1.23.tar.gz New: hscolour-1.24.tar.gz Other differences: -- ++ hscolour.spec ++ --- /var/tmp/diff_new_pack.C30kxR/_old 2016-05-31 12:24:21.0 +0200 +++ /var/tmp/diff_new_pack.C30kxR/_new 2016-05-31 12:24:21.0 +0200 @@ -22,7 +22,7 @@ %global ghc_without_dynamic 1 Name: hscolour -Version:1.23 +Version:1.24 Release:0 Summary:Colorise Haskell code License:GPL-2.0 ++ hscolour-1.23.tar.gz -> hscolour-1.24.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.23/Language/Haskell/HsColour/Anchors.hs new/hscolour-1.24/Language/Haskell/HsColour/Anchors.hs --- old/hscolour-1.23/Language/Haskell/HsColour/Anchors.hs 2015-05-11 14:18:07.0 +0200 +++ new/hscolour-1.24/Language/Haskell/HsColour/Anchors.hs 2016-01-25 21:09:47.0 +0100 @@ -76,8 +76,12 @@ ((Varop,v):_) | not (v`inST`st) -> Just (fix v) _ -> Nothing identifier st t@((Keyword,"foreign"):stream) = Nothing -- not yet implemented +identifier st t@((Keyword,"data"):(Space,_):(Keyword,"family"):stream) + = getConid stream identifier st t@((Keyword,"data"):stream)= getConid stream identifier st t@((Keyword,"newtype"):stream) = getConid stream +identifier st t@((Keyword,"type"):(Space,_):(Keyword,"family"):stream) + = getConid stream identifier st t@((Keyword,"type"):stream)= getConid stream identifier st t@((Keyword,"class"):stream) = getConid stream identifier st t@((Keyword,"instance"):stream)= getInstance stream diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.23/Language/Haskell/HsColour/Classify.hs new/hscolour-1.24/Language/Haskell/HsColour/Classify.hs --- old/hscolour-1.23/Language/Haskell/HsColour/Classify.hs 2015-05-11 14:18:07.0 +0200 +++ new/hscolour-1.24/Language/Haskell/HsColour/Classify.hs 2016-01-25 21:09:47.0 +0100 @@ -126,7 +126,7 @@ ["case","class","data","default","deriving","do","else","forall" ,"if","import","in","infix","infixl","infixr","instance","let","module" ,"newtype","of","qualified","then","type","where","_" - ,"foreign","ccall","as","safe","unsafe"] + ,"foreign","ccall","as","safe","unsafe","family"] keyglyphs = ["..","::","=","\\","|","<-","->","@","~","=>","[","]"] layoutchars = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.23/hscolour.cabal new/hscolour-1.24/hscolour.cabal --- old/hscolour-1.23/hscolour.cabal2015-05-11 14:18:07.0 +0200 +++ new/hscolour-1.24/hscolour.cabal2016-01-25 21:09:47.0 +0100 @@ -1,6 +1,6 @@ Name: hscolour -Version: 1.23 -Copyright: 2003-2015 Malcolm Wallace; 2006 Bjorn Bringert +Version: 1.24 +Copyright: 2003-2016 Malcolm Wallace; 2006 Bjorn Bringert Maintainer: Malcolm Wallace Author: Malcolm Wallace Homepage: http://code.haskell.org/~malcolm/hscolour/ @@ -51,7 +51,7 @@ Main-is: HsColour.hs --ghc-options: -O -W Extensions: CPP - cpp-options: -DMAJOR=1 -DMINOR=22 + cpp-options: -DMAJOR=1 -DMINOR=24
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2015-08-23 15:43:27
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is hscolour
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2015-05-13
07:12:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2015-08-23
17:40:32.0 +0200
@@ -1,0 +2,6 @@
+Fri Aug 7 08:55:25 UTC 2015 - mimi...@gmail.com
+
+- update to 1.23
+* bugfix for anchor-generation for instance decls
+
+---
Old:
hscolour-1.22.tar.gz
New:
hscolour-1.23.tar.gz
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.BeEKQN/_old 2015-08-23 17:40:33.0 +0200
+++ /var/tmp/diff_new_pack.BeEKQN/_new 2015-08-23 17:40:33.0 +0200
@@ -22,7 +22,7 @@
%global ghc_without_dynamic 1
Name: hscolour
-Version:1.22
+Version:1.23
Release:0
Summary:Colorise Haskell code
License:GPL-2.0
++ hscolour-1.22.tar.gz - hscolour-1.23.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hscolour-1.22/Language/Haskell/HsColour/Anchors.hs
new/hscolour-1.23/Language/Haskell/HsColour/Anchors.hs
--- old/hscolour-1.22/Language/Haskell/HsColour/Anchors.hs 2015-03-17
12:51:59.0 +0100
+++ new/hscolour-1.23/Language/Haskell/HsColour/Anchors.hs 2015-05-11
14:18:07.0 +0200
@@ -148,13 +148,21 @@
-- the anchor name for an instance is just the entire instance head, minus
-- any extra context clause
getInstance = Just . unwords . (instance:) . words . concat . map snd
- . trimContext . takeWhile (/=(Keyword,where))
+ . trimContext . takeWhile (not . terminator)
where
trimContext ts = if (Keyglyph,=) `elem` ts
|| (Keyglyph,⇒) `elem` ts
then tail . dropWhile (`notElem`[(Keyglyph,=)
,(Keyglyph,⇒)]) $ ts
else ts
+terminator (Keyword, _) = True
+terminator (Comment, _) = True
+terminator (Cpp, _) = True
+terminator (Keyglyph,|) = True
+terminator (Layout, ;) = True
+terminator (Layout, {) = True
+terminator (Layout, }) = True
+terminator _ = False
-- simple implementation of a string lookup table.
-- replace this with something more sophisticated if needed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hscolour-1.22/hscolour.cabal
new/hscolour-1.23/hscolour.cabal
--- old/hscolour-1.22/hscolour.cabal2015-03-17 12:52:00.0 +0100
+++ new/hscolour-1.23/hscolour.cabal2015-05-11 14:18:07.0 +0200
@@ -1,5 +1,5 @@
Name: hscolour
-Version: 1.22
+Version: 1.23
Copyright: 2003-2015 Malcolm Wallace; 2006 Bjorn Bringert
Maintainer: Malcolm Wallace
Author: Malcolm Wallace
commit hscolour for openSUSE:Factory
Hello community, here is the log from the commit of package hscolour for openSUSE:Factory checked in at 2015-05-13 07:12:37 Comparing /work/SRC/openSUSE:Factory/hscolour (Old) and /work/SRC/openSUSE:Factory/.hscolour.new (New) Package is hscolour Changes: --- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2014-11-26 20:54:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2015-05-13 07:12:39.0 +0200 @@ -1,0 +2,12 @@ +Fri Apr 10 14:30:54 UTC 2015 - mimi...@gmail.com + +- update to 1.22 ++ bugfix for mIRC backend ++ ensure that line-number anchors do not reset in literate code fragments + +--- +Sun Mar 15 14:39:09 UTC 2015 - mimi...@gmail.com + +- update to 1.21 from upstream + +--- Old: hscolour-1.20.3.tar.gz New: hscolour-1.22.tar.gz Other differences: -- ++ hscolour.spec ++ --- /var/tmp/diff_new_pack.z8G895/_old 2015-05-13 07:12:40.0 +0200 +++ /var/tmp/diff_new_pack.z8G895/_new 2015-05-13 07:12:40.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package hscolour # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %global ghc_without_dynamic 1 Name: hscolour -Version:1.20.3 +Version:1.22 Release:0 Summary:Colorise Haskell code License:GPL-2.0 ++ hscolour-1.20.3.tar.gz - hscolour-1.22.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.20.3/Language/Haskell/HsColour/ACSS.hs new/hscolour-1.22/Language/Haskell/HsColour/ACSS.hs --- old/hscolour-1.20.3/Language/Haskell/HsColour/ACSS.hs 2012-09-08 16:51:23.0 +0200 +++ new/hscolour-1.22/Language/Haskell/HsColour/ACSS.hs 2015-03-17 12:51:59.0 +0100 @@ -26,19 +26,21 @@ -- | Formats Haskell source code using HTML and mouse-over annotations hscolour :: Bool -- ^ Whether to include anchors. + - Int -- ^ Starting line number (for line anchors). - String -- ^ Haskell source code, Annotations as comments at end - String -- ^ Coloured Haskell source code. -hscolour anchor = hsannot anchor . splitSrcAndAnns +hscolour anchor n = hsannot anchor n . splitSrcAndAnns -- | Formats Haskell source code using HTML and mouse-over annotations hsannot :: Bool -- ^ Whether to include anchors. + - Int -- ^ Starting line number (for line anchors). - (String, AnnMap) -- ^ Haskell Source, Annotations - String -- ^ Coloured Haskell source code. -hsannot anchor = +hsannot anchor n = CSS.pre -. (if anchor then -- renderNewLinesAnchors . +. (if anchor then -- renderNewLinesAnchors n . concatMap (renderAnchors renderAnnotToken) . insertAnnotAnchors else concatMap renderAnnotToken) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.20.3/Language/Haskell/HsColour/CSS.hs new/hscolour-1.22/Language/Haskell/HsColour/CSS.hs --- old/hscolour-1.20.3/Language/Haskell/HsColour/CSS.hs2012-09-08 16:51:23.0 +0200 +++ new/hscolour-1.22/Language/Haskell/HsColour/CSS.hs 2015-03-17 12:51:59.0 +0100 @@ -13,13 +13,14 @@ -- | Formats Haskell source code as a complete HTML document with CSS. hscolour :: Bool -- ^ Whether to include anchors. + - Int-- ^ Starting line number (for line anchors). - String -- ^ Haskell source code. - String -- ^ An HTML document containing the coloured -- Haskell source code. -hscolour anchor = +hscolour anchor n = pre . (if anchor -then renderNewLinesAnchors +then renderNewLinesAnchors n . concatMap (renderAnchors renderToken) . insertAnchors else concatMap renderToken) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hscolour-1.20.3/Language/Haskell/HsColour/HTML.hs new/hscolour-1.22/Language/Haskell/HsColour/HTML.hs --- old/hscolour-1.20.3/Language/Haskell/HsColour/HTML.hs 2012-09-08 16:51:23.0 +0200 +++ new/hscolour-1.22/Language/Haskell/HsColour/HTML.hs 2015-03-17 12:51:59.0 +0100 @@ -17,11 +17,12 @@ -- | Formats Haskell source code using HTML with font
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2014-11-26 20:54:29
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is hscolour
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2014-08-03
15:36:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2014-11-26
20:54:30.0 +0100
@@ -1,0 +2,7 @@
+Fri Sep 12 07:06:06 UTC 2014 - peter.tromm...@ohm-hochschule.de
+
+- regenerate spec file
+- build statically linked HsColour
+* saves several rounds of rebuilding when bootstrapping an new ghc
+
+---
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.aEVscB/_old 2014-11-26 20:54:32.0 +0100
+++ /var/tmp/diff_new_pack.aEVscB/_new 2014-11-26 20:54:32.0 +0100
@@ -18,14 +18,13 @@
%global pkg_name hscolour
-%global common_summary Colorise Haskell code
-
-%global common_description A small Haskell script to colorise Haskell code. It
currently has six output formats: ANSI terminal codes (optionally
XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01
with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX,
and mIRC chat codes.
+# link statically to Haskell libs for easier ghc bootstrapping
+%global ghc_without_dynamic 1
Name: hscolour
Version:1.20.3
Release:0
-Summary:Haskell %{pkg_name}
+Summary:Colorise Haskell code
License:GPL-2.0
Group: Development/Languages/Other
@@ -40,14 +39,17 @@
# END cabal2spec
%description
-%{common_description}
+A small Haskell script to colorise Haskell code. It currently has
+six output formats: ANSI terminal codes (optionally XTerm-256colour codes),
+HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01 with CSS and mouseover
+annotations, XHTML 1.0 with inline CSS styling, LaTeX, and mIRC chat codes.
%package -n ghc-%{pkg_name}
Summary:Haskell %{pkg_name} library
Group: Development/Languages/Other
%description -n ghc-%{pkg_name}
-%{common_description}
+Haskell library to colorise Haskell code.
%package -n ghc-%{pkg_name}-devel
Summary:Haskell %{pkg_name} library development files
@@ -58,7 +60,7 @@
Requires: ghc-%{pkg_name} = %{version}-%{release}
%description -n ghc-%{pkg_name}-devel
-%{common_description}
+Development files for Haskell library tocolorise Haskell code.
%prep
%setup -q
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2014-08-03 15:36:40
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is hscolour
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2013-10-14
09:28:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2014-08-03
15:36:45.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 31 15:07:28 UTC 2014 - dims...@opensuse.org
+
+- Rename rpmlintrc to %{name}-rpmlintrc.
+ Follow the packaging guidelines.
+
+---
Old:
rpmlintrc
New:
hscolour-rpmlintrc
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.ES39Rh/_old 2014-08-03 15:36:45.0 +0200
+++ /var/tmp/diff_new_pack.ES39Rh/_new 2014-08-03 15:36:45.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hscolour
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -33,6 +33,7 @@
# BEGIN cabal2spec
Url:http://hackage.haskell.org/package/%{name}
Source0:
http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source1:hscolour-rpmlintrc
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-rpm-macros
++ hscolour-rpmlintrc ++
addFilter(executable-stack)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2013-10-14 09:28:01
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is hscolour
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2013-08-01
15:36:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2013-10-14
09:28:10.0 +0200
@@ -1,0 +2,10 @@
+Fri Oct 11 21:34:38 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- fix file permissions for SLE
+
+---
+Fri Oct 11 19:59:42 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- enable ppc and ppc64 build
+
+---
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.EEXI9r/_old 2013-10-14 09:28:11.0 +0200
+++ /var/tmp/diff_new_pack.EEXI9r/_new 2013-10-14 09:28:11.0 +0200
@@ -33,7 +33,6 @@
# BEGIN cabal2spec
Url:http://hackage.haskell.org/package/%{name}
Source0:
http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-ExclusiveArch: %{ix86} x86_64 %{ghc_arches}
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-rpm-macros
@@ -82,7 +81,9 @@
%{_datadir}/%{name}-%{version}
%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%defattr(-,root,root,-)
%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%defattr(-,root,root,-)
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hscolour for openSUSE:Factory
Hello community,
here is the log from the commit of package hscolour for openSUSE:Factory
checked in at 2013-08-01 15:36:35
Comparing /work/SRC/openSUSE:Factory/hscolour (Old)
and /work/SRC/openSUSE:Factory/.hscolour.new (New)
Package is hscolour
Changes:
--- /work/SRC/openSUSE:Factory/hscolour/hscolour.changes2012-12-28
15:01:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.hscolour.new/hscolour.changes 2013-08-01
15:36:37.0 +0200
@@ -1,0 +2,7 @@
+Mon May 6 07:36:37 UTC 2013 - peter.tromm...@ohm-hochschule.de
+
+- update to 1.20.3 from upstream
+* compiles with ghc 7.6
+- new simplified packaging
+
+---
Old:
hscolour-1.19.tar.gz
New:
hscolour-1.20.3.tar.gz
Other differences:
--
++ hscolour.spec ++
--- /var/tmp/diff_new_pack.uffmmt/_old 2013-08-01 15:36:37.0 +0200
+++ /var/tmp/diff_new_pack.uffmmt/_new 2013-08-01 15:36:37.0 +0200
@@ -1,8 +1,7 @@
#
# spec file for package hscolour
#
-
-# Copyright (c) 2012 Peter Trommler peter.tromm...@ohm-hochschule.de
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,61 +15,65 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%global pkg_name hscolour
%global common_summary Colorise Haskell code
%global common_description A small Haskell script to colorise Haskell code. It
currently has six output formats: ANSI terminal codes (optionally
XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01
with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX,
and mIRC chat codes.
-%global without_hscolour 1
-
Name: hscolour
-Version:1.19
-Release:1
+Version:1.20.3
+Release:0
Summary:Haskell %{pkg_name}
-
-Group: Development/Languages/Other
License:GPL-2.0
+Group: Development/Languages/Other
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# BEGIN cabal2spec
-URL:http://hackage.haskell.org/package/%{name}
+Url:http://hackage.haskell.org/package/%{name}
Source0:
http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
ExclusiveArch: %{ix86} x86_64 %{ghc_arches}
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour}
BuildRequires: ghc-containers-devel
+BuildRequires: ghc-rpm-macros
# END cabal2spec
%description
%{common_description}
+%package -n ghc-%{pkg_name}
+Summary:Haskell %{pkg_name} library
+Group: Development/Languages/Other
+
+%description -n ghc-%{pkg_name}
+%{common_description}
+
+%package -n ghc-%{pkg_name}-devel
+Summary:Haskell %{pkg_name} library development files
+Group: Development/Languages/Other
+Requires: ghc-compiler
+Requires(post): ghc-compiler
+Requires(postun): ghc-compiler
+Requires: ghc-%{pkg_name} = %{version}-%{release}
+
+%description -n ghc-%{pkg_name}-devel
+%{common_description}
%prep
%setup -q
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
-# library subpackage
-%ghc_package
-
-%ghc_description
-
-
-# devel subpackage
-%ghc_devel_package
-
-%ghc_devel_description
-
-
-%ghc_devel_post_postun
-
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
%files
%defattr(-,root,root,-)
@@ -78,8 +81,8 @@
%attr(755,root,root) %{_bindir}/HsColour
%{_datadir}/%{name}-%{version}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%ghc_files
-
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
%changelog
++ hscolour-1.19.tar.gz - hscolour-1.20.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hscolour-1.19/HsColour.hs
new/hscolour-1.20.3/HsColour.hs
--- old/hscolour-1.19/HsColour.hs 2011-06-05 19:05:04.0 +0200
+++ new/hscolour-1.20.3/HsColour.hs 2012-09-08 16:51:23.0 +0200
@@ -20,7 +20,8 @@
import System.IO (hSetEncoding, utf8)
#endif
-version = 1.19
+version :: String
+version = show MAJOR ++.++show MINOR
optionTable :: [(String,Option)]
optionTable = [ (help,Help)
@@ -84,7 +85,7 @@
ioWrapper (HSColour.hscolour output pref anchors partial title)
where
-writeResult outF s = do if null outF then putStr s
+writeResult outF s = do if null outF then putStrLn s
else writeUTF8File (last outF) s
