Hello community, here is the log from the commit of package ghc-sphinx for openSUSE:Factory checked in at 2017-04-07 13:55:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-sphinx (Old) and /work/SRC/openSUSE:Factory/.ghc-sphinx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-sphinx" Fri Apr 7 13:55:21 2017 rev:2 rq:483134 version:0.6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-sphinx/ghc-sphinx.changes 2017-03-28 15:19:08.699715762 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-sphinx.new/ghc-sphinx.changes 2017-04-07 13:55:25.001595478 +0200 @@ -1,0 +2,5 @@ +Sun Oct 30 16:26:28 UTC 2016 - psimons@suse.com + +- Update to version 0.6.0.2 with cabal2obs. + +------------------------------------------------------------------- Old: ---- sphinx-0.6.0.1.tar.gz New: ---- sphinx-0.6.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-sphinx.spec ++++++ --- /var/tmp/diff_new_pack.ZkR2YW/_old 2017-04-07 13:55:25.985456500 +0200 +++ /var/tmp/diff_new_pack.ZkR2YW/_new 2017-04-07 13:55:25.989455935 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-sphinx # -# 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,15 +18,14 @@ %global pkg_name sphinx Name: ghc-%{pkg_name} -Version: 0.6.0.1 +Version: 0.6.0.2 Release: 0 Summary: Haskell bindings to the Sphinx full-text searching daemon License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-data-binary-ieee754-devel @@ -36,7 +35,6 @@ BuildRequires: ghc-text-icu-devel BuildRequires: ghc-xml-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description Haskell bindings to the Sphinx full-text searching daemon. Compatible with @@ -56,15 +54,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ sphinx-0.6.0.1.tar.gz -> sphinx-0.6.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinx-0.6.0.1/Text/Search/Sphinx/Put.hs new/sphinx-0.6.0.2/Text/Search/Sphinx/Put.hs --- old/sphinx-0.6.0.1/Text/Search/Sphinx/Put.hs 2014-10-02 16:14:03.000000000 +0200 +++ new/sphinx-0.6.0.2/Text/Search/Sphinx/Put.hs 2016-08-26 10:44:14.000000000 +0200 @@ -7,6 +7,7 @@ import Data.ByteString.Lazy.Char8 (pack) import qualified Data.ByteString.Lazy as BS import qualified Text.Search.Sphinx.Types as T +import Data.Binary.IEEE754 import Data.Text (Text) import qualified Data.Text.ICU.Convert as ICU @@ -15,6 +16,8 @@ num = putWord32be . fromIntegral num64 i = putWord64be $ fromIntegral i +float = putFloat32be + enum :: Enum a => a -> Put enum = num . fromEnum diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinx-0.6.0.1/Text/Search/Sphinx/Types.hs new/sphinx-0.6.0.2/Text/Search/Sphinx/Types.hs --- old/sphinx-0.6.0.1/Text/Search/Sphinx/Types.hs 2014-10-02 16:14:03.000000000 +0200 +++ new/sphinx-0.6.0.2/Text/Search/Sphinx/Types.hs 2016-08-26 10:44:14.000000000 +0200 @@ -102,7 +102,7 @@ data Filter = ExclusionFilter Filter | FilterValues String [Int64] | FilterRange String Int64 Int64 - -- TODO | FilterFloatRange attr Float Float + | FilterFloatRange String Float Float deriving (Show) -- | shortcut for creating an exclusion filter @@ -110,7 +110,7 @@ fromEnumFilter (FilterValues _ _) = 0 fromEnumFilter (FilterRange _ _ _) = 1 --- fromEnumFilter (FilterFloatRange _ _ _) = 2 +fromEnumFilter (FilterFloatRange _ _ _) = 2 -- | Attribute types data AttrT = AttrTUInt -- unsigned 32-bit integer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinx-0.6.0.1/Text/Search/Sphinx.hs new/sphinx-0.6.0.2/Text/Search/Sphinx.hs --- old/sphinx-0.6.0.1/Text/Search/Sphinx.hs 2014-10-02 16:14:03.000000000 +0200 +++ new/sphinx-0.6.0.2/Text/Search/Sphinx.hs 2016-08-26 13:40:45.000000000 +0200 @@ -31,7 +31,7 @@ import Text.Search.Sphinx.Configuration (Configuration(..), defaultConfig) import qualified Text.Search.Sphinx.ExcerptConfiguration as ExConf (ExcerptConfiguration(..)) import Text.Search.Sphinx.Get (times, getResult, readHeader, getStr, getTxt) -import Text.Search.Sphinx.Put (num, num64, enum, list, numC, strC, foldPuts, +import Text.Search.Sphinx.Put (num, num64, float, enum, list, numC, strC, foldPuts, numC64, stringIntList, str, txt, cmd, verCmd) import Data.Binary.Put (Put, runPut) @@ -126,7 +126,7 @@ T.ERROR n -> return $ T.Error n (errorMessage conv response) where getResults response conv = runGet ((length docs) `times` getTxt conv) response - errorMessage conv response = runGet (getTxt conv) (BS.drop 4 response) + errorMessage conv response = runGet (getTxt conv) response makeBuildExcerpt putExcerpt = do cmd T.ScExcerpt @@ -239,7 +239,7 @@ T.ERROR n -> return $ T.Error n (errorMessage conv response) where getResults response conv = runGet (numQueries `times` getResult conv) response - errorMessage conv response = runGet (getTxt conv) (BS.drop 4 response) + errorMessage conv response = runGet (getTxt conv) response -- | Combine results from 'runQueries' into matches. @@ -317,6 +317,7 @@ putFilter_ f@(T.FilterValues attr values) ex = putFilter__ f attr (list num64) [values] ex putFilter_ f@(T.FilterRange attr min max) ex = putFilter__ f attr num64 [min, max] ex + putFilter_ f@(T.FilterFloatRange attr min max) ex = putFilter__ f attr float [min, max] ex putFilter__ filter attr puter values exclude = do str attr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sphinx-0.6.0.1/sphinx.cabal new/sphinx-0.6.0.2/sphinx.cabal --- old/sphinx-0.6.0.1/sphinx.cabal 2014-10-02 16:14:03.000000000 +0200 +++ new/sphinx-0.6.0.2/sphinx.cabal 2016-08-26 14:47:48.000000000 +0200 @@ -1,5 +1,5 @@ Name: sphinx -Version: 0.6.0.1 +Version: 0.6.0.2 Synopsis: Haskell bindings to the Sphinx full-text searching daemon. Description: Haskell bindings to the Sphinx full-text searching daemon. Compatible with Sphinx version 2.0 Category: Text, Search, Database @@ -36,4 +36,3 @@ if flag(version-1-1-beta) cpp-options: -DONE_ONE_BETA -