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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2015-08-05 06:51:59.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 4 05:43:49 UTC 2015 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.repOM1/_new 2015-08-05 06:51:59.000000000 +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/CHANGELOG 2015-03-30 16:07:39.000000000 +0200 +++ new/cpphs-1.19.2/CHANGELOG 2015-07-31 09:32:09.000000000 +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.000000000 +0200 +++ new/cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs 2015-07-31 09:32:09.000000000 +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 . isSpace) xs && notComment xs) $ hPutStrLn stderr ("Warning: trailing characters after #if" ++" directive in file "++show p++": "++xs) return b +notComment = not . ("//"`isPrefixOf`) . dropWhile isSpace + + -- | The preprocessor must expand all macros (recursively) before evaluating -- the conditional. preExpand :: SymTab HashDefine -> TextParser String diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19/cpphs.cabal new/cpphs-1.19.2/cpphs.cabal --- old/cpphs-1.19/cpphs.cabal 2015-03-30 16:07:39.000000000 +0200 +++ new/cpphs-1.19.2/cpphs.cabal 2015-07-31 09:32:09.000000000 +0200 @@ -1,5 +1,5 @@ Name: cpphs -Version: 1.19 +Version: 1.19.2 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/cpphs.hs new/cpphs-1.19.2/cpphs.hs --- old/cpphs-1.19/cpphs.hs 2015-03-30 16:07:39.000000000 +0200 +++ new/cpphs-1.19.2/cpphs.hs 2015-07-31 09:32:09.000000000 +0200 @@ -20,7 +20,7 @@ import Data.List ( isPrefixOf ) version :: String -version = "1.19" +version = "1.19.2" main :: IO () main = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19/docs/index.html new/cpphs-1.19.2/docs/index.html --- old/cpphs-1.19/docs/index.html 2015-03-30 16:07:39.000000000 +0200 +++ new/cpphs-1.19.2/docs/index.html 2015-07-31 09:32:09.000000000 +0200 @@ -198,11 +198,11 @@ <b>Current stable version:</b> <p> -cpphs-1.19, release date 2015-03-30<br> +cpphs-1.19.2, release date 2015-07-31<br> By HTTP: <a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>. <ul> -<li> expose more of the API +<li> fix build error </ul> <p> @@ -226,6 +226,22 @@ <b>Older versions:</b> <p> +cpphs-1.19.1, release date 2015-07-30<br> +By HTTP: +<a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>. +<ul> +<li> don't warn about trailing comments in #ifdefs +</ul> + +<p> +cpphs-1.19, release date 2015-03-30<br> +By HTTP: +<a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>. +<ul> +<li> expose more of the API +</ul> + +<p> cpphs-1.18.9, release date 2015-02-19<br> By HTTP: <a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>.
