rpmbuild-order 0.4.2 → 0.4.2.1

raw patch · 7 files changed

+25/−12 lines, 7 filesdep +simple-cmddep −CabalPVP ok

version bump matches the API change (PVP)

Dependencies added: simple-cmd

Dependencies removed: Cabal

API changes (from Hackage documentation)

Files

ChangeLog.md +5/−0
README.md +5/−4
rpmbuild-order.1 +2/−2
rpmbuild-order.cabal +2/−2
src/Distribution/RPM/Build/Order.hs +1/−1
src/Main.hs +2/−2
test/Spec.hs +8/−1

ChangeLog.md view

@@ -1,3 +1,8 @@+# 0.4.2.1 (2020-09-10)+- 'sort': fix arg handled which was causing reverse ordering!+- add a sort test for the installed rpmbuild-order+- drop the erroneous dependency on Cabal+ # 0.4.2 (2020-08-04) - support options for rpmspec (suggested by QuLogic)   eg `rpmbuild-order sort --rpmopt --with=bootstrap ...`

README.md view

@@ -8,10 +8,10 @@      $ rpmbuild-order --help     $ rpmbuild-order sort mycore mylib myapp-    mylib-    mycore-    myapp +    mylib mycore myapp+    $+ The arguments passed can either be directories containing the package, or spec files.  If the dependency graph has cycles then an error will be output with@@ -28,7 +28,8 @@  - `Distribution.RPM.Build.Graph` provides lower level functions for generating   RPM dependency graphs-- `Distribution.RPM.Build.Order` provides higher level functions for sort packages in build dependency orders and output.+- `Distribution.RPM.Build.Order` provides higher level functions for+  sorting packages in build dependency orders and output.  Please see the documentation for more details.

rpmbuild-order.1 view

@@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.-.TH RPMBUILD-ORDER "1" "July 2020" "rpmbuild-order 0.4.0" "User Commands"+.TH RPMBUILD-ORDER "1" "September 2020" "rpmbuild-order 0.4.2.1" "User Commands" .SH NAME-rpmbuild-order \- manual page for rpmbuild-order 0.4.0+rpmbuild-order \- manual page for rpmbuild-order 0.4.2.1 .SH SYNOPSIS .B rpmbuild-order [\fI\,--version\/\fR] \fI\,COMMAND\/\fR

rpmbuild-order.cabal view

@@ -1,5 +1,5 @@ Name:             rpmbuild-order-Version:          0.4.2+Version:          0.4.2.1 License:          BSD3 License-File:     LICENSE Author:           Henning Thielemann <haskell@henning-thielemann.de>,@@ -69,7 +69,6 @@   Exposed-Modules:  Distribution.RPM.Build.Graph                     Distribution.RPM.Build.Order   Build-Depends: base < 5,-                 Cabal,                  case-insensitive,                  containers,                  directory,@@ -105,4 +104,5 @@                  , extra                  , hspec >= 1.3                  , rpmbuild-order+                 , simple-cmd                  , unix

src/Distribution/RPM/Build/Order.hs view

@@ -76,7 +76,7 @@  -- | output sorted packages from a PackageGraph arrange by Components sortGraph :: Components -> PackageGraph -> IO ()-sortGraph opt graph = do+sortGraph opt graph =   case opt of     Parallel ->       mapM_ ((putStrLn . ('\n':) . unwords) . topsort' . subgraph' graph) (components graph)

src/Main.hs view

@@ -64,8 +64,8 @@     rpmOpts = many (strOptionWith 'r' "rpmopt" "RPMOPT" "Option for rpmspec")  sortPackages :: [String] -> Bool -> Bool -> Components -> Maybe FilePath -> [FilePath] -> IO ()-sortPackages verbose lenient rpmopts opts mdir pkgs = do-  createGraph'' verbose lenient True rpmopts mdir pkgs >>= sortGraph opts+sortPackages rpmopts verbose lenient opts mdir pkgs = do+  createGraph'' rpmopts verbose lenient True mdir pkgs >>= sortGraph opts  depsPackages :: Bool -> [String] ->Bool -> Bool ->  Bool -> Maybe FilePath -> [FilePath] -> IO () depsPackages rev rpmopts verbose lenient parallel mdir pkgs = do

test/Spec.hs view

@@ -2,6 +2,7 @@ import Control.Monad.Extra --import Distribution.RPM.Build.Graph import Distribution.RPM.Build.Order+import SimpleCmd import System.Posix.Files  main :: IO ()@@ -63,8 +64,14 @@       leafPackages [pkg "A", pkg "B", pkg "D1.0"] >>=       (`shouldBe` [pkg "A", pkg "D1.0"]) +  -- NB hack: this requires it to be "cabal install"'ed already+  describe "rpmbuild-order" $ do+    it "sort A B" $+      cmd "rpmbuild-order" ["sort", pkg "A", pkg "B"] >>=+      (`shouldBe` unwords ["\n" ++ pkg "B", pkg "A"])+ setupSymlinks :: IO ()-setupSymlinks = do+setupSymlinks =   forM_ [("1","A"),("2","B")] $ \ (l,f) ->     unlessM (fileExist $ pkg l) $     createSymbolicLink f (pkg l)