Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-torrent for openSUSE:Factory checked in at 2023-04-04 21:24:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-torrent (Old) and /work/SRC/openSUSE:Factory/.ghc-torrent.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-torrent" Tue Apr 4 21:24:09 2023 rev:4 rq:1076090 version:10000.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-torrent/ghc-torrent.changes 2020-12-22 11:47:58.453935863 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-torrent.new.19717/ghc-torrent.changes 2023-04-04 21:24:26.554563581 +0200 @@ -1,0 +2,21 @@ +Thu Mar 30 17:08:43 UTC 2023 - Peter Simons <[email protected]> + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + +------------------------------------------------------------------- +Wed Mar 22 00:46:05 UTC 2023 - Peter Simons <[email protected]> + +- Update torrent to version 10000.1.3. + haskell-torrent (10000.1.3) unstable; urgency=medium + + * Update to cabal-version: >= 1.10 so Hackage will accept uploads again. + + -- Joey Hess <[email protected]> Tue, 21 Mar 2023 20:44:19 -0400 + + haskell-torrent (10000.1.2) unstable; urgency=medium + + * Updated to build without deprecation warnings from bencode-0.6.1.0 + + -- Joey Hess <[email protected]> Tue, 21 Mar 2023 20:43:50 -0400 + +------------------------------------------------------------------- Old: ---- torrent-10000.1.1.tar.gz New: ---- torrent-10000.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-torrent.spec ++++++ --- /var/tmp/diff_new_pack.beqR9F/_old 2023-04-04 21:24:27.458568700 +0200 +++ /var/tmp/diff_new_pack.beqR9F/_new 2023-04-04 21:24:27.462568722 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-torrent # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,30 @@ %global pkg_name torrent +%global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 10000.1.1 +Version: 10000.1.3 Release: 0 Summary: BitTorrent file parser and generater License: BSD-3-Clause 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 +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-bencode-devel +BuildRequires: ghc-bencode-prof BuildRequires: ghc-binary-devel +BuildRequires: ghc-binary-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-filepath-devel +BuildRequires: ghc-filepath-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-syb-devel +BuildRequires: ghc-syb-prof ExcludeArch: %{ix86} %description @@ -47,6 +56,22 @@ %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} @@ -68,4 +93,9 @@ %files devel -f %{name}-devel.files %doc CHANGELOG +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog ++++++ torrent-10000.1.1.tar.gz -> torrent-10000.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/torrent-10000.1.1/CHANGELOG new/torrent-10000.1.3/CHANGELOG --- old/torrent-10000.1.1/CHANGELOG 2017-03-19 17:26:15.000000000 +0100 +++ new/torrent-10000.1.3/CHANGELOG 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,15 @@ +haskell-torrent (10000.1.3) unstable; urgency=medium + + * Update to cabal-version: >= 1.10 so Hackage will accept uploads again. + + -- Joey Hess <[email protected]> Tue, 21 Mar 2023 20:44:19 -0400 + +haskell-torrent (10000.1.2) unstable; urgency=medium + + * Updated to build without deprecation warnings from bencode-0.6.1.0 + + -- Joey Hess <[email protected]> Tue, 21 Mar 2023 20:43:50 -0400 + haskell-torrent (10000.1.1) unstable; urgency=medium * Fix build with pre-AMP base. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/torrent-10000.1.1/src/Data/Torrent.hs new/torrent-10000.1.3/src/Data/Torrent.hs --- old/torrent-10000.1.1/src/Data/Torrent.hs 2017-03-19 17:26:15.000000000 +0100 +++ new/torrent-10000.1.3/src/Data/Torrent.hs 2001-09-09 03:46:40.000000000 +0200 @@ -15,10 +15,11 @@ ) where import Data.BEncode -import Data.BEncode.Parser +import Data.BEncode.Reader import Data.Binary import Data.Generics import Data.Maybe +import Control.Applicative import qualified Data.ByteString.Lazy as BS import Data.ByteString.Lazy (ByteString) @@ -73,30 +74,29 @@ readTorrent :: ByteString -> Either String Torrent readTorrent inp = case bRead inp of Nothing -> Left "Not BEncoded" - Just be -> runParser parseTorrent be + Just be -> runBReader parseTorrent be -parseTorrent :: BParser Torrent +parseTorrent :: BReader Torrent parseTorrent = do - announce <- optional $ bbytestring $ dict "announce" - creator <- optional $ bbytestring $ dict "created by" - info <- dict "info" - setInput info - name <- bbytestring $ dict "name" - pLen <- bint $ dict "piece length" - pieces <- bbytestring $ dict "pieces" - torrentInfo <- parseTorrentInfo name pLen pieces - return $ Torrent announce [] BS.empty creator torrentInfo + announce <- optional $ dict "announce" bbytestring + creator <- optional $ dict "created by" bbytestring + dict "info" $ do + name <- dict "name" bbytestring + pLen <- dict "piece length" bint + pieces <- dict "pieces" bbytestring + torrentInfo <- parseTorrentInfo name pLen pieces + return $ Torrent announce [] BS.empty creator torrentInfo -parseTorrentInfo :: ByteString -> Integer -> ByteString -> BParser TorrentInfo +parseTorrentInfo :: ByteString -> Integer -> ByteString -> BReader TorrentInfo parseTorrentInfo name pLen pieces = single <|> multi where single = do - len <- bint $ dict "length" + len <- dict "length" bint return $ SingleFile len name pLen pieces multi = do - files <- list "files" $ do - len <- bint $ dict "length" - filePaths <- list "path" $ bbytestring token + files <- dict "files" $ list $ do + len <- dict "length" bint + filePaths <- dict "path" (list bbytestring) return $ TorrentFile len filePaths return $ MultiFile files name pLen pieces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/torrent-10000.1.1/torrent.cabal new/torrent-10000.1.3/torrent.cabal --- old/torrent-10000.1.1/torrent.cabal 2017-03-19 17:26:15.000000000 +0100 +++ new/torrent-10000.1.3/torrent.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ Name: torrent -Version: 10000.1.1 -Cabal-Version: >= 1.6 +Version: 10000.1.3 +Cabal-Version: >= 1.10 Maintainer: Joey Hess <[email protected]> Author: Lemmih <[email protected]> Copyright: 2005-2007, Lemmih @@ -14,10 +14,11 @@ Library GHC-Options: -Wall -fno-warn-tabs Hs-Source-Dirs: src + Default-Language: Haskell2010 Exposed-Modules: Data.Torrent Data.Torrent.Scrape - Build-Depends: base >= 4.5, base < 5, binary, bencode >=0.2, + Build-Depends: base >= 4.5, base < 5, binary, bencode >= 0.6.1.0, filepath, containers, bytestring, syb source-repository head
