rpmbuild-order 0.4.7 → 0.4.8

raw patch · 7 files changed

+23/−10 lines, 7 filesdep ~filepathsetup-changedPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: filepath

API changes (from Hackage documentation)

Files

• ChangeLog.md +4/−0
• README.md +2/−0
• Setup.hs +0/−2
• TODO +2/−0
• rpmbuild-order.cabal +2/−2
• src/Distribution/RPM/Build/Graph.hs +13/−3
• src/Main.hs +0/−3

@@ -1,3 +1,7 @@+# 0.4.8 (2022-06-14)+- Graph createGraph4: prepend spec name to any rpmspec stderr+- Graph optimization: filter out Provides ending in (x86-64)+ # 0.4.7 (2022-05-31) - Graph rpmspecDynBuildRequires: generate .buildreqs.nosrc.rpm in a tmpdir 

@@ -66,6 +66,8 @@ 4. Since version 0.4.6 there is some support now for packages using dynamic buildrequires (in Fedora: golang, python, ruby, and rust packages). +5. Since version 0.4.8 %{_isa} suffixed Provides are filtered out for x86_64.+ ## Installation  rpmbuild-order is packaged in Fedora Linux.

@@ -1,2 +0,0 @@-import Distribution.Simple-main = defaultMain

@@ -7,3 +7,5 @@ - handle duplicate packages? - (r)deps: optimize using actual deps - option to somehow display subpackage deps for cycles++- runtime order system packages (using rpmquery)

@@ -1,5 +1,5 @@ Name:             rpmbuild-order-Version:          0.4.7+Version:          0.4.8 License:          BSD3 License-File:     LICENSE Author:           Jens Petersen <petersen@redhat.com>,@@ -73,7 +73,7 @@                  case-insensitive,                  directory,                  extra >= 1.6.4,-                 filepath >= 1.4.2,+                 filepath,                  fgl >= 5.5.4,                  graphviz,                  simple-cmd >= 0.2.3

@@ -128,6 +128,8 @@ createGraph1 = createGraph2 []  -- | Alias for createGraph1+--+-- deprecated createGraph' :: Bool -- ^ verbose              -> Bool -- ^ lenient (skip rpmspec failures)              -> Bool -- ^ reverse dependency graph@@ -255,11 +257,13 @@             case mprovbrs of               Nothing -> return Nothing               Just (provs,brs) -> do+                -- FIXME do not hardcode arch+                let provs' = filter (not . ("(x86-64)" `isSuffixOf`)) provs                 when verbose $ do-                  warning $ show $ sort provs+                  warning $ show $ sort provs'                   warning $ show $ mapMaybe simplifyDep $ sort brs                 return $ Just (path,-                               nub provs, -- FIXME filter 'name(arch)'+                               nub provs',                                nub (mapMaybe simplifyDep brs) \\ ignoredBRs)       where         -- (dir,specfile)@@ -389,7 +393,7 @@     rpmspecParse :: FilePath -> IO (Maybe String)     rpmspecParse spec = do       (ok, out, err) <- cmdFull "rpmspec" (["-P", "--define", "ghc_version any"] ++ rpmopts ++ [spec]) ""-      unless (null err) $ warning err+      unless (null err) $ warning $ spec +-+ err       if ok         then return $ Just out         else if lenient then return Nothing else exitFailure@@ -497,3 +501,9 @@     let g = G.emap (const ("" :: String)) graph     runGraphvizCanvas' (setDirectedness graphToDot quickParams g) Xlib     else error' "please install graphviz first"++#if !MIN_VERSION_filepath(1,4,2)+isExtensionOf :: String -> FilePath -> Bool+isExtensionOf ext@('.':_) = isSuffixOf ext . takeExtensions+isExtensionOf ext         = isSuffixOf ('.':ext) . takeExtensions+#endif

@@ -18,9 +18,6 @@ import Data.List (intercalate) import Data.List.Extra (dropSuffix) -#if !MIN_VERSION_simple_cmd_args(0,1,4)-import Options.Applicative (str)-#endif import SimpleCmdArgs import System.Directory (doesDirectoryExist, #if MIN_VERSION_directory(1,2,5)