commit cpphs for openSUSE:Factory

2020-08-28 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2020-08-28 21:23:27

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new.3399 (New)


Package is "cpphs"

Fri Aug 28 21:23:27 2020 rev:2 rq:829144 version:1.20.9.1

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2020-07-09 
13:16:56.940810971 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new.3399/cpphs.changes2020-08-28 
21:23:29.632385990 +0200
@@ -1,0 +2,5 @@
+Tue Aug 18 10:43:44 UTC 2020 - Peter Simons 
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.UfjwqC/_old  2020-08-28 21:23:30.156386239 +0200
+++ /var/tmp/diff_new_pack.UfjwqC/_new  2020-08-28 21:23:30.160386240 +0200
@@ -59,7 +59,7 @@
 This package provides the Haskell %{name} library development files.
 
 %prep
-%setup -q
+%autosetup
 find . -type f -exec chmod -x {} +
 
 %build

commit cpphs for openSUSE:Factory

2018-07-24 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2018-07-24 17:12:15

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Tue Jul 24 17:12:15 2018 rev:15 rq:623695 version:1.20.8

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2018-05-30 
13:09:04.001296152 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2018-07-24 
17:12:15.902516692 +0200
@@ -1,0 +2,11 @@
+Wed Jul 18 14:26:09 UTC 2018 - psim...@suse.com
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+  and update copyright headers with spec-cleaner.
+
+---
+Fri Jun 22 13:41:01 UTC 2018 - psim...@suse.com
+
+- Clean up the installed %license files.
+
+---
@@ -146 +156,0 @@
-



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.ZlLTqo/_old  2018-07-24 17:12:16.578517572 +0200
+++ /var/tmp/diff_new_pack.ZlLTqo/_new  2018-07-24 17:12:16.582517576 +0200
@@ -80,15 +80,15 @@
 %ghc_pkg_recache
 
 %files
-%license LICENCE-LGPL
-%doc LICENCE-GPL LICENCE-commercial README docs
+%license LICENCE-LGPL LICENCE-GPL LICENCE-commercial
+%doc README docs/index.html
 %{_bindir}/%{name}
 %{_mandir}/man1/cpphs.1%{?ext_man}
 
 %files -n ghc-%{name} -f ghc-%{name}.files
-%license LICENCE-LGPL
+%license LICENCE-LGPL LICENCE-commercial
 
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%doc LICENCE-GPL LICENCE-commercial README docs
+%license LICENCE-LGPL LICENCE-commercial
 
 %changelog

commit cpphs for openSUSE:Factory

2018-05-30 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2018-05-30 12:16:34

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Wed May 30 12:16:34 2018 rev:14 rq:609756 version:1.20.8

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2017-09-15 
21:10:46.740138557 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2018-05-30 
13:09:04.001296152 +0200
@@ -1,0 +2,6 @@
+Wed May 16 13:06:51 UTC 2018 - psim...@suse.com
+
+- Use SPDX 3.x license ids.
+- Prefer the new %license attribute over %doc.
+
+---



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.Y0WzVj/_old  2018-05-30 13:09:04.521276494 +0200
+++ /var/tmp/diff_new_pack.Y0WzVj/_new  2018-05-30 13:09:04.525276342 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cpphs
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -21,7 +21,7 @@
 Version:1.20.8
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
-License:GPL-2.0 AND LGPL-2.1
+License:GPL-2.0-only AND LGPL-2.1-only
 Group:  Development/Libraries/Haskell
 URL:https://hackage.haskell.org/package/%{name}
 Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -44,7 +44,7 @@
 
 %package -n ghc-%{name}
 Summary:Haskell %{name} library
-License:LGPL-2.1
+License:LGPL-2.1-only
 Group:  System/Libraries
 
 %description -n ghc-%{name}
@@ -52,7 +52,7 @@
 
 %package -n ghc-%{name}-devel
 Summary:Haskell %{name} library development files
-License:LGPL-2.1
+License:LGPL-2.1-only
 Group:  Development/Libraries/Haskell
 Requires:   ghc-%{name} = %{version}-%{release}
 Requires:   ghc-compiler = %{ghc_version}
@@ -80,13 +80,13 @@
 %ghc_pkg_recache
 
 %files
-%doc LICENCE-LGPL
+%license LICENCE-LGPL
 %doc LICENCE-GPL LICENCE-commercial README docs
 %{_bindir}/%{name}
-%{_mandir}/man1/cpphs.1%{ext_man}
+%{_mandir}/man1/cpphs.1%{?ext_man}
 
 %files -n ghc-%{name} -f ghc-%{name}.files
-%doc LICENCE-LGPL
+%license LICENCE-LGPL
 
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
 %doc LICENCE-GPL LICENCE-commercial README docs

commit cpphs for openSUSE:Factory

2017-09-15 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2017-09-15 21:10:45

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Fri Sep 15 21:10:45 2017 rev:13 rq:523910 version:1.20.8

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2017-07-06 
00:02:09.984721976 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2017-09-15 
21:10:46.740138557 +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:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.fLqJwU/_old  2017-09-15 21:10:48.163938644 +0200
+++ /var/tmp/diff_new_pack.fLqJwU/_new  2017-09-15 21:10:48.167938082 +0200
@@ -22,8 +22,8 @@
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
 License:GPL-2.0 AND 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
 BuildRequires:  ghc-directory-devel
@@ -31,7 +31,6 @@
 BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-polyparse-devel
 BuildRequires:  ghc-rpm-macros
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 Cpphs is a re-implementation of the C pre-processor that is both more
@@ -54,7 +53,7 @@
 %package -n ghc-%{name}-devel
 Summary:Haskell %{name} library development files
 License:LGPL-2.1
-Group:  Development/Libraries/Other
+Group:  Development/Libraries/Haskell
 Requires:   ghc-%{name} = %{version}-%{release}
 Requires:   ghc-compiler = %{ghc_version}
 Requires(post): ghc-compiler = %{ghc_version}
@@ -81,18 +80,15 @@
 %ghc_pkg_recache
 
 %files
-%defattr(-,root,root,-)
 %doc LICENCE-LGPL
 %doc LICENCE-GPL LICENCE-commercial README docs
 %{_bindir}/%{name}
 %{_mandir}/man1/cpphs.1%{ext_man}
 
 %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,-)
 %doc LICENCE-GPL LICENCE-commercial README docs
 
 %changelog

commit cpphs for openSUSE:Factory

2017-07-05 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2017-07-06 00:02:08

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Thu Jul  6 00:02:08 2017 rev:12 rq:508013 version:1.20.8

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2017-05-06 
18:28:05.244469016 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2017-07-06 
00:02:09.984721976 +0200
@@ -1,0 +2,5 @@
+Sun Jun 25 18:41:41 UTC 2017 - psim...@suse.com
+
+- Update to version 1.20.8.
+
+---

Old:

  cpphs-1.20.5.tar.gz

New:

  cpphs-1.20.8.tar.gz



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.Qnx3Jo/_old  2017-07-06 00:02:11.604493791 +0200
+++ /var/tmp/diff_new_pack.Qnx3Jo/_new  2017-07-06 00:02:11.604493791 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name cpphs
 Name:   %{pkg_name}
-Version:1.20.5
+Version:1.20.8
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
 License:GPL-2.0 AND LGPL-2.1

++ cpphs-1.20.5.tar.gz -> cpphs-1.20.8.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.5/CHANGELOG new/cpphs-1.20.8/CHANGELOG
--- old/cpphs-1.20.5/CHANGELOG  2017-04-11 15:22:48.0 +0200
+++ new/cpphs-1.20.8/CHANGELOG  2017-06-22 06:50:18.0 +0200
@@ -6,6 +6,9 @@
   * (1.20.3): detect an absolute windows path with a drive letter in a #include
   * (1.20.4): more windows path handling
   * (1.20.5): revert change in 1.20.4
+  * (1.20.6): minor bugfix for crash in obscure corner case
+  * (1.20.7): bugfix for windows drive letter in #include
+  * (1.20.8): another bugfix for windows drive letter in #include
 
 Version 1.19
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.5/Language/Preprocessor/Cpphs/CppIfdef.hs 
new/cpphs-1.20.8/Language/Preprocessor/Cpphs/CppIfdef.hs
--- old/cpphs-1.20.5/Language/Preprocessor/Cpphs/CppIfdef.hs2017-04-11 
15:22:48.0 +0200
+++ new/cpphs-1.20.8/Language/Preprocessor/Cpphs/CppIfdef.hs2017-06-22 
06:50:18.0 +0200
@@ -74,9 +74,9 @@
 cpp p syms path options (Keep ps) (l@('#':x):xs) =
 let ws = words x
 cmd = if null ws then "" else head ws
-line = tail ws
-sym  = head (tail ws)
-rest = tail (tail ws)
+line = if null ws then [] else tail ws
+sym  = if null line then "" else head line
+rest = if null line then [] else tail line
 def = defineMacro options (sym++" "++ maybe "1" id (un rest))
 un v = if null v then Nothing else Just (unwords v)
 keepIf b = if b then Keep (p:ps) else Drop 1 False (p:ps)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/cpphs-1.20.5/Language/Preprocessor/Cpphs/ReadFirst.hs 
new/cpphs-1.20.8/Language/Preprocessor/Cpphs/ReadFirst.hs
--- old/cpphs-1.20.5/Language/Preprocessor/Cpphs/ReadFirst.hs   2017-04-11 
15:22:48.0 +0200
+++ new/cpphs-1.20.8/Language/Preprocessor/Cpphs/ReadFirst.hs   2017-06-22 
06:50:18.0 +0200
@@ -38,23 +38,29 @@
 
 readFirst name demand path warn =
 case name of
-   nm@(c:':':_) -> try nm [""]  -- Windows absolute path
-   '/':nm -> try nm   [""]
-   _  -> try name (cons dd (".":path))
+   -- Windows drive in absolute path
+   c:':':'\\':nm-> try nm   (Just (c:':':[])) [""]
+   c:':':'/':nm -> try nm   (Just (c:':':[])) [""]
+   -- Windows drive in relative path
+   c:':':nm -> try nm   (Just (c:':':[])) (cons dd (".":path))
+   -- unix-like absolute path
+   '/':nm   -> try nm   Nothing   [""]
+   -- any relative path
+   _-> try name Nothing   (cons dd (".":path))
   where
 dd = directory demand
 cons x xs = if null x then xs else x:xs
-try name [] = do
+try name _ [] = do
 when warn $
   hPutStrLn stderr ("Warning: Can't find file \""++name
++"\" in directories\n\t"
++concat (intersperse "\n\t" (cons dd (".":path)))
++"\n  Asked for by: "++show demand)
 return ("missing file: "++name,"")
-try name (p:ps) = do
-let file = cleanPath p++'/':cleanPath name
+try name drive (p:ps) = do
+let file = (maybe id (++) drive) $ cleanPath p++'/':cleanPath name
 ok <- doesFileExist file
-if not ok then

commit cpphs for openSUSE:Factory

2017-05-06 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2017-05-06 18:27:52

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Sat May  6 18:27:52 2017 rev:11 rq:491450 version:1.20.5

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2017-04-14 
13:37:10.723990178 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2017-05-06 
18:28:05.244469016 +0200
@@ -1,0 +2,5 @@
+Wed Apr 19 13:20:26 UTC 2017 - psim...@suse.com
+
+- Update to version 1.20.5 with cabal2obs.
+
+---

Old:

  cpphs-1.20.4.tar.gz
  cpphs.cabal

New:

  cpphs-1.20.5.tar.gz



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.0V6kho/_old  2017-05-06 18:28:07.880097116 +0200
+++ /var/tmp/diff_new_pack.0V6kho/_new  2017-05-06 18:28:07.880097116 +0200
@@ -18,17 +18,15 @@
 
 %global pkg_name cpphs
 Name:   %{pkg_name}
-Version:1.20.4
+Version:1.20.5
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
 License:GPL-2.0 AND LGPL-2.1
 Group:  Development/Languages/Other
 Url:https://hackage.haskell.org/package/%{name}
 Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-directory-devel
-BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-polyparse-devel
@@ -67,7 +65,6 @@
 
 %prep
 %setup -q
-cp -p %{SOURCE1} %{name}.cabal
 
 %build
 %ghc_lib_build

++ cpphs-1.20.4.tar.gz -> cpphs-1.20.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.4/CHANGELOG new/cpphs-1.20.5/CHANGELOG
--- old/cpphs-1.20.4/CHANGELOG  2017-02-27 16:00:59.0 +0100
+++ new/cpphs-1.20.5/CHANGELOG  2017-04-11 15:22:48.0 +0200
@@ -3,6 +3,9 @@
   * bugfixes for #if defined(FOO) && FOO(a,b)
   * (1.20.1): fix version number
   * (1.20.2): ensure all input/output is UTF8, regardless of locale
+  * (1.20.3): detect an absolute windows path with a drive letter in a #include
+  * (1.20.4): more windows path handling
+  * (1.20.5): revert change in 1.20.4
 
 Version 1.19
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.4/Language/Preprocessor/Cpphs/Position.hs 
new/cpphs-1.20.5/Language/Preprocessor/Cpphs/Position.hs
--- old/cpphs-1.20.4/Language/Preprocessor/Cpphs/Position.hs2017-02-27 
16:00:58.0 +0100
+++ new/cpphs-1.20.5/Language/Preprocessor/Cpphs/Position.hs2017-04-11 
15:22:48.0 +0200
@@ -17,6 +17,7 @@
   , addcol, newline, tab, newlines, newpos
   , cppline, haskline, cpp2hask
   , filename, lineno, directory
+  , cleanPath
   ) where
 
 import Data.List (isPrefixOf)
@@ -38,7 +39,7 @@
 
 -- | Constructor.  Argument is filename.
 newfile :: String -> Posn
-newfile name = Pn name 1 1 Nothing
+newfile name = Pn (cleanPath name) 1 1 Nothing
 
 -- | Increment column number by given quantity.
 addcol :: Int -> Posn -> Posn
@@ -96,3 +97,10 @@
 dirname  = reverse . safetail . dropWhile (not.(`elem`"\\/")) . reverse
   where safetail [] = []
 safetail (_:x) = x
+
+-- | Sigh.  Mixing Windows filepaths with unix is bad.  Make sure there is a
+--   canonical path separator.
+cleanPath :: FilePath -> FilePath
+cleanPath [] = []
+cleanPath ('\\':cs) = '/': cleanPath cs
+cleanPath (c:cs)= c:   cleanPath cs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/cpphs-1.20.4/Language/Preprocessor/Cpphs/ReadFirst.hs 
new/cpphs-1.20.5/Language/Preprocessor/Cpphs/ReadFirst.hs
--- old/cpphs-1.20.4/Language/Preprocessor/Cpphs/ReadFirst.hs   2017-02-27 
16:00:58.0 +0100
+++ new/cpphs-1.20.5/Language/Preprocessor/Cpphs/ReadFirst.hs   2017-04-11 
15:22:48.0 +0200
@@ -18,12 +18,11 @@
   ) where
 
 import System.IO
-import System.Directory (doesFileExist,findFile)
-import System.FilePath  (isRelative)
+import System.Directory (doesFileExist)
 import Data.List(intersperse)
 import Control.Exception as E
 import Control.Monad(when)
-import Language.Preprocessor.Cpphs.Position  (Posn,directory)
+import Language.Preprocessor.Cpphs.Position  (Posn,directory,cleanPath)
 
 -- | Attempt to read the given file from any location within the search path.
 --   The first location found is returned, together with the

commit cpphs for openSUSE:Factory

2017-03-14 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2017-03-14 10:04:01

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Tue Mar 14 10:04:01 2017 rev:9 rq:461520 version:1.20.3

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2017-02-03 
17:34:56.768097287 +0100
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2017-03-14 
10:04:02.301690734 +0100
@@ -1,0 +2,5 @@
+Sun Feb 12 14:17:41 UTC 2017 - psim...@suse.com
+
+- Update to version 1.20.3 with cabal2obs.
+
+---

Old:

  cpphs-1.20.2.tar.gz

New:

  cpphs-1.20.3.tar.gz



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.tznBrs/_old  2017-03-14 10:04:02.805619378 +0100
+++ /var/tmp/diff_new_pack.tznBrs/_new  2017-03-14 10:04:02.805619378 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cpphs
 #
-# 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
@@ -18,10 +18,10 @@
 
 %global pkg_name cpphs
 Name:   %{pkg_name}
-Version:1.20.2
+Version:1.20.3
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
-License:GPL-2.0 and LGPL-2.1
+License:GPL-2.0 AND LGPL-2.1
 Group:  Development/Languages/Other
 Url:https://hackage.haskell.org/package/%{name}
 Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz

++ cpphs-1.20.2.tar.gz -> cpphs-1.20.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/cpphs-1.20.2/Language/Preprocessor/Cpphs/ReadFirst.hs 
new/cpphs-1.20.3/Language/Preprocessor/Cpphs/ReadFirst.hs
--- old/cpphs-1.20.2/Language/Preprocessor/Cpphs/ReadFirst.hs   2016-09-05 
18:34:13.0 +0200
+++ new/cpphs-1.20.3/Language/Preprocessor/Cpphs/ReadFirst.hs   2017-02-06 
19:56:42.0 +0100
@@ -38,6 +38,7 @@
 
 readFirst name demand path warn =
 case name of
+   nm@(c:':':_) -> try nm [""]  -- Windows absolute path
'/':nm -> try nm   [""]
_  -> try name (cons dd (".":path))
   where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.2/cpphs.cabal new/cpphs-1.20.3/cpphs.cabal
--- old/cpphs-1.20.2/cpphs.cabal2016-09-05 18:34:13.0 +0200
+++ new/cpphs-1.20.3/cpphs.cabal2017-02-06 19:56:43.0 +0100
@@ -1,6 +1,6 @@
 Name: cpphs
-Version: 1.20.2
-Copyright: 2004-2016, Malcolm Wallace
+Version: 1.20.3
+Copyright: 2004-2017, Malcolm Wallace
 License: LGPL
 License-File: LICENCE-LGPL
 Cabal-Version: >= 1.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.2/cpphs.hs new/cpphs-1.20.3/cpphs.hs
--- old/cpphs-1.20.2/cpphs.hs   2016-09-05 18:34:13.0 +0200
+++ new/cpphs-1.20.3/cpphs.hs   2017-02-06 19:56:42.0 +0100
@@ -21,7 +21,7 @@
 import Data.List   ( isPrefixOf )
 
 version :: String
-version = "1.20.2"
+version = "1.20.3"
 
 main :: IO ()
 main = do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.2/docs/index.html 
new/cpphs-1.20.3/docs/index.html
--- old/cpphs-1.20.2/docs/index.html2016-09-05 18:34:13.0 +0200
+++ new/cpphs-1.20.3/docs/index.html2017-02-06 19:56:43.0 +0100
@@ -198,11 +198,11 @@
 Current stable version:
 
 
-cpphs-1.20.2, release date 2016-09-05
+cpphs-1.20.3, release date 2017-02-06
 By HTTP:
 http://hackage.haskell.org/package/cpphs;>Hackage.
 
- (1.20.2) ensure all input/output is UTF8, regardless of locale
+ (1.20.3) detect an absolute windows path with a drive letter in a #include
 
 
 
@@ -226,13 +226,20 @@
 Older versions:
 
 
+cpphs-1.20.2, release date 2016-09-05
+By HTTP:
+http://hackage.haskell.org/package/cpphs;>Hackage.
+
+ (1.20.2) ensure all input/output is UTF8, regardless of locale
+
+
+
 cpphs-1.20, release date 2016-03-04
 By HTTP:
 http://hackage.haskell.org/package/cpphs;>Hackage.
 
  bugfix for #if defined(FOO)  FOO(a,b)
  (1.20.1) fix version number
- (1.20.2) ensure all input/output is UTF8, regardless of locale

commit cpphs for openSUSE:Factory

2017-02-03 Thread root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2017-01-28 11:07:49

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2016-07-21 
07:59:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2017-02-03 
17:34:56.768097287 +0100
@@ -1,0 +2,11 @@
+Thu Sep 15 06:58:44 UTC 2016 - psim...@suse.com
+
+- Update to version 1.20.2 revision 0 with cabal2obs.
+
+---
+Sat Jul 23 11:53:53 UTC 2016 - jeng...@inai.de
+
+- SRPM license field should contain all licenses. In addition,
+  I see no obvious "or later" clauses.
+
+---

Old:

  cpphs-1.20.1.tar.gz

New:

  cpphs-1.20.2.tar.gz



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.XY9Omw/_old  2017-02-03 17:34:57.300022000 +0100
+++ /var/tmp/diff_new_pack.XY9Omw/_new  2017-02-03 17:34:57.304021434 +0100
@@ -18,22 +18,20 @@
 
 %global pkg_name cpphs
 Name:   %{pkg_name}
-Version:1.20.1
+Version:1.20.2
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
-License:GPL-2.0+
+License:GPL-2.0 and LGPL-2.1
 Group:  Development/Languages/Other
 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-directory-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-polyparse-devel
 BuildRequires:  ghc-rpm-macros
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-# End cabal-rpm deps
 
 %description
 Cpphs is a re-implementation of the C pre-processor that is both more
@@ -68,7 +66,6 @@
 %prep
 %setup -q
 
-
 %build
 %ghc_lib_build
 

++ cpphs-1.20.1.tar.gz -> cpphs-1.20.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.1/CHANGELOG new/cpphs-1.20.2/CHANGELOG
--- old/cpphs-1.20.1/CHANGELOG  2016-03-04 10:33:47.0 +0100
+++ new/cpphs-1.20.2/CHANGELOG  2016-09-05 18:34:13.0 +0200
@@ -2,6 +2,7 @@
 
   * bugfixes for #if defined(FOO) && FOO(a,b)
   * (1.20.1): fix version number
+  * (1.20.2): ensure all input/output is UTF8, regardless of locale
 
 Version 1.19
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/cpphs-1.20.1/Language/Preprocessor/Cpphs/ReadFirst.hs 
new/cpphs-1.20.2/Language/Preprocessor/Cpphs/ReadFirst.hs
--- old/cpphs-1.20.1/Language/Preprocessor/Cpphs/ReadFirst.hs   2016-03-04 
10:33:47.0 +0100
+++ new/cpphs-1.20.2/Language/Preprocessor/Cpphs/ReadFirst.hs   2016-09-05 
18:34:13.0 +0200
@@ -13,12 +13,15 @@
 
 module Language.Preprocessor.Cpphs.ReadFirst
   ( readFirst
+  , readFileUTF8
+  , writeFileUTF8
   ) where
 
-import System.IO(hPutStrLn, stderr)
+import System.IO
 import System.Directory (doesFileExist)
-import Data.List  (intersperse)
-import Control.Monad (when)
+import Data.List(intersperse)
+import Control.Exception as E
+import Control.Monad(when)
 import Language.Preprocessor.Cpphs.Position  (Posn,directory,cleanPath)
 
 -- | Attempt to read the given file from any location within the search path.
@@ -51,5 +54,20 @@
 let file = cleanPath p++'/':cleanPath name
 ok <- doesFileExist file
 if not ok then try name ps
-  else do content <- readFile file
+  else do content <- readFileUTF8 file
   return (file,content)
+
+readFileUTF8 :: FilePath -> IO String
+readFileUTF8 file = do
+h <- openFile file ReadMode
+(do utf8r <- mkTextEncoding "UTF-8//ROUNDTRIP"
+hSetEncoding h utf8r
+hGetContents h) `E.onException` (hClose h)
+
+writeFileUTF8 :: FilePath -> String -> IO ()
+writeFileUTF8 f txt = withFile f WriteMode $ \hdl->
+  do utf8r <- mkTextEncoding "UTF-8//ROUNDTRIP"
+ hSetEncoding hdl utf8r
+ hPutStr hdl txt
+  `E.onException` (hClose hdl)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.20.1/cpphs.cabal new/cpphs-1.20.2/cpphs.cabal
--- old/cpphs-1.20.1/cpphs.cabal2016-03-04 10:33:47.0 +0100
+++ new/cpphs-1.20.2/cpphs.cabal2016-09-05 18:34:13.0 +0200
@@ -1,5 +1,5

commit cpphs for openSUSE:Factory

2016-07-21 Thread h_root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2016-07-21 07:59:57

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2016-05-31 
12:24:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2016-07-21 
07:59:59.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:21:05 UTC 2016 - psim...@suse.com
+
+- Update to version 1.20.1 revision 0 with cabal2obs.
+
+---



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.Jp7dI6/_old  2016-07-21 08:00:00.0 +0200
+++ /var/tmp/diff_new_pack.Jp7dI6/_new  2016-07-21 08:00:00.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package cpphs
 #
-# 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,7 +17,7 @@
 
 
 %global pkg_name cpphs
-Name:   cpphs
+Name:   %{pkg_name}
 Version:1.20.1
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
@@ -68,26 +68,27 @@
 %prep
 %setup -q
 
+
 %build
-%{ghc_lib_build}
+%ghc_lib_build
 
 %install
-%{ghc_lib_install}
+%ghc_lib_install
 install -D --mode=444 docs/cpphs.1 %{buildroot}%{_mandir}/man1/cpphs.1
 chmod a-x LICENCE-* README docs/*
 
 %post -n ghc-%{name}-devel
-%{ghc_pkg_recache}
+%ghc_pkg_recache
 
 %postun -n ghc-%{name}-devel
-%{ghc_pkg_recache}
+%ghc_pkg_recache
 
 %files
 %defattr(-,root,root,-)
 %doc LICENCE-LGPL
 %doc LICENCE-GPL LICENCE-commercial README docs
 %{_bindir}/%{name}
-%{_mandir}/man1/cpphs.1.gz
+%{_mandir}/man1/cpphs.1%{ext_man}
 
 %files -n ghc-%{name} -f ghc-%{name}.files
 %defattr(-,root,root,-)

commit cpphs for openSUSE:Factory

2016-05-31 Thread h_root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2016-05-31 12:24:12

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2015-09-02 
00:36:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2016-05-31 
12:24:16.0 +0200
@@ -1,0 +2,11 @@
+Mon Mar  7 09:34:44 UTC 2016 - mimi...@gmail.com
+
+- update to 1.20.1 
+
+---
+Fri Mar  4 18:44:46 UTC 2016 - mimi...@gmail.com
+
+- update to 1.20
+* bugfixes for #if defined(FOO) && FOO(a,b)
+
+---

Old:

  cpphs-1.19.3.tar.gz

New:

  cpphs-1.20.1.tar.gz



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.oEoEu8/_old  2016-05-31 12:24:17.0 +0200
+++ /var/tmp/diff_new_pack.oEoEu8/_new  2016-05-31 12:24:17.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name cpphs
 Name:   cpphs
-Version:1.19.3
+Version:1.20.1
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
 License:GPL-2.0+

++ cpphs-1.19.3.tar.gz -> cpphs-1.20.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.3/CHANGELOG new/cpphs-1.20.1/CHANGELOG
--- old/cpphs-1.19.3/CHANGELOG  2015-08-23 11:09:27.0 +0200
+++ new/cpphs-1.20.1/CHANGELOG  2016-03-04 10:33:47.0 +0100
@@ -1,3 +1,8 @@
+Version 1.20
+
+  * bugfixes for #if defined(FOO) && FOO(a,b)
+  * (1.20.1): fix version number
+
 Version 1.19
 
   * expose more of the cpphs API
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs 
new/cpphs-1.20.1/Language/Preprocessor/Cpphs/CppIfdef.hs
--- old/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs2015-08-23 
11:09:26.0 +0200
+++ new/cpphs-1.20.1/Language/Preprocessor/Cpphs/CppIfdef.hs2016-03-04 
10:33:47.0 +0100
@@ -216,16 +216,22 @@
 -- | Expansion of symbols.
 expandSymOrCall :: SymTab HashDefine -> TextParser String
 expandSymOrCall st =
-  do  sym <- parseSym
+  do sym <- parseSym
+ if sym=="defined" then do arg <- skip parseSym; convert sym [arg]
+<|>
+do arg <- skip $ parenthesis (do x <- skip 
parseSym;
+ skip (return x))
+   convert sym [arg]
+<|> convert sym []
+  else
   ( do  args <- parenthesis (commit $ fragment `sepBy` skip (isWord ","))
 args' <- flip mapM args $ \arg->
  case runParser (preExpand st) arg of
  (Left msg, _) -> fail msg
  (Right s, _)  -> return s
 convert sym args'
-<|>
-if (sym=="defined") then do arg <- skip parseSym; convert sym [arg]
-else convert sym [] )
+<|> convert sym []
+  )
   where
 fragment = many1 (satisfy (`notElem`",)"))
 convert "defined" [arg] =
@@ -238,14 +244,16 @@
 convert sym args =
   case lookupST sym st of
 Nothing  -> if null args then return sym
-else fail (disp sym args++" is not a defined macro")
+else return "0"
+ -- else fail (disp sym args++" is not a defined macro")
 Just (a@SymbolReplacement{}) -> do reparse (replacement a)
return ""
 Just (a@MacroExpansion{})-> do reparse (expandMacro a args False)
return ""
 Just (a@AntiDefined{})   ->
 if null args then return sym
-else fail (disp sym args++" explicitly undefined with -U")
+else return "0"
+ -- else fail (disp sym args++" explicitly undefined with -U")
 disp sym args = let len = length args
 chars = map (:[]) ['a'..'z']
 in sym ++ if null args then ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.3/README new/cpphs-1.20.1/README
--- old/cpphs-1.19.3/README 2015-08-23 11:09:27.0 +0200
+++ new/cpphs-1.20.1/README 2016-03-04 10:33:47.0 +0100
@@ -30,7 +30,7 @@
 
 COPYRIGHT
 -
-Copyright (c) 2004-2015 Malcolm Wallace

commit cpphs for openSUSE:Factory

2015-09-01 Thread h_root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2015-09-02 00:36:05

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is "cpphs"

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2015-08-05 
06:51:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2015-09-02 
00:36:06.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 31 07:58:58 UTC 2015 - mimi...@gmail.com
+
+- update to 1.19.3
+* bugfix for hlint ticket #161 - interaction of --unlit/--linepragma
+
+---

Old:

  cpphs-1.19.2.tar.gz

New:

  cpphs-1.19.3.tar.gz



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.SfSKOF/_old  2015-09-02 00:36:06.0 +0200
+++ /var/tmp/diff_new_pack.SfSKOF/_new  2015-09-02 00:36:06.0 +0200
@@ -18,7 +18,7 @@
 
 %global pkg_name cpphs
 Name:   cpphs
-Version:1.19.2
+Version:1.19.3
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
 License:GPL-2.0+

++ cpphs-1.19.2.tar.gz -> cpphs-1.19.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.2/CHANGELOG new/cpphs-1.19.3/CHANGELOG
--- old/cpphs-1.19.2/CHANGELOG  2015-07-31 09:32:09.0 +0200
+++ new/cpphs-1.19.3/CHANGELOG  2015-08-23 11:09:27.0 +0200
@@ -4,6 +4,7 @@
   * allow the static linking exception to the LGPL
   * (1.19.1): don't warn about trailing comments in #ifdefs
   * (1.19.2): fix build error
+  * (1.19.3): bugfix for hlint ticket #161 - interaction of 
--unlit/--linepragma
 
 Version 1.18
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs 
new/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs
--- old/cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs2015-07-31 
09:32:09.0 +0200
+++ new/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs2015-08-23 
11:09:26.0 +0200
@@ -44,10 +44,11 @@
 -> String   -- ^ The input file content
 -> IO [(Posn,String)]   -- ^ The file after processing (in lines)
 cppIfdef fp syms search options =
-cpp posn defs search options (Keep []) . (cppline posn:) . linesCpp
+cpp posn defs search options (Keep []) . initial . linesCpp
   where
 posn = newfile fp
 defs = preDefine options syms
+initial = if literate options then id else (cppline posn:)
 -- Previous versions had a very simple symbol table  mapping strings
 -- to strings.  Now the #ifdef pass uses a more elaborate table, in
 -- particular to deal with parameterised macros in conditionals.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.2/Language/Preprocessor/Unlit.hs 
new/cpphs-1.19.3/Language/Preprocessor/Unlit.hs
--- old/cpphs-1.19.2/Language/Preprocessor/Unlit.hs 2015-07-31 
09:32:09.0 +0200
+++ new/cpphs-1.19.3/Language/Preprocessor/Unlit.hs 2015-08-23 
11:09:26.0 +0200
@@ -21,6 +21,7 @@
-> Include (read line) (unwords rest)
 _  -> Pre x
  ) : classify xs
+--classify (x:xs) | "{-# LINE" `isPrefixOf` x = Program x: classify xs
 classify (x:xs) | all isSpace x = Blank:classify xs
 classify (x:xs) = Comment:classify xs
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.2/cpphs.cabal new/cpphs-1.19.3/cpphs.cabal
--- old/cpphs-1.19.2/cpphs.cabal2015-07-31 09:32:09.0 +0200
+++ new/cpphs-1.19.3/cpphs.cabal2015-08-23 11:09:27.0 +0200
@@ -1,5 +1,5 @@
 Name: cpphs
-Version: 1.19.2
+Version: 1.19.3
 Copyright: 2004-2015, Malcolm Wallace
 License: LGPL
 License-File: LICENCE-LGPL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.2/cpphs.hs new/cpphs-1.19.3/cpphs.hs
--- old/cpphs-1.19.2/cpphs.hs   2015-07-31 09:32:09.0 +0200
+++ new/cpphs-1.19.3/cpphs.hs   2015-08-23 11:09:26.0 +0200
@@ -20,7 +20,7 @@
 import Data.List   ( isPrefixOf )
 
 version :: String
-version = "1.19.2"
+version = "1.19.3"
 
 main :: IO ()
 main = do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19.2/docs/index.html 
new/cpphs-1.19.3/docs/index.html
--- old/cpphs-1.19.2/docs/index.html2015-07-31 09:32:09.0 +0200
+++ new/cpphs-1.19.3/docs/index.html2015-08-23

commit cpphs for openSUSE:Factory

2015-08-04 Thread h_root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2015-08-05 06:51:56

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is cpphs

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2015-05-28 
09:58:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2015-08-05 
06:51:59.0 +0200
@@ -1,0 +2,7 @@
+Tue Aug  4 05:43:49 UTC 2015 - mimi...@gmail.com
+
+- update to 1.19.2
+* don't warn about trailing comments in #ifdefs
+* fix build error
+
+---

Old:

  cpphs-1.19.tar.gz

New:

  cpphs-1.19.2.tar.gz



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.repOM1/_old  2015-08-05 06:51:59.0 +0200
+++ /var/tmp/diff_new_pack.repOM1/_new  2015-08-05 06:51:59.0 +0200
@@ -17,25 +17,22 @@
 
 
 %global pkg_name cpphs
-
 Name:   cpphs 
-Version:1.19
+Version:1.19.2
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
 License:GPL-2.0+
 Group:  Development/Languages/Other
-
 Url:https://hackage.haskell.org/package/%{name}
 Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-polyparse-devel
+BuildRequires:  ghc-rpm-macros
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # End cabal-rpm deps
 
 %description
@@ -48,7 +45,6 @@
 a plain-text mode; an option to unlit literate code files; and an option to
 turn off macro-expansion.
 
-
 %package -n ghc-%{name}
 Summary:Haskell %{name} library
 License:LGPL-2.1
@@ -57,35 +53,34 @@
 %description -n ghc-%{name}
 This package provides the Haskell %{name} shared library.
 
-
 %package -n ghc-%{name}-devel
 Summary:Haskell %{name} library development files
 License:LGPL-2.1
 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}
-Requires:   ghc-%{name} = %{version}-%{release}
 
 %description -n ghc-%{name}-devel
 This package provides the Haskell %{name} library development files.
 
-
 %prep
 %setup -q
 
 %build
-%ghc_lib_build
+%{ghc_lib_build}
 
 %install
-%ghc_lib_install
+%{ghc_lib_install}
 install -D --mode=444 docs/cpphs.1 %{buildroot}%{_mandir}/man1/cpphs.1
+chmod a-x LICENCE-* README docs/*
 
 %post -n ghc-%{name}-devel
-%ghc_pkg_recache
+%{ghc_pkg_recache}
 
 %postun -n ghc-%{name}-devel
-%ghc_pkg_recache
+%{ghc_pkg_recache}
 
 %files
 %defattr(-,root,root,-)

++ cpphs-1.19.tar.gz - cpphs-1.19.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19/CHANGELOG new/cpphs-1.19.2/CHANGELOG
--- old/cpphs-1.19/CHANGELOG2015-03-30 16:07:39.0 +0200
+++ new/cpphs-1.19.2/CHANGELOG  2015-07-31 09:32:09.0 +0200
@@ -2,6 +2,8 @@
 
   * expose more of the cpphs API
   * allow the static linking exception to the LGPL
+  * (1.19.1): don't warn about trailing comments in #ifdefs
+  * (1.19.2): fix build error
 
 Version 1.18
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cpphs-1.19/Language/Preprocessor/Cpphs/CppIfdef.hs 
new/cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs
--- old/cpphs-1.19/Language/Preprocessor/Cpphs/CppIfdef.hs  2015-03-30 
16:07:39.0 +0200
+++ new/cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs2015-07-31 
09:32:09.0 +0200
@@ -29,7 +29,7 @@
  ,expandMacro)
 import Language.Preprocessor.Cpphs.MacroPass (preDefine,defineMacro)
 import Data.Char(isDigit,isSpace,isAlphaNum)
-import Data.List(intercalate)
+import Data.List(intercalate,isPrefixOf)
 import Numeric  (readHex,readOct,readDec)
 import System.IO.Unsafe (unsafeInterleaveIO)
 import System.IO(hPutStrLn,stderr)
@@ -190,12 +190,15 @@
 case runParser parseBoolExp s of
   (Left msg, _) - error (Cannot parse #if directive in file ++show p
  ++:\n++msg)
-  (Right b, xs) - do when (any (not . isSpace) xs) $
+  (Right b, xs) - do when (any (not .

commit cpphs for openSUSE:Factory

2015-05-28 Thread h_root 
Hello community,

here is the log from the commit of package cpphs for openSUSE:Factory checked 
in at 2015-05-28 09:58:29

Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
 and  /work/SRC/openSUSE:Factory/.cpphs.new (New)


Package is cpphs

Changes:

--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes  2015-05-21 
08:14:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2015-05-28 
09:58:30.0 +0200
@@ -1,0 +2,10 @@
+Thu May 28 06:21:30 UTC 2015 - mimi...@gmail.com
+
+- correct license 
+
+---
+Thu May 14 11:59:15 UTC 2015 - mimi...@gmail.com
+
+- regenerated spec with cabal-rpm 
+
+---



Other differences:
--
++ cpphs.spec ++
--- /var/tmp/diff_new_pack.OUaKV2/_old  2015-05-28 09:58:31.0 +0200
+++ /var/tmp/diff_new_pack.OUaKV2/_new  2015-05-28 09:58:31.0 +0200
@@ -17,93 +17,80 @@
 
 
 %global pkg_name cpphs
-# no useful debuginfo for Haskell packages without C sources
-%global debug_package %{nil}
+
 Name:   cpphs
 Version:1.19
 Release:0
 Summary:A liberalised re-implementation of cpp, the C pre-processor
-License:GPL-2.0
+License:GPL-2.0+
 Group:  Development/Languages/Other
-Url:http://hackage.haskell.org/package/%{name}
-Source0:
http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+
+Url:https://hackage.haskell.org/package/%{name}
+Source0:
https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+
 BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-polyparse-devel
-BuildRequires:  ghc-rpm-macros
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # End cabal-rpm deps
 
 %description
-Cpphs is a re-implementation of the C pre-processor that is both
-more compatible with Haskell, and itself written in Haskell so
-that it can be distributed with compilers.
-
-This version of the C pre-processor is pretty-much
-feature-complete and compatible with traditional (KR)
-pre-processors.  Additional features include: a plain-text mode;
-an option to unlit literate code files; and an option to turn
-off macro-expansion.
+Cpphs is a re-implementation of the C pre-processor that is both more
+compatible with Haskell, and itself written in Haskell so that it can be
+distributed with compilers.
+
+This version of the C pre-processor is pretty-much feature-complete and
+compatible with traditional (KR) pre-processors. Additional features include:
+a plain-text mode; an option to unlit literate code files; and an option to
+turn off macro-expansion.
+
 
 %package -n ghc-%{name}
 Summary:Haskell %{name} library
-Group:  Development/Languages/Other
 License:LGPL-2.1 
+Group:  System/Libraries
 
 %description -n ghc-%{name}
-Cpphs is a re-implementation of the C pre-processor that is both
-more compatible with Haskell, and itself written in Haskell so
-that it can be distributed with compilers.
-
-This version of the C pre-processor is pretty-much
-feature-complete and compatible with traditional (KR)
-pre-processors.  Additional features include: a plain-text mode;
-an option to unlit literate code files; and an option to turn
-off macro-expansion.
+This package provides the Haskell %{name} shared library.
+
 
 %package -n ghc-%{name}-devel
 Summary:Haskell %{name} library development files
-Group:  Development/Languages/Other
 License:LGPL-2.1
-%{?ghc_devel_requires}
-
+Group:  Development/Libraries/Other
+Requires:   ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires:   ghc-%{name} = %{version}-%{release}
 
 %description -n ghc-%{name}-devel
-Cpphs is a re-implementation of the C pre-processor that is both
-more compatible with Haskell, and itself written in Haskell so
-that it can be distributed with compilers.
-
-This version of the C pre-processor is pretty-much
-feature-complete and compatible with traditional (KR)
-pre-processors.  Additional features include: a plain-text mode;
-an option to unlit literate code files; and an option to turn
-off macro-expansion.
+This package provides the Haskell %{name} library development files.
+
 
 %prep
 %setup -q
-chmod a-x README CHANGELOG LICENCE-GPL LICENCE-LGPL LICENCE-commercial
-chmod a-x docs/*
 
 %build