Hello community, here is the log from the commit of package ghc-wavefront for openSUSE:Factory checked in at 2017-05-10 20:49:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wavefront (Old) and /work/SRC/openSUSE:Factory/.ghc-wavefront.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wavefront" Wed May 10 20:49:11 2017 rev:2 rq:489372 version:0.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wavefront/ghc-wavefront.changes 2017-04-12 18:09:58.194952055 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wavefront.new/ghc-wavefront.changes 2017-05-10 20:49:11.750037470 +0200 @@ -1,0 +2,5 @@ +Mon Mar 27 12:41:09 UTC 2017 - psimons@suse.com + +- Update to version 0.7.1 with cabal2obs. + +------------------------------------------------------------------- Old: ---- wavefront-0.7.0.3.tar.gz New: ---- wavefront-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wavefront.spec ++++++ --- /var/tmp/diff_new_pack.QkIBQ8/_old 2017-05-10 20:49:12.385947738 +0200 +++ /var/tmp/diff_new_pack.QkIBQ8/_new 2017-05-10 20:49:12.389947174 +0200 @@ -18,7 +18,7 @@ %global pkg_name wavefront Name: ghc-%{pkg_name} -Version: 0.7.0.3 +Version: 0.7.1 Release: 0 Summary: Wavefront OBJ loader License: BSD-3-Clause ++++++ wavefront-0.7.0.3.tar.gz -> wavefront-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavefront-0.7.0.3/CHANGELOG.md new/wavefront-0.7.1/CHANGELOG.md --- old/wavefront-0.7.0.3/CHANGELOG.md 2017-02-12 15:59:53.000000000 +0100 +++ new/wavefront-0.7.1/CHANGELOG.md 2017-03-20 23:01:56.000000000 +0100 @@ -1,3 +1,8 @@ +### 0.7.1 + +- Allow missing group names. +- Spaced object and material names are now supported. + #### 0.7.0.2 - Added support for `vector-0.12.0.0`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavefront-0.7.0.3/src/Codec/Wavefront/Token.hs new/wavefront-0.7.1/src/Codec/Wavefront/Token.hs --- old/wavefront-0.7.0.3/src/Codec/Wavefront/Token.hs 2016-01-13 22:13:08.000000000 +0100 +++ new/wavefront-0.7.1/src/Codec/Wavefront/Token.hs 2017-03-20 22:53:36.000000000 +0100 @@ -21,7 +21,7 @@ import Data.Attoparsec.Text as AP import Data.Char ( isSpace ) import Data.Maybe ( catMaybes ) -import Data.Text ( Text, unpack ) +import Data.Text ( Text, unpack, strip ) import qualified Data.Text as T ( empty ) import Numeric.Natural ( Natural ) import Prelude hiding ( lines ) @@ -166,13 +166,13 @@ -- Groups ------------------------------------------------------------------------------------------ groups :: Parser [Text] -groups = skipSpace *> string "g " *> skipHSpace *> name `sepBy1` skipHSpace <* eol +groups = skipSpace *> string "g " *> skipHSpace *> name `sepBy` skipHSpace <* eol ---------------------------------------------------------------------------------------------------- -- Objects ----------------------------------------------------------------------------------------- object :: Parser Text -object = skipSpace *> string "o " *> skipHSpace *> name <* eol +object = skipSpace *> string "o " *> skipHSpace *> spacedName <* eol ---------------------------------------------------------------------------------------------------- -- Material libraries ------------------------------------------------------------------------------ @@ -184,7 +184,7 @@ -- Using materials --------------------------------------------------------------------------------- usemtl :: Parser Text -usemtl = skipSpace *> string "usemtl " *> skipHSpace *> name <* skipHSpace <* eol +usemtl = skipSpace *> string "usemtl " *> skipHSpace *> spacedName <* eol ---------------------------------------------------------------------------------------------------- -- Smoothing groups -------------------------------------------------------------------------------- @@ -217,6 +217,9 @@ name :: Parser Text name = takeWhile1 $ not . isSpace +spacedName :: Parser Text +spacedName = strip <$> AP.takeWhile (flip notElem ("\n\r" :: String)) + skipHSpace :: Parser () skipHSpace = () <$ AP.takeWhile isHorizontalSpace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavefront-0.7.0.3/wavefront.cabal new/wavefront-0.7.1/wavefront.cabal --- old/wavefront-0.7.0.3/wavefront.cabal 2017-02-12 15:59:27.000000000 +0100 +++ new/wavefront-0.7.1/wavefront.cabal 2017-03-20 23:02:06.000000000 +0100 @@ -1,5 +1,5 @@ name: wavefront -version: 0.7.0.3 +version: 0.7.1 synopsis: Wavefront OBJ loader description: A Wavefront OBJ loader. Currently supports polygonal information. More could be added if needed (like curves and surface) if people contribute. Feel free