Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cabal2spec for openSUSE:Factory checked in at 2025-07-31 17:45:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cabal2spec (Old) and /work/SRC/openSUSE:Factory/.cabal2spec.new.1944 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cabal2spec" Thu Jul 31 17:45:30 2025 rev:17 rq:1296433 version:2.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cabal2spec/cabal2spec.changes 2024-11-02 16:12:43.097597068 +0100 +++ /work/SRC/openSUSE:Factory/.cabal2spec.new.1944/cabal2spec.changes 2025-07-31 17:46:16.200327243 +0200 @@ -1,0 +2,6 @@ +Wed Jul 23 13:04:07 UTC 2025 - Peter Simons <[email protected]> + +- Update cabal2spec to version 2.8.0. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- cabal2spec-2.7.1.tar.gz cabal2spec.cabal New: ---- cabal2spec-2.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cabal2spec.spec ++++++ --- /var/tmp/diff_new_pack.BBvdXP/_old 2025-07-31 17:46:16.800352181 +0200 +++ /var/tmp/diff_new_pack.BBvdXP/_new 2025-07-31 17:46:16.800352181 +0200 @@ -1,7 +1,7 @@ # # spec file for package cabal2spec # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: %{pkg_name} -Version: 2.7.1 +Version: 2.8.0 Release: 0 Summary: Convert Cabal files into rpm spec files License: GPL-3.0-or-later 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: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-prof @@ -90,7 +89,6 @@ %prep %autosetup -cp -p %{SOURCE1} %{name}.cabal %build %ghc_lib_build ++++++ cabal2spec-2.7.1.tar.gz -> cabal2spec-2.8.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal2spec-2.7.1/cabal2spec.cabal new/cabal2spec-2.8.0/cabal2spec.cabal --- old/cabal2spec-2.7.1/cabal2spec.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/cabal2spec-2.8.0/cabal2spec.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: cabal2spec -version: 2.7.1 +version: 2.8.0 synopsis: Convert Cabal files into rpm spec files description: Convert Cabal files into a @@ -14,7 +14,7 @@ license-file: LICENSE author: Peter Simons, Bryan O'Sullivan, Jens Petersen maintainer: [email protected] -tested-with: GHC == 9.2.8 || == 9.4.8 || == 9.6.4 || == 9.8.2 +tested-with: GHC == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.2 || == 9.12.2 category: Distribution homepage: https://github.com/peti/cabal2spec build-type: Simple @@ -30,7 +30,7 @@ library exposed-modules: Cabal2Spec hs-source-dirs: src - build-depends: base > 4.12 && < 5, Cabal >= 3.8 && < 3.11, filepath, time >= 1.5 + build-depends: base > 4.12 && < 5, Cabal >= 3.14 && < 3.15, filepath, time >= 1.5 default-language: Haskell2010 executable cabal2spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal2spec-2.7.1/src/Cabal2Spec.hs new/cabal2spec-2.8.0/src/Cabal2Spec.hs --- old/cabal2spec-2.7.1/src/Cabal2Spec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/cabal2spec-2.8.0/src/Cabal2Spec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -15,7 +15,7 @@ import Distribution.System import Distribution.Text import Distribution.Types.ComponentRequestedSpec -import Distribution.Utils.Path ( getSymbolicPath ) +import Distribution.Utils.Path ( getSymbolicPath, makeSymbolicPath ) import Distribution.Utils.ShortText ( fromShortText ) import Distribution.Verbosity import Distribution.Version @@ -29,7 +29,7 @@ cabal2spec :: Platform -> CompilerId -> FlagAssignment -> ForceBinary -> RunTests -> Maybe CopyrightYear -> FilePath -> FilePath -> IO () cabal2spec platform compilerId flags forceBinary runTests copyrightYear cabalFile specFile = do - gpd <- readGenericPackageDescription silent cabalFile + gpd <- readGenericPackageDescription silent Nothing (makeSymbolicPath cabalFile) case finalizePD flags requestedComponents (const True) platform (unknownCompilerInfo compilerId NoAbiTag) [] gpd of Left missing -> fail ("finalizePD: " ++ show missing) Right (pd,_) -> createSpecFile specFile pd forceBinary runTests flags copyrightYear @@ -231,8 +231,8 @@ let licensefiles = map getSymbolicPath (licenseFiles pkgDesc) -- remove docs from datafiles (#38) - docsUnfiltered <- fmap sort (findDocs (extraSrcFiles pkgDesc ++ extraDocFiles pkgDesc) licensefiles) - let datafiles = dataFiles pkgDesc + docsUnfiltered <- fmap sort (findDocs (map getSymbolicPath (extraSrcFiles pkgDesc) ++ map getSymbolicPath (extraDocFiles pkgDesc)) licensefiles) + let datafiles = map getSymbolicPath (dataFiles pkgDesc) dupdocs = docsUnfiltered `intersect` datafiles docs = docsUnfiltered \\ datafiles unless (null dupdocs) $ @@ -260,8 +260,8 @@ let listDataFiles = unless (null (dataFiles pkgDesc)) $ do put ("%dir %{_datadir}/" ++ pkg_name ++ "-%{version}") - mapM_ (put . (("%dir %{_datadir}/" ++ pkg_name ++ "-%{version}/")++) . avoidSquareBrackets) (sort (listDirs (dataFiles pkgDesc))) - mapM_ (put . (("%{_datadir}/" ++ pkg_name ++ "-%{version}/")++) . avoidSquareBrackets) (sort (dataFiles pkgDesc)) + mapM_ (put . (("%dir %{_datadir}/" ++ pkg_name ++ "-%{version}/")++) . avoidSquareBrackets) (sort (listDirs (map getSymbolicPath (dataFiles pkgDesc)))) + mapM_ (put . (("%{_datadir}/" ++ pkg_name ++ "-%{version}/")++) . avoidSquareBrackets) (sort (map getSymbolicPath (dataFiles pkgDesc))) listDirs :: [FilePath] -> [FilePath] listDirs = nub . concatMap (map joinPath . drop 1 . inits) . nub . map init . filter (\p -> length p > 1) . map splitDirectories
