September 2015 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-http-client for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package ghc-http-client for openSUSE:Factory checked in at 2015-09-02 00:36:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-http-client (Old) and /work/SRC/openSUSE:Factory/.ghc-http-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-http-client" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-http-client/ghc-http-client.changes 2015-08-25 08:48:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-http-client.new/ghc-http-client.changes 2015-09-02 00:36:09.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 31 08:04:52 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.4.21 +* Support no_proxy environment variable + +------------------------------------------------------------------- Old: ---- http-client-0.4.20.tar.gz New: ---- http-client-0.4.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-http-client.spec ++++++ --- /var/tmp/diff_new_pack.JAvGTh/_old 2015-09-02 00:36:10.000000000 +0200 +++ /var/tmp/diff_new_pack.JAvGTh/_new 2015-09-02 00:36:10.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-http-client -Version: 0.4.20 +Version: 0.4.21 Release: 0 Summary: HTTP client engine, intended as a base layer License: MIT ++++++ http-client-0.4.20.tar.gz -> http-client-0.4.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.4.20/ChangeLog.md new/http-client-0.4.21/ChangeLog.md --- old/http-client-0.4.20/ChangeLog.md 2015-08-18 10:29:13.000000000 +0200 +++ new/http-client-0.4.21/ChangeLog.md 2015-08-28 06:45:12.000000000 +0200 @@ -1,3 +1,7 @@ +## 0.4.21 + +* Support `no_proxy` environment variable. [#140](https://github.com/snoyberg/http-client/issues/140) [#145](https://github.com/snoyberg/http-client/pull/145) + ## 0.4.20 * Expose `brReadSome` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.4.20/Network/HTTP/Client/Manager.hs new/http-client-0.4.21/Network/HTTP/Client/Manager.hs --- old/http-client-0.4.20/Network/HTTP/Client/Manager.hs 2015-08-18 10:29:13.000000000 +0200 +++ new/http-client-0.4.21/Network/HTTP/Client/Manager.hs 2015-08-28 06:45:12.000000000 +0200 @@ -37,6 +37,7 @@ import qualified Blaze.ByteString.Builder as Blaze +import Data.Char (toLower) import Data.Text (Text) import qualified Data.Text as T import Data.Text.Read (decimal) @@ -506,7 +507,9 @@ envHelper name eh = do env <- getEnvironment let lenv = Map.fromList $ map (first $ T.toLower . T.pack) env - case lookup (T.unpack name) env <|> Map.lookup name lenv of + lookupEnvVar n = lookup (T.unpack n) env <|> Map.lookup n lenv + noProxyDomains = domainSuffixes (lookupEnvVar "no_proxy") + case lookupEnvVar name of Nothing -> return noEnvProxy Just "" -> return noEnvProxy Just str -> do @@ -541,9 +544,17 @@ Just $ (Proxy (S8.pack $ U.uriRegName auth) port, muserpass) return $ \req -> - maybe id (uncurry applyBasicProxyAuth) muserpass - req { proxy = Just p } + if host req `hasDomainSuffixIn` noProxyDomains + then noEnvProxy req + else maybe id (uncurry applyBasicProxyAuth) muserpass + req { proxy = Just p } where noEnvProxy = case eh of EHFromRequest -> id EHNoProxy -> \req -> req { proxy = Nothing } EHUseProxy p -> \req -> req { proxy = Just p } + prefixed s | S8.head s == '.' = s + | otherwise = S8.cons '.' s + domainSuffixes Nothing = [] + domainSuffixes (Just "") = [] + domainSuffixes (Just no_proxy) = [prefixed $ S8.dropWhile (== ' ') suffix | suffix <- S8.split ',' (S8.pack (map toLower no_proxy)), not (S8.null suffix)] + hasDomainSuffixIn host = any (`S8.isSuffixOf` prefixed (S8.map toLower host)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-client-0.4.20/http-client.cabal new/http-client-0.4.21/http-client.cabal --- old/http-client-0.4.20/http-client.cabal 2015-08-18 10:29:13.000000000 +0200 +++ new/http-client-0.4.21/http-client.cabal 2015-08-28 06:45:12.000000000 +0200 @@ -1,5 +1,5 @@ name: http-client -version: 0.4.20 +version: 0.4.21 synopsis: An HTTP client engine, intended as a base layer for more user-friendly packages. description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/http-client>. homepage: https://github.com/snoyberg/http-client

1 0

commit cpphs for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package cpphs for openSUSE:Factory checked in at 2015-09-02 00:36:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpphs (Old) and /work/SRC/openSUSE:Factory/.cpphs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cpphs" Changes: -------- --- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes 2015-08-05 06:51:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2015-09-02 00:36:06.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 31 07:58:58 UTC 2015 - mimi.vx(a)gmail.com + +- update to 1.19.3 +* bugfix for hlint ticket #161 - interaction of --unlit/--linepragma + +------------------------------------------------------------------- Old: ---- cpphs-1.19.2.tar.gz New: ---- cpphs-1.19.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpphs.spec ++++++ --- /var/tmp/diff_new_pack.SfSKOF/_old 2015-09-02 00:36:06.000000000 +0200 +++ /var/tmp/diff_new_pack.SfSKOF/_new 2015-09-02 00:36:06.000000000 +0200 @@ -18,7 +18,7 @@ %global pkg_name cpphs Name: cpphs -Version: 1.19.2 +Version: 1.19.3 Release: 0 Summary: A liberalised re-implementation of cpp, the C pre-processor License: GPL-2.0+ ++++++ cpphs-1.19.2.tar.gz -> cpphs-1.19.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19.2/CHANGELOG new/cpphs-1.19.3/CHANGELOG --- old/cpphs-1.19.2/CHANGELOG 2015-07-31 09:32:09.000000000 +0200 +++ new/cpphs-1.19.3/CHANGELOG 2015-08-23 11:09:27.000000000 +0200 @@ -4,6 +4,7 @@ * allow the static linking exception to the LGPL * (1.19.1): don't warn about trailing comments in #ifdefs * (1.19.2): fix build error + * (1.19.3): bugfix for hlint ticket #161 - interaction of --unlit/--linepragma Version 1.18 ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs new/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs --- old/cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs 2015-07-31 09:32:09.000000000 +0200 +++ new/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs 2015-08-23 11:09:26.000000000 +0200 @@ -44,10 +44,11 @@ -> String -- ^ The input file content -> IO [(Posn,String)] -- ^ The file after processing (in lines) cppIfdef fp syms search options = - cpp posn defs search options (Keep []) . (cppline posn:) . linesCpp + cpp posn defs search options (Keep []) . initial . linesCpp where posn = newfile fp defs = preDefine options syms + initial = if literate options then id else (cppline posn:) -- Previous versions had a very simple symbol table mapping strings -- to strings. Now the #ifdef pass uses a more elaborate table, in -- particular to deal with parameterised macros in conditionals. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19.2/Language/Preprocessor/Unlit.hs new/cpphs-1.19.3/Language/Preprocessor/Unlit.hs --- old/cpphs-1.19.2/Language/Preprocessor/Unlit.hs 2015-07-31 09:32:09.000000000 +0200 +++ new/cpphs-1.19.3/Language/Preprocessor/Unlit.hs 2015-08-23 11:09:26.000000000 +0200 @@ -21,6 +21,7 @@ -> Include (read line) (unwords rest) _ -> Pre x ) : classify xs +--classify (x:xs) | "{-# LINE" `isPrefixOf` x = Program x: classify xs classify (x:xs) | all isSpace x = Blank:classify xs classify (x:xs) = Comment:classify xs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19.2/cpphs.cabal new/cpphs-1.19.3/cpphs.cabal --- old/cpphs-1.19.2/cpphs.cabal 2015-07-31 09:32:09.000000000 +0200 +++ new/cpphs-1.19.3/cpphs.cabal 2015-08-23 11:09:27.000000000 +0200 @@ -1,5 +1,5 @@ Name: cpphs -Version: 1.19.2 +Version: 1.19.3 Copyright: 2004-2015, Malcolm Wallace License: LGPL License-File: LICENCE-LGPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19.2/cpphs.hs new/cpphs-1.19.3/cpphs.hs --- old/cpphs-1.19.2/cpphs.hs 2015-07-31 09:32:09.000000000 +0200 +++ new/cpphs-1.19.3/cpphs.hs 2015-08-23 11:09:26.000000000 +0200 @@ -20,7 +20,7 @@ import Data.List ( isPrefixOf ) version :: String -version = "1.19.2" +version = "1.19.3" main :: IO () main = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.19.2/docs/index.html new/cpphs-1.19.3/docs/index.html --- old/cpphs-1.19.2/docs/index.html 2015-07-31 09:32:09.000000000 +0200 +++ new/cpphs-1.19.3/docs/index.html 2015-08-23 11:09:27.000000000 +0200 @@ -198,11 +198,12 @@ Current stable version: -cpphs-1.19.2, release date 2015-07-31 +cpphs-1.19.3, release date 2015-08-23 By HTTP: <a href="http://hackage.haskell.org/package/cpphs">Hackage</a>. <ul> -<li> fix build error +<li> bugfix for hlint ticket #161, for + the interaction of --unlit and --linepragma options </ul> @@ -226,6 +227,14 @@ Older versions: +cpphs-1.19.2, release date 2015-07-31 +By HTTP: +<a href="http://hackage.haskell.org/package/cpphs">Hackage</a>. +<ul> +<li> fix build error +</ul> + + cpphs-1.19.1, release date 2015-07-30 By HTTP: <a href="http://hackage.haskell.org/package/cpphs">Hackage</a>.

1 0

commit ghc-cmark for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package ghc-cmark for openSUSE:Factory checked in at 2015-09-02 00:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cmark (Old) and /work/SRC/openSUSE:Factory/.ghc-cmark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cmark" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cmark/ghc-cmark.changes 2015-08-23 17:38:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-cmark.new/ghc-cmark.changes 2015-09-02 00:36:03.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 31 07:35:59 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.4.1 +* Updated to libcmark 0.22.0 +* Bumped version bounds for HUnit. + +------------------------------------------------------------------- Old: ---- cmark-0.4.0.1.tar.gz New: ---- cmark-0.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cmark.spec ++++++ --- /var/tmp/diff_new_pack.NGLDPS/_old 2015-09-02 00:36:04.000000000 +0200 +++ /var/tmp/diff_new_pack.NGLDPS/_new 2015-09-02 00:36:04.000000000 +0200 @@ -15,17 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name cmark %bcond_with tests Name: ghc-cmark -Version: 0.4.0.1 +Version: 0.4.1 Release: 0 Summary: Fast, accurate CommonMark (Markdown) parser and renderer +License: BSD-3-Clause and BSD-2-Clause and MIT Group: System/Libraries -License: BSD-3-Clause and BSD-2-Clause and MIT Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -111,37 +112,29 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check %if %{with tests} %cabal test %endif - %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE - %files devel -f %{name}-devel.files %defattr(-,root,root,-) %doc README.md - %changelog ++++++ cmark-0.4.0.1.tar.gz -> cmark-0.4.1.tar.gz ++++++ ++++ 61680 lines of diff (skipped)

1 0

commit cabal-rpm for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-09-02 00:36:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cabal-rpm (Old) and /work/SRC/openSUSE:Factory/.cabal-rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cabal-rpm" Changes: -------- --- /work/SRC/openSUSE:Factory/cabal-rpm/cabal-rpm.changes 2015-08-25 08:46:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-09-02 00:36:02.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Aug 31 06:58:52 UTC 2015 - mimi.vx(a)gmail.com + +- change fix-macro-license.patch to upstream solution + +------------------------------------------------------------------- +Sun Aug 30 14:38:54 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.9.7 +* only list buildable executables in spec file +* bring back 'build' as an alias for 'local' +* use %license macro +* do not warn about missing optional system programs ++ add fix-macro-license.patch to correct use of %license macro + +------------------------------------------------------------------- Old: ---- cabal-rpm-0.9.6.tar.gz New: ---- cabal-rpm-0.9.7.tar.gz fix-macro-license.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cabal-rpm.spec ++++++ --- /var/tmp/diff_new_pack.WWB65t/_old 2015-09-02 00:36:03.000000000 +0200 +++ /var/tmp/diff_new_pack.WWB65t/_new 2015-09-02 00:36:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version: 0.9.6 +Version: 0.9.7 Release: 0 Summary: RPM packaging tool for Haskell Cabal-based packages License: GPL-3.0+ @@ -25,6 +25,9 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… Source2: cabal-rpm.1 +# PATCH-FIX-UPSTREAM fix-macro-license.patch mimi.vx(a)gmail.com SUSE doesn't support +# %%licence macro from Fedora 21 +Patch0: fix-macro-license.patch BuildRequires: ghc-Cabal-devel # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel @@ -51,6 +54,7 @@ %prep %setup -q +%patch0 -p1 %build %define cabal_configure_options --flags="-old-locale" ++++++ cabal-rpm-0.9.6.tar.gz -> cabal-rpm-0.9.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.6/ChangeLog new/cabal-rpm-0.9.7/ChangeLog --- old/cabal-rpm-0.9.6/ChangeLog 2015-05-21 11:52:28.000000000 +0200 +++ new/cabal-rpm-0.9.7/ChangeLog 2015-08-28 10:47:23.000000000 +0200 @@ -1,3 +1,9 @@ +* 0.9.7 (2015-08-28) +- only list buildable executables in spec file +- bring back 'build' as an alias for 'local' +- use %license macro +- do not warn about missing optional system programs + * 0.9.6 (2015-05-21) - make "cabal list" quiet - filter missing packages from repoquery diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.6/cabal-rpm.cabal new/cabal-rpm-0.9.7/cabal-rpm.cabal --- old/cabal-rpm-0.9.6/cabal-rpm.cabal 2015-05-21 11:52:28.000000000 +0200 +++ new/cabal-rpm-0.9.7/cabal-rpm.cabal 2015-08-28 10:47:23.000000000 +0200 @@ -1,5 +1,5 @@ Name: cabal-rpm -Version: 0.9.6 +Version: 0.9.7 Synopsis: RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.6/src/Commands/Spec.hs new/cabal-rpm-0.9.7/src/Commands/Spec.hs --- old/cabal-rpm-0.9.6/src/Commands/Spec.hs 2015-05-21 11:52:28.000000000 +0200 +++ new/cabal-rpm-0.9.7/src/Commands/Spec.hs 2015-08-28 10:47:23.000000000 +0200 @@ -40,7 +40,8 @@ import Distribution.Simple.Utils (notice, warn) -import Distribution.PackageDescription (PackageDescription (..), Executable (..), +import Distribution.PackageDescription (BuildInfo (..), PackageDescription (..), + Executable (..), exeName, hasExes, hasLibs) --import Distribution.Version (VersionRange, foldVersionRange') @@ -253,6 +254,10 @@ put $ wrapGenDesc $ "This package provides the Haskell" +-+ pkg_name +-+ "library development files." putNewline + when (distro == RHEL5) $ do + put "%global %license %%doc" + putNewline + put "%prep" put $ "%setup -q" ++ (if pkgname /= name then " -n %{pkg_name}-%{version}" else "") putNewline @@ -267,7 +272,20 @@ put "%install" put $ "%ghc_" ++ pkgType ++ "_install" - let execs = sort $ map exeName $ executables pkgDesc + let licensefiles = +#if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(1,20,0) + licenseFiles pkgDesc +#else + if null (licenseFile pkgDesc) then [] else [licenseFile pkgDesc] +#endif + unless (null licensefiles) $ do + putNewline + put $ "rm %{buildroot}%{ghc_pkgdocdir}/" ++ + case length licensefiles of + 1 -> head licensefiles + _ -> "{" ++ intercalate "," licensefiles ++ "}" + + let execs = sort $ map exeName $ filter isBuildable $ executables pkgDesc when selfdep $ do putNewline put $ "%ghc_fix_dynamic_rpath" +-+ intercalate " " (map (\ p -> if p == name then "%{pkg_name}" else p) execs) @@ -292,12 +310,6 @@ put $ "%postun" +-+ ghcPkgDevel putInstallScript - let licensefiles = -#if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(1,20,0) - licenseFiles pkgDesc -#else - if null (licenseFile pkgDesc) then [] else [licenseFile pkgDesc] -#endif docs <- findDocs cabalPath licensefiles when hasExecPkg $ do @@ -305,7 +317,7 @@ when (distro /= Fedora) $ put "%defattr(-,root,root,-)" -- Add the license file to the main package only if it wouldn't -- otherwise be empty. - mapM_ (\ l -> put $ "%doc" +-+ l) licensefiles + mapM_ (\ l -> put $ "%license" +-+ l) licensefiles unless (null docs) $ put $ "%doc" +-+ unwords docs @@ -321,7 +333,7 @@ develFiles = if binlib then "-f ghc-%{name}-devel.files" else "-f %{name}-devel.files" put $ "%files" +-+ ghcPkg +-+ baseFiles when (distro /= Fedora) $ put "%defattr(-,root,root,-)" - mapM_ (\ l -> put $ "%doc" +-+ l) licensefiles + mapM_ (\ l -> put $ "%license" +-+ l) licensefiles -- be strict for now -- unless (null (dataFiles pkgDesc) || binlib) $ -- put "%{_datadir}/%{pkg_name}-%{version}" @@ -349,6 +361,9 @@ createSpecFile_ pkgFiles flags mdest = void (createSpecFile pkgFiles flags mdest) +isBuildable :: Executable -> Bool +isBuildable exe = buildable $ buildInfo exe + findDocs :: FilePath -> [FilePath] -> IO [FilePath] findDocs cabalPath licensefiles = do contents <- getDirectoryContents $ dropFileName cabalPath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.6/src/Main.hs new/cabal-rpm-0.9.7/src/Main.hs --- old/cabal-rpm-0.9.6/src/Main.hs 2015-05-21 11:52:28.000000000 +0200 +++ new/cabal-rpm-0.9.7/src/Main.hs 2015-08-28 10:47:23.000000000 +0200 @@ -41,6 +41,7 @@ "srpm" -> rpmBuild_ pkgdata opts Source "prep" -> rpmBuild_ pkgdata opts Prep "local" -> rpmBuild_ pkgdata opts Binary + "build" -> rpmBuild_ pkgdata opts Binary "builddep" -> rpmBuild_ pkgdata opts BuildDep "diff" -> diff pkgdata opts "install" -> install pkgdata opts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.6/src/Setup.hs new/cabal-rpm-0.9.7/src/Setup.hs --- old/cabal-rpm-0.9.6/src/Setup.hs 2015-05-21 11:52:28.000000000 +0200 +++ new/cabal-rpm-0.9.7/src/Setup.hs 2015-08-28 10:47:23.000000000 +0200 @@ -128,7 +128,7 @@ error $ unlines errs unless (null unknown) $ error $ "Unrecognised options:" +-+ unwords unknown - when (null args' || notElem (head args') ["builddep", "depends", "diff", "install", "missingdeps", "prep", "requires", "spec", "srpm", "local", "rpm", "update"]) $ do + when (null args' || notElem (head args') ["builddep", "depends", "diff", "install", "missingdeps", "prep", "requires", "spec", "srpm", "build", "local", "rpm", "update"]) $ do printHelp stderr exitWith (ExitFailure 1) when (length args' > 2) $ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.6/src/SysCmd.hs new/cabal-rpm-0.9.7/src/SysCmd.hs --- old/cabal-rpm-0.9.6/src/SysCmd.hs 2015-05-21 11:52:28.000000000 +0200 +++ new/cabal-rpm-0.9.7/src/SysCmd.hs 2015-08-28 10:47:23.000000000 +0200 @@ -15,8 +15,6 @@ -- (at your option) any later version. module SysCmd ( - optionalProgram, - requireProgram, cmd, cmd_, cmdBool, @@ -35,7 +33,7 @@ import Data.List ((\\)) import Data.Maybe (fromMaybe, isJust, isNothing) -import Distribution.Simple.Utils (die, warn, findProgramLocation) +import Distribution.Simple.Utils (die, findProgramLocation) import Distribution.Verbosity (normal) import System.Posix.User (getEffectiveUserID) @@ -50,7 +48,6 @@ optionalProgram :: String -> IO Bool optionalProgram c = do mavail <- findProgramLocation normal c - when (isNothing mavail) $ warn normal (c ++ ": command not found") return $ isJust mavail cmd_ :: String -> [String] -> IO () ++++++ fix-macro-license.patch ++++++ >From cfd0536c2352d8ce95552039a087b43e94d67ee1 Mon Sep 17 00:00:00 2001 From: Jens Petersen <petersen(a)redhat.com> Date: Mon, 31 Aug 2015 12:01:27 +0900 Subject: [PATCH] %license is only in RHEL7+/Fedora (#22) thanks to @mimi1vx for reporting via PR --- src/Commands/Spec.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Commands/Spec.hs b/src/Commands/Spec.hs index 9856196..fbc20e4 100644 --- a/src/Commands/Spec.hs +++ b/src/Commands/Spec.hs @@ -226,9 +226,9 @@ createSpecFile pkgdata flags mdest = do put $ "%package" +-+ ghcPkg putHdr "Summary" $ "Haskell" +-+ pkg_name +-+ "library" case distro of - Fedora -> return () SUSE -> putHdr "Group" "System/Libraries" RHEL5 -> putHdr "Group" "System Environment/Libraries" + _ -> return () putNewline put $ "%description" +-+ ghcPkg put $ wrapGenDesc $ "This package provides the Haskell" +-+ pkg_name +-+ "shared library." @@ -236,9 +236,9 @@ createSpecFile pkgdata flags mdest = do put $ "%package" +-+ ghcPkgDevel putHdr "Summary" $ "Haskell" +-+ pkg_name +-+ "library development files" case distro of - Fedora -> return () RHEL5 -> putHdr "Group" "Development/Libraries" SUSE -> putHdr "Group" "Development/Libraries/Other" + _ -> return () unless (distro == SUSE) $ putHdr "Provides" $ (if binlib then "ghc-%{name}" else "%{name}") ++ "-static = %{version}-%{release}" putHdr "Requires" "ghc-compiler = %{ghc_version}" @@ -254,8 +254,8 @@ createSpecFile pkgdata flags mdest = do put $ wrapGenDesc $ "This package provides the Haskell" +-+ pkg_name +-+ "library development files." putNewline - when (distro == RHEL5) $ do - put "%global %license %%doc" + when (distro /= Fedora) $ do + putDef "license" "%%doc" putNewline put "%prep"

1 0

commit ghc-JuicyPixels for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package ghc-JuicyPixels for openSUSE:Factory checked in at 2015-09-02 00:35:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-JuicyPixels (Old) and /work/SRC/openSUSE:Factory/.ghc-JuicyPixels.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-JuicyPixels" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-JuicyPixels/ghc-JuicyPixels.changes 2015-08-27 08:56:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-JuicyPixels.new/ghc-JuicyPixels.changes 2015-09-02 00:36:01.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 31 06:16:56 UTC 2015 - mimi.vx(a)gmail.com + +- update to 3.2.6.1 +* Fix: handling of negative height & width in bitmap format +* Fix: regression on Tiff parsing. + +------------------------------------------------------------------- Old: ---- JuicyPixels-3.2.6.tar.gz New: ---- JuicyPixels-3.2.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-JuicyPixels.spec ++++++ --- /var/tmp/diff_new_pack.tudBxX/_old 2015-09-02 00:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.tudBxX/_new 2015-09-02 00:36:02.000000000 +0200 @@ -20,7 +20,7 @@ # no useful debuginfo for Haskell packages without C sources %global debug_package %{nil} Name: ghc-JuicyPixels -Version: 3.2.6 +Version: 3.2.6.1 Release: 0 Summary: Picture loading/serialization License: BSD-3-Clause ++++++ JuicyPixels-3.2.6.tar.gz -> JuicyPixels-3.2.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/JuicyPixels.cabal new/JuicyPixels-3.2.6.1/JuicyPixels.cabal --- old/JuicyPixels-3.2.6/JuicyPixels.cabal 2015-08-17 20:14:41.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/JuicyPixels.cabal 2015-08-23 16:38:47.000000000 +0200 @@ -1,5 +1,5 @@ Name: JuicyPixels -Version: 3.2.6 +Version: 3.2.6.1 Synopsis: Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance) Description: <<data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==>> @@ -28,7 +28,7 @@ Source-Repository this Type: git Location: git://github.com/Twinside/Juicy.Pixels.git - Tag: v3.2.6 + Tag: v3.2.6.1 Flag Mmap Description: Enable the file loading via mmap (memory map) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/changelog new/JuicyPixels-3.2.6.1/changelog --- old/JuicyPixels-3.2.6/changelog 2015-08-17 20:14:41.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/changelog 2015-08-23 16:38:47.000000000 +0200 @@ -1,6 +1,11 @@ Change log ========== +v3.2.6.1 AUgust 2015 +-------------------- + * Fix: handling of negative height & width in bitmap format. + * Fix: regression on Tiff parsing. + V3.2.6 August 2015 -------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/src/Codec/Picture/Bitmap.hs new/JuicyPixels-3.2.6.1/src/Codec/Picture/Bitmap.hs --- old/JuicyPixels-3.2.6/src/Codec/Picture/Bitmap.hs 2015-08-17 20:14:40.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/src/Codec/Picture/Bitmap.hs 2015-08-23 16:38:47.000000000 +0200 @@ -23,7 +23,7 @@ import Control.Applicative( (<$>) ) #endif -import Control.Monad( when, forM_ ) +import Control.Monad( when, foldM_, forM_ ) import Control.Monad.ST ( ST, runST ) import Data.Maybe( fromMaybe ) import qualified Data.Vector as V @@ -45,6 +45,7 @@ , skip ) +import Data.Int( Int32 ) import Data.Word( Word32, Word16, Word8 ) import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L @@ -93,14 +94,14 @@ data BmpInfoHeader = BmpInfoHeader { size :: !Word32 -- Header size in bytes - , width :: !Word32 - , height :: !Word32 + , width :: !Int32 + , height :: !Int32 , planes :: !Word16 -- Number of colour planes , bitPerPixel :: !Word16 , bitmapCompression :: !Word32 , byteImageSize :: !Word32 - , xResolution :: !Word32 -- ^ Pixels per meter - , yResolution :: !Word32 -- ^ Pixels per meter + , xResolution :: !Int32 -- ^ Pixels per meter + , yResolution :: !Int32 -- ^ Pixels per meter , colorCount :: !Word32 , importantColours :: !Word32 } @@ -113,27 +114,27 @@ instance Binary BmpInfoHeader where put hdr = do putWord32le $ size hdr - putWord32le $ width hdr - putWord32le $ height hdr + putWord32le . fromIntegral $ width hdr + putWord32le . fromIntegral $ height hdr putWord16le $ planes hdr putWord16le $ bitPerPixel hdr putWord32le $ bitmapCompression hdr putWord32le $ byteImageSize hdr - putWord32le $ xResolution hdr - putWord32le $ yResolution hdr + putWord32le . fromIntegral $ xResolution hdr + putWord32le . fromIntegral $ yResolution hdr putWord32le $ colorCount hdr putWord32le $ importantColours hdr get = do readSize <- getWord32le - readWidth <- getWord32le - readHeight <- getWord32le + readWidth <- fromIntegral <$> getWord32le + readHeight <- fromIntegral <$> getWord32le readPlanes <- getWord16le readBitPerPixel <- getWord16le readBitmapCompression <- getWord32le readByteImageSize <- getWord32le - readXResolution <- getWord32le - readYResolution <- getWord32le + readXResolution <- fromIntegral <$> getWord32le + readYResolution <- fromIntegral <$> getWord32le readColorCount <- getWord32le readImportantColours <- getWord32le return BmpInfoHeader { @@ -253,54 +254,54 @@ VS.unsafeFreeze buff decodeImageRGB8 :: BmpInfoHeader -> B.ByteString -> Image PixelRGB8 -decodeImageRGB8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray - where wi = fromIntegral w - hi = fromIntegral h - stArray = runST $ do - arr <- M.new (fromIntegral $ w * h * 3) - forM_ [hi - 1, hi - 2 .. 0] (readLine arr) - VS.unsafeFreeze arr - - stride = linePadding 24 wi - - readLine :: forall s. M.MVector s Word8 -> Int -> ST s () - readLine arr line = - let readIndex = (wi * 3 + stride) * line - lastIndex = wi * (hi - 1 - line + 1) * 3 - writeIndex = wi * (hi - 1 - line) * 3 - - inner _ writeIdx | writeIdx >= lastIndex = return () - inner readIdx writeIdx = do - (arr `M.unsafeWrite` writeIdx ) (str `B.index` (readIdx + 2)) - (arr `M.unsafeWrite` (writeIdx + 1)) (str `B.index` (readIdx + 1)) - (arr `M.unsafeWrite` (writeIdx + 2)) (str `B.index` readIdx) - inner (readIdx + 3) (writeIdx + 3) - - in inner readIndex writeIndex +decodeImageRGB8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray where + wi = fromIntegral w + hi = abs $ fromIntegral h + stArray = runST $ do + arr <- M.new (fromIntegral $ w * abs h * 3) + if h > 0 then + foldM_ (readLine arr) 0 [0 .. hi - 1] + else + foldM_ (readLine arr) 0 [hi - 1, hi - 2 .. 0] + VS.unsafeFreeze arr + + stride = linePadding 24 wi + + readLine :: forall s. M.MVector s Word8 -> Int -> Int -> ST s Int + readLine arr readIndex line = inner readIndex writeIndex where + lastIndex = wi * (hi - 1 - line + 1) * 3 + writeIndex = wi * (hi - 1 - line) * 3 + + inner readIdx writeIdx | writeIdx >= lastIndex = return $ readIdx + stride + inner readIdx writeIdx = do + (arr `M.unsafeWrite` writeIdx ) (str `B.index` (readIdx + 2)) + (arr `M.unsafeWrite` (writeIdx + 1)) (str `B.index` (readIdx + 1)) + (arr `M.unsafeWrite` (writeIdx + 2)) (str `B.index` readIdx) + inner (readIdx + 3) (writeIdx + 3) decodeImageY8 :: BmpInfoHeader -> B.ByteString -> Image Pixel8 -decodeImageY8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray - where wi = fromIntegral w - hi = fromIntegral h - stArray = runST $ do - arr <- M.new . fromIntegral $ w * h - forM_ [hi - 1, hi - 2 .. 0] (readLine arr) - VS.unsafeFreeze arr - - stride = linePadding 8 wi - - readLine :: forall s. M.MVector s Word8 -> Int -> ST s () - readLine arr line = - let readIndex = (wi + stride) * line - lastIndex = wi * (hi - 1 - line + 1) - writeIndex = wi * (hi - 1 - line) - - inner _ writeIdx | writeIdx >= lastIndex = return () - inner readIdx writeIdx = do - (arr `M.unsafeWrite` writeIdx) (str `B.index` readIdx) - inner (readIdx + 1) (writeIdx + 1) - - in inner readIndex writeIndex +decodeImageY8 (BmpInfoHeader { width = w, height = h }) str = Image wi hi stArray where + wi = fromIntegral w + hi = abs $ fromIntegral h + stArray = runST $ do + arr <- M.new . fromIntegral $ w * abs h + if h > 0 then + foldM_ (readLine arr) 0 [0 .. hi - 1] + else + foldM_ (readLine arr) 0 [hi - 1, hi - 2 .. 0] + VS.unsafeFreeze arr + + stride = linePadding 8 wi + + readLine :: forall s. M.MVector s Word8 -> Int -> Int -> ST s Int + readLine arr readIndex line = inner readIndex writeIndex where + lastIndex = wi * (hi - 1 - line + 1) + writeIndex = wi * (hi - 1 - line) + + inner readIdx writeIdx | writeIdx >= lastIndex = return $ readIdx + stride + inner readIdx writeIdx = do + (arr `M.unsafeWrite` writeIdx) (str `B.index` readIdx) + inner (readIdx + 1) (writeIdx + 1) pixelGet :: Get PixelRGB8 @@ -313,7 +314,7 @@ metadataOfHeader :: BmpInfoHeader -> Metadatas metadataOfHeader hdr = - Met.simpleMetadata Met.SourceBitmap (width hdr) (height hdr) dpiX dpiY + Met.simpleMetadata Met.SourceBitmap (width hdr) (abs $ height hdr) dpiX dpiY where dpiX = Met.dotsPerMeterToDotPerInch . fromIntegral $ xResolution hdr dpiY = Met.dotsPerMeterToDotPerInch . fromIntegral $ yResolution hdr @@ -337,6 +338,12 @@ readed <- bytesRead when (readed > fromIntegral (dataOffset hdr)) (fail "Invalid bmp image, data in header") + + when (width bmpHeader <= 0) + (fail $ "Invalid bmp width, " ++ show (width bmpHeader)) + + when (height bmpHeader == 0) + (fail $ "Invalid bmp height (0) ") let bpp = fromIntegral $ bitPerPixel bmpHeader :: Int paletteColorCount @@ -454,8 +461,8 @@ bitPerPixel = fromIntegral bpp, bitmapCompression = 0, -- no compression byteImageSize = imagePixelSize, - xResolution = dpiX, - yResolution = dpiY, + xResolution = fromIntegral dpiX, + yResolution = fromIntegral dpiY, colorCount = 0, importantColours = paletteSize } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JuicyPixels-3.2.6/src/Codec/Picture/Tiff/Types.hs new/JuicyPixels-3.2.6.1/src/Codec/Picture/Tiff/Types.hs --- old/JuicyPixels-3.2.6/src/Codec/Picture/Tiff/Types.hs 2015-08-17 20:14:41.000000000 +0200 +++ new/JuicyPixels-3.2.6.1/src/Codec/Picture/Tiff/Types.hs 2015-08-23 16:38:47.000000000 +0200 @@ -238,7 +238,9 @@ , ifdType = TypeLong , ifdCount = 1 } = do align ifd $ do - subIfds <- fmap (cleanImageFileDirectory endianness) <$> getP endianness + let byOffset = sortBy (compare `on` ifdOffset) + cleansIfds = fmap (cleanImageFileDirectory endianness) + subIfds <- cleansIfds . byOffset <$> getP endianness cleaned <- fetchExtended endianness maxi $ sortBy (compare `on` ifdOffset) subIfds pure $ ExifIFD [(ifdIdentifier fd, ifdExtended fd) | fd <- cleaned] {- @@ -339,8 +341,10 @@ readed <- bytesRead skip . fromIntegral $ fromIntegral (hdrOffset hdr) - readed let endian = hdrEndianness hdr + byOffset = sortBy (compare `on` ifdOffset) + cleanIfds = fmap (cleanImageFileDirectory endian) - ifd <- fmap (cleanImageFileDirectory endian) <$> getP endian + ifd <- cleanIfds . byOffset <$> getP endian cleaned <- fetchExtended endian (B.length raw) ifd return (hdr, cleaned)

1 0

commit xmonad for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package xmonad for openSUSE:Factory checked in at 2015-09-02 00:35:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmonad (Old) and /work/SRC/openSUSE:Factory/.xmonad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xmonad" Changes: -------- --- /work/SRC/openSUSE:Factory/xmonad/xmonad.changes 2015-05-21 08:39:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmonad.new/xmonad.changes 2015-09-02 00:36:00.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 30 13:35:30 UTC 2015 - mimi.vx(a)gmail.com + +- drop relax-utfstring-dep.patch , use of new macros functions instead + +------------------------------------------------------------------- Old: ---- relax-utfstring-dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmonad.spec ++++++ --- /var/tmp/diff_new_pack.fJGROI/_old 2015-09-02 00:36:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fJGROI/_new 2015-09-02 00:36:01.000000000 +0200 @@ -19,7 +19,7 @@ %global pkg_name xmonad # no useful debuginfo for Haskell packages without C sources %global debug_package %{nil} -Name: %{pkg_name} +Name: xmonad Version: 0.11.1 Release: 0 Summary: A tiling window manager @@ -28,8 +28,6 @@ Url: https://hackage.haskell.org/package/%{name} Source0: %{name}-%{version}.tar.gz Source1: xmonad.desktop -# PATCH-FIX-UPSTREAM relax-utfstring-dep.patch relax dep on utf8-string >0.3 -Patch0: relax-utfstring-dep.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-X11-devel BuildRequires: ghc-containers-devel @@ -74,7 +72,7 @@ %prep %setup -q -%patch0 -p1 +cabal-tweak-dep-ver utf8-string '< 0.4' '< 1.1' %build %{ghc_lib_build}

1 0

commit go for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package go for openSUSE:Factory checked in at 2015-09-02 00:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go (Old) and /work/SRC/openSUSE:Factory/.go.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "go" Changes: -------- --- /work/SRC/openSUSE:Factory/go/go.changes 2015-08-13 18:10:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.go.new/go.changes 2015-09-02 00:35:57.000000000 +0200 @@ -1,0 +2,23 @@ +Sat Aug 22 17:44:55 UTC 2015 - i(a)marguerite.su + +- enable ppc64 and ppc64le + +------------------------------------------------------------------- +Thu Aug 20 15:26:42 UTC 2015 - i(a)marguerite.su + +- update to version 1.5 + * see https://golang.org/doc/go1.5 +- add: go-1.5-build-dont-reinstall-stdlibs.patch + drop: go-build-dont-reinstall-stdlibs.patch + * refresh patch +- add: go-1.5-install-dont-reinstall-stdlibs.patch + drop: go-install-dont-reinstall-stdlibs.patch + * refresh patch +- drop: go-1.4.2-rel.plt-alignment.patch + * fix by upstream +- add gcc5-go.patch + * find /usr/bin/go-5 when bootstrapping with gcc5-go +- use update-alternatives for /usr/bin/go and profiles.d + so it can be co-installed with go1.4 + +------------------------------------------------------------------- Old: ---- README-openSUSE go-1.4.2-rel.plt-alignment.patch go-build-dont-reinstall-stdlibs.patch go-install-dont-reinstall-stdlibs.patch go1.4.2.src.tar.gz New: ---- README.SUSE gcc5-go.patch go-1.5-build-dont-reinstall-stdlibs.patch go-1.5-install-dont-reinstall-stdlibs.patch go1.5.src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go.spec ++++++ --- /var/tmp/diff_new_pack.jwjoTZ/_old 2015-09-02 00:36:00.000000000 +0200 +++ /var/tmp/diff_new_pack.jwjoTZ/_new 2015-09-02 00:36:00.000000000 +0200 @@ -2,7 +2,6 @@ # spec file for package go # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2011, Sascha Peilicke <saschpe(a)gmx.de> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +16,14 @@ # +%if 0%{?suse_version} > 1320 +%define with_gccgo 1 +%else +%define with_gccgo 0 +%endif + Name: go -Version: 1.4.2 +Version: 1.5 Release: 0 Summary: A compiled, garbage-collected, concurrent programming language License: BSD-3-Clause @@ -29,16 +34,16 @@ Source2: go.sh Source3: macros.go Source4: go-wiki-gadget.xml -Source5: README-openSUSE +Source5: README.SUSE # PATCH-FIX-OPENSUSE add -s flag to 'go install' (don't rebuild/install std libs) -Patch1: go-build-dont-reinstall-stdlibs.patch +Patch1: go-1.5-build-dont-reinstall-stdlibs.patch # PATCH-FIX-OPENSUSE re-enable build binary only packages (we are binary distro) # see http://code.google.com/p/go/issues/detail?id=2775 & also issue 3268 Patch2: allow-binary-only-packages.patch #PATCH-FIX-OPENSUSE use -x verbose build output for qemu-arm builders Patch3: verbose-build.patch # PATCH-FIX-OPENSUSE BNC#776058 -Patch4: go-install-dont-reinstall-stdlibs.patch +Patch4: go-1.5-install-dont-reinstall-stdlibs.patch # PATCH-FIX-OPENSUSE enable writing tools outside $GOROOT/pkg/tool for packaging Patch5: tools-packaging.patch # armv6l needs this patch for our build system @@ -47,8 +52,15 @@ # PATCH-FIX-OPENSUSE fix_certificates_lookup.patch fcastelli(a)suse.com -- this patch forces Go to look for certificates only in the openSUSE/SLE locations. It also fixes certificate loading on SLE11, see https://github.com/golang/go/issues/6391 # PATCH-FIX-SUSE fix_certificates_lookup.patch fcastelli(a)suse.com -- this patch forces Go to look for certificates only in the openSUSE/SLE locations. It also fixes certificate loading on SLE11, see https://github.com/golang/go/issues/6391 Patch7: fix_certificates_lookup.patch -Patch8: go-1.4.2-rel.plt-alignment.patch +# PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - find /usr/bin/go-5 when bootstrapping with gcc5-go +Patch8: gcc5-go.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# boostrap +%if %{with_gccgo} +BuildRequires: gcc5-go +%else +BuildRequires: go1.4 +%endif BuildRequires: rpm %if 0%{?suse_version} >= 1210 BuildRequires: mercurial @@ -62,15 +74,17 @@ BuildRequires: rpm >= 4.11.1 %endif %endif +Requires(post): update-alternatives +Requires(postun): update-alternatives Requires: gcc Provides: go-devel = %{name}%{version} Provides: go-devel-static = %{name}%{version} -Provides: golang(API) = 1.4 +Provides: golang(API) = 1.5 Obsoletes: go-devel < %{name}%{version} # go-vim/emacs were separate projects starting from 1.4 Obsoletes: go-emacs <= 1.3.3 Obsoletes: go-vim <= 1.3.3 -ExclusiveArch: %ix86 x86_64 %arm +ExclusiveArch: %ix86 x86_64 %arm ppc64 ppc64le %description Go is an expressive, concurrent, garbage collected systems programming language @@ -98,7 +112,9 @@ %patch6 -p1 %endif %patch7 -p1 +%if %{with_gccgo} %patch8 -p1 +%endif cp %{SOURCE5} . # setup go_arch (BSD-like scheme) @@ -115,8 +131,21 @@ sed -i 's|GOARCH|arm|' go.macros %define go_arch arm %endif +%ifarch ppc64 +sed -i 's|GOARCH|ppc64|' go.macros +%define go_arch ppc64 +%endif +%ifarch ppc64le +sed -i 's|GOARCH|ppc64le|' go.macros +%define go_arch ppc64le +%endif %build +%if %{with_gccgo} +export GOROOT_BOOTSTRAP=%{_prefix} +%else +export GOROOT_BOOTSTRAP=%{_libdir}/go1.4 +%endif export GOROOT="`pwd`" export GOROOT_FINAL=%{_libdir}/go export GOBIN="$GOROOT/bin" @@ -132,9 +161,7 @@ %install export GOROOT="%{buildroot}%{_libdir}/%{name}" -# bash completion seems broken -#install -Dm644 misc/bash/go %%{buildroot}%%{_sysconfdir}/bash_completion.d/go.sh -install -Dm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/go.sh +install -Dm644 %{SOURCE2} $GOROOT/bin/profile.d/go.sh # locations for third party libraries, see README-openSUSE for info about locations. install -d %{buildroot}%{_datadir}/go/contrib @@ -142,8 +169,8 @@ ln -s %{_libdir}/%{name}/contrib/pkg/ %{buildroot}%{_datadir}/go/contrib/pkg install -d %{buildroot}%{_datadir}/go/contrib/cmd install -d %{buildroot}%{_datadir}/go/contrib/src -install -Dm644 README-openSUSE $GOROOT/contrib/ -ln -s %{_libdir}/go/contrib/README-openSUSE %{buildroot}%{_datadir}/go/contrib/README-openSUSE +install -Dm644 README.SUSE $GOROOT/contrib/ +ln -s %{_libdir}/go/contrib/README.SUSE %{buildroot}%{_datadir}/go/contrib/README.SUSE # source files for go install, godoc, etc install -d %{buildroot}%{_datadir}/go @@ -156,58 +183,81 @@ done # copy document templates, packages, obj libs and command utilities -mkdir -p %{buildroot}%{_bindir} +mkdir -p $GOROOT/bin mkdir -p $GOROOT/lib +# remove bootstrap +rm -rf pkg/bootstrap mv pkg $GOROOT -mv bin/* %{buildroot}%{_bindir} +mv bin/* $GOROOT/bin rm -f %{buildroot}%{_bindir}/{hgpatch,quietgcc} +# update-alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +touch %{buildroot}%{_sysconfdir}/alternatives/{go,gofmt,go.sh} +ln -sf %{_sysconfdir}/alternatives/go %{buildroot}%{_bindir}/go +ln -sf %{_sysconfdir}/alternatives/gofmt %{buildroot}%{_bindir}/gofmt +ln -sf %{_sysconfdir}/alternatives/go.sh %{buildroot}%{_sysconfdir}/profile.d/go.sh + # documentation and examples # fix documetation permissions (rpmlint warning) find doc/ misc/ -type f -exec chmod 0644 '{}' \; # remove unwanted arch-dependant binaries (rpmlint warning) rm -rf misc/cgo/test/{_*,*.o,*.out,*.6,*.8} -rm -f misc/dashboard/builder/{gobuilder,*6,*.8} -rm -f misc/goplay/{goplay,*.6,*.8} -rm -rf misc/windows -rm -rf misc/cgo/test/{_*,*.o,*.out,*.6,*.8} -# remove kate syntax file, it is shipped with libktexteditor already -rm -f misc/kate/go.xml +# prepare go-doc +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -r AUTHORS CONTRIBUTORS CONTRIBUTING.md LICENSE PATENTS README.md README.SUSE %{buildroot}%{_docdir}/%{name} +cp -r doc/* %{buildroot}%{_docdir}/%{name} # install RPM macros ($GOARCH prepared in %%prep section) install -Dm644 go.macros %{buildroot}%{_sysconfdir}/rpm/macros.go -# break hard links -rm %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}/{textflag,funcdata,cgocall,runtime}.h -ln -s %{_datadir}/go/src/cmd/ld/textflag.h %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch} -ln -s %{_datadir}/go/src/runtime/{runtime,cgocall,funcdata}.h %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch} - %if 0%{?suse_version} >= 1100 -%fdupes %{buildroot}%{_prefix} +%fdupes -s %{buildroot}%{_prefix} %endif +%post +update-alternatives \ + --install %{_bindir}/go go %{_libdir}/%{name}/bin/go 30 \ + --slave %{_bindir}/gofmt gofmt %{_libdir}/%{name}/bin/gofmt \ + --slave %{_sysconfdir}/profile.d/go.sh go.sh %{_libdir}/%{name}/bin/profile.d/go.sh + +%postun +if [ $1 -eq 0 ] ; then + update-alternatives --remove go %{_libdir}/%{name}/bin/go +fi + %files %defattr(-,root,root,-) -%doc AUTHORS CONTRIBUTORS LICENSE PATENTS README README-openSUSE -%ifarch %ix86 -%{_libdir}/go/pkg/tool/linux_%{go_arch}/8* -%endif -%ifarch x86_64 -%{_libdir}/go/pkg/tool/linux_%{go_arch}/6* -%endif -%ifarch %arm -%{_libdir}/go/pkg/tool/linux_%{go_arch}/5* -%endif -%{_datadir}/go/ -%{_bindir}/go* +%{_bindir}/go +%{_bindir}/gofmt %{_libdir}/go/ -# bash completion seems broken -#%%config %%{_sysconfdir}/bash_completion.d/go.sh +%{_datadir}/go/ +%ghost %{_sysconfdir}/alternatives/go +%ghost %{_sysconfdir}/alternatives/gofmt +%ghost %{_sysconfdir}/alternatives/go.sh %config %{_sysconfdir}/profile.d/go.sh %config %{_sysconfdir}/rpm/macros.go +%dir %{_docdir}/%{name}/ +%doc %{_docdir}/%{name}/AUTHORS +%doc %{_docdir}/%{name}/CONTRIBUTORS +%doc %{_docdir}/%{name}/CONTRIBUTING.md +%doc %{_docdir}/%{name}/LICENSE +%doc %{_docdir}/%{name}/PATENTS +%doc %{_docdir}/%{name}/README.md +%doc %{_docdir}/%{name}/README.SUSE %files doc %defattr(-,root,root,-) -%doc doc +%doc %{_docdir}/%{name}/codewalk +%doc %{_docdir}/%{name}/articles +%doc %{_docdir}/%{name}/progs +%doc %{_docdir}/%{name}/play +%doc %{_docdir}/%{name}/gopher +%doc %{_docdir}/%{name}/devel +%doc %{_docdir}/%{name}/*.html +%doc %{_docdir}/%{name}/*.css +%doc %{_docdir}/%{name}/*.png %changelog ++++++ README-openSUSE -> README.SUSE ++++++ ++++++ allow-binary-only-packages.patch ++++++ --- /var/tmp/diff_new_pack.jwjoTZ/_old 2015-09-02 00:36:00.000000000 +0200 +++ /var/tmp/diff_new_pack.jwjoTZ/_new 2015-09-02 00:36:00.000000000 +0200 @@ -2,12 +2,12 @@ =================================================================== --- go.orig/src/cmd/go/pkg.go +++ go/src/cmd/go/pkg.go -@@ -264,7 +264,7 @@ func loadImport(path string, srcDir stri +@@ -341,7 +341,7 @@ func loadImport(path, srcDir string, par // // TODO: After Go 1, decide when to pass build.AllowBinary here. // See issue 3268 for mistakes to avoid. - bp, err := buildContext.Import(path, srcDir, build.ImportComment) + bp, err := buildContext.Import(path, srcDir, build.AllowBinary | build.ImportComment) - bp.ImportPath = importPath - if gobin != "" { - bp.BinDir = gobin + + // If we got an error from go/build about package not found, + // it contains the directories from $GOROOT and $GOPATH that ++++++ fix_certificates_lookup.patch ++++++ --- /var/tmp/diff_new_pack.jwjoTZ/_old 2015-09-02 00:36:00.000000000 +0200 +++ /var/tmp/diff_new_pack.jwjoTZ/_new 2015-09-02 00:36:00.000000000 +0200 @@ -1,8 +1,22 @@ +Index: go/src/crypto/x509/root_linux.go +=================================================================== +--- go.orig/src/crypto/x509/root_linux.go ++++ go/src/crypto/x509/root_linux.go +@@ -6,8 +6,5 @@ package x509 + + // Possible certificate files; stop after finding one. + var certFiles = []string{ +- "/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc. +- "/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL +- "/etc/ssl/ca-bundle.pem", // OpenSUSE +- "/etc/pki/tls/cacert.pem", // OpenELEC ++ "/etc/ssl/ca-bundle.pem", // openSUSE and SLE12+ + } Index: go/src/crypto/x509/root_unix.go =================================================================== --- go.orig/src/crypto/x509/root_unix.go +++ go/src/crypto/x509/root_unix.go -@@ -6,24 +6,20 @@ +@@ -6,12 +6,15 @@ package x509 @@ -12,32 +26,20 @@ + "os" +) - // Possible certificate files; stop after finding one. - var certFiles = []string{ -- "/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc. -- "/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL -- "/etc/ssl/ca-bundle.pem", // OpenSUSE -- "/etc/ssl/cert.pem", // OpenBSD -- "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly -- "/etc/pki/tls/cacert.pem", // OpenELEC -- "/etc/certs/ca-certificates.crt", // Solaris 11.2+ -+ "/etc/ssl/ca-bundle.pem", // openSUSE and SLE12+ - } - // Possible directories with certificate files; stop after successfully // reading at least one file from a directory. var certDirectories = []string{ - "/system/etc/security/cacerts", // Android -- + "/etc/ssl/certs", // SLE11 } func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { -@@ -41,22 +37,24 @@ func initSystemRoots() { +@@ -29,22 +32,26 @@ func initSystemRoots() { } } + rootsAdded := false ++ for _, directory := range certDirectories { fis, err := ioutil.ReadDir(directory) if err != nil { @@ -58,6 +60,7 @@ - return - } + } ++ + if rootsAdded { + systemRoots = roots } ++++++ gcc5-go.patch ++++++ Index: go/src/make.bash =================================================================== --- go.orig/src/make.bash +++ go/src/make.bash @@ -113,12 +113,12 @@ echo '##### Building Go bootstrap tool.' echo cmd/dist export GOROOT="$(cd .. && pwd)" GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:-$HOME/go1.4} -if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then +if [ ! -x "$GOROOT_BOOTSTRAP/bin/go-5" ]; then echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2 echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2 fi rm -f cmd/dist/dist -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist +GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go-5" build -o cmd/dist/dist ./cmd/dist # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) Index: go/src/cmd/dist/buildtool.go =================================================================== --- go.orig/src/cmd/dist/buildtool.go +++ go/src/cmd/dist/buildtool.go @@ -108,7 +108,7 @@ func bootstrapBuildTools() { os.Setenv("GOHOSTARCH", "") // Run Go 1.4 to build binaries. - run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go", goroot_bootstrap), "install", "-v", "bootstrap/...") + run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go-5", goroot_bootstrap), "install", "-v", "bootstrap/...") // Copy binaries into tool binary directory. for _, name := range bootstrapDirs { ++++++ go-1.5-build-dont-reinstall-stdlibs.patch ++++++ Index: go/src/cmd/go/build.go =================================================================== --- go.orig/src/cmd/go/build.go +++ go/src/cmd/go/build.go @@ -154,6 +154,7 @@ func init() { } // Flags set by multiple commands. +var buildS bool // OPENSUSE -s (for packaging only) var buildA bool // -a flag var buildN bool // -n flag var buildP = runtime.NumCPU() // -p flag @@ -210,6 +211,8 @@ func init() { // addBuildFlags adds the flags common to the build, clean, get, // install, list, run, and test commands. func addBuildFlags(cmd *Command) { + // OPENSUSE + cmd.Flag.BoolVar(&buildS, "s", false, "") cmd.Flag.BoolVar(&buildA, "a", false, "") cmd.Flag.BoolVar(&buildN, "n", false, "") cmd.Flag.IntVar(&buildP, "p", buildP, "") @@ -1503,6 +1506,11 @@ func (b *builder) linkShared(a *action) // install is the action for installing a single package or executable. func (b *builder) install(a *action) (err error) { + // OPENSUSE + if buildS && (a.p.Standard || a.p.ImportPath == "cmd/cgo") { + return nil + } + defer func() { if err != nil && err != errPrintedOutput { err = fmt.Errorf("go install %s: %v", a.p.ImportPath, err) ++++++ go-1.5-install-dont-reinstall-stdlibs.patch ++++++ Index: go/src/cmd/go/pkg.go =================================================================== --- go.orig/src/cmd/go/pkg.go +++ go/src/cmd/go/pkg.go @@ -1373,6 +1373,13 @@ func isStale(p *Package) bool { return false } + // openSUSE bnc#776058 + // Only root user can reinstall a std library from a dependancy, all other + // users should *never* have to do this. + if os.Getuid() != 0 && p.Standard { + return false + } + // Time-based staleness. built := fi.ModTime() ++++++ go.sh ++++++ --- /var/tmp/diff_new_pack.jwjoTZ/_old 2015-09-02 00:36:00.000000000 +0200 +++ /var/tmp/diff_new_pack.jwjoTZ/_new 2015-09-02 00:36:00.000000000 +0200 @@ -1,16 +1,26 @@ # go toolchain env paths -libdir=lib -arch=386 -if [ -x /usr/lib64/go ] ; then - libdir=lib64 - arch=amd64 -fi - export GOOS="linux" case "$(uname -m)" in *86) - export GOARCH=$arch - ;; + export GOARCH=386 + libdir=lib + ;; + x86_64) + export GOARCH=amd64 + libdir=lib64 + ;; + ppc64) + export GOARCH=ppc64 + libdir=lib64 + ;; + ppc64le) + export GOARCH=ppc64le + libdir=lib64 + ;; + arm*) + export GOARCH=arm + libdir=lib + ;; esac export GOROOT=/usr/$libdir/go export GOBIN=/usr/bin ++++++ go1.4.2.src.tar.gz -> go1.5.src.tar.gz ++++++ /work/SRC/openSUSE:Factory/go/go1.4.2.src.tar.gz /work/SRC/openSUSE:Factory/.go.new/go1.5.src.tar.gz differ: char 12, line 1 ++++++ macros.go ++++++ --- /var/tmp/diff_new_pack.jwjoTZ/_old 2015-09-02 00:36:00.000000000 +0200 +++ /var/tmp/diff_new_pack.jwjoTZ/_new 2015-09-02 00:36:00.000000000 +0200 @@ -18,7 +18,7 @@ %go_tooldir %{_datadir}/go/pkg/tool/linux_%{go_arch} %go_exclusivearch \ -ExclusiveArch: %ix86 x86_64 %arm +ExclusiveArch: %ix86 x86_64 %arm ppc64 ppc64le %go_provides \ %go_exclusivearch \ ++++++ verbose-build.patch ++++++ --- /var/tmp/diff_new_pack.jwjoTZ/_old 2015-09-02 00:36:00.000000000 +0200 +++ /var/tmp/diff_new_pack.jwjoTZ/_new 2015-09-02 00:36:00.000000000 +0200 @@ -2,18 +2,18 @@ =================================================================== --- go.orig/src/make.bash +++ go/src/make.bash -@@ -166,12 +166,12 @@ if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOH +@@ -153,12 +153,12 @@ if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOH # CC_FOR_TARGET is recorded as the default compiler for the go tool. When building for the host, however, # use the host compiler, CC, from `cmd/dist/dist env` instead. CC=$CC GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \ -- "$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std -+ "$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std +- "$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std cmd ++ "$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std cmd echo fi - echo "# Building packages and commands for $GOOS/$GOARCH." --CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std -+CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std + echo "##### Building packages and commands for $GOOS/$GOARCH." +-CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std cmd ++CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v -x std cmd echo rm -f "$GOTOOLDIR"/go_bootstrap

1 0

commit golang-packaging for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package golang-packaging for openSUSE:Factory checked in at 2015-09-02 00:35:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-packaging (Old) and /work/SRC/openSUSE:Factory/.golang-packaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-packaging" Changes: -------- --- /work/SRC/openSUSE:Factory/golang-packaging/golang-packaging.changes 2015-08-02 22:46:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.golang-packaging.new/golang-packaging.changes 2015-09-02 00:35:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 28 09:48:09 UTC 2015 - i(a)marguerite.su + +- update version 9 + *update golang(API) to 1.5 + +------------------------------------------------------------------- Old: ---- golang-packaging-8.tar.gz New: ---- golang-packaging-9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-packaging.spec ++++++ --- /var/tmp/diff_new_pack.xKqCPa/_old 2015-09-02 00:35:56.000000000 +0200 +++ /var/tmp/diff_new_pack.xKqCPa/_new 2015-09-02 00:35:56.000000000 +0200 @@ -21,16 +21,16 @@ %endif Name: golang-packaging -Version: 8 +Version: 9 Release: 0 Summary: A toolchain to help packaging golang License: GPL-3.0 Group: Development/Languages/Other Url: https://github.com/marguerite/%{name} -Source: https://github.com/marguerite/%{name}/archive/%{version}/%{name}-%{version}… +Source: https://github.com/marguerite/%{name}/archive/v%{version}/%{name}-%{version… BuildRequires: rpm Requires: ruby -Requires: golang(API) +Requires: golang(API) = 1.5 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ golang-packaging-8.tar.gz -> golang-packaging-9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-8/ChangeLog new/golang-packaging-9/ChangeLog --- old/golang-packaging-8/ChangeLog 2015-08-02 17:57:16.000000000 +0200 +++ new/golang-packaging-9/ChangeLog 2015-08-28 13:25:02.000000000 +0200 @@ -1,3 +1,20 @@ +== update version 9 == + + * update golang(API) to 1.5 + +== update version 8 == + + * skip the last "/" in golang.prov, thanks to matwey + +== udpate version 7 == + + * handle gopkg.in/* requirements + +== update version 6 == + + * fix golang.req to not treat a sentence as importpath + * fix golang.attr to correctly detect /usr/bin/* + == Version 5 == * if a sub-directory doesn't contain any *.go file, do not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/golang-packaging-8/golang.req new/golang-packaging-9/golang.req --- old/golang-packaging-8/golang.req 2015-08-02 17:57:16.000000000 +0200 +++ new/golang-packaging-9/golang.req 2015-08-28 13:25:02.000000000 +0200 @@ -143,7 +143,7 @@ end - importlist << "golang(API) = 1.4" + importlist << "golang(API) = 1.5" return importlist

1 0

commit golang-org-x-tools for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package golang-org-x-tools for openSUSE:Factory checked in at 2015-09-02 00:35:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-org-x-tools (Old) and /work/SRC/openSUSE:Factory/.golang-org-x-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-org-x-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/golang-org-x-tools/golang-org-x-tools.changes 2015-07-24 09:58:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.golang-org-x-tools.new/golang-org-x-tools.changes 2015-09-02 00:35:53.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 28 17:14:00 UTC 2015 - i(a)marguerite.su + +- Update to version 1.4.2+git20150825.b48dc8d: + + cmd/godoc: remove obsolete vet redirect + + imports: fix bug, where unused named import is mistaken for unnamed import. + + cmd/tipgodoc: change capitalization of 'Authors' to be consistent + + go/loader: fix fd leak and limit calls to ioutil.ReadDir + + website: fix JavaScript error on website and blog in non-ES6 browsers + + cmd/gotype: use std lib go/types instead of x/tools version + + cmd/gotype: keep gotype working with Go1.4 +- cover/vert are merged in mainline go 1.5, so strip them off. + +------------------------------------------------------------------- Old: ---- tools-1.4.2+git20150710.4cd43f3.tar.xz New: ---- _servicedata tools-1.4.2+git20150825.b48dc8d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-org-x-tools.spec ++++++ --- /var/tmp/diff_new_pack.10N6dp/_old 2015-09-02 00:35:54.000000000 +0200 +++ /var/tmp/diff_new_pack.10N6dp/_new 2015-09-02 00:35:54.000000000 +0200 @@ -2,7 +2,6 @@ # spec file for package golang-org-x-tools # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2012 Graham Anderson <graham.anderson(a)gmail.com> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +17,7 @@ Name: golang-org-x-tools -Version: 1.4.2+git20150710.4cd43f3 +Version: 1.4.2+git20150825.b48dc8d Release: 0 Summary: Additional toolsgraphy libraries License: BSD-3-Clause @@ -27,13 +26,13 @@ Source: tools-%{version}.tar.xz Source1: godoc.service Source2: %{name}-rpmlintrc +BuildRequires: go-mango-doc BuildRequires: golang-packaging +BuildRequires: update-alternatives +BuildRequires: xz BuildRequires: golang(golang.org/x/net) BuildRequires: golang(golang.org/x/oauth2) BuildRequires: golang(google.golang.org/api) -BuildRequires: go-mango-doc -BuildRequires: update-alternatives -BuildRequires: xz Provides: go-go.tools = %{version} Obsoletes: go-go.tools < %{version} Provides: go-tools = %{version} @@ -56,12 +55,13 @@ %prep %setup -q -n tools-%{version} +# cover/vet are merged in mainline go 1.5 +rm -rf cover +rm -rf cmd/cover +rm -rf cmd/vet %build %goprep golang.org/x/tools - -# We need to set GOROOT_TARGET for go to export vet and cover at the proper place -export GOROOT_TARGET="%{buildroot}%{_libdir}/go" %gobuild ... cd %{_builddir}/tools-%{version} @@ -80,12 +80,6 @@ %goinstall %gosrc -# update-alternatives -mv %{buildroot}%{_mandir}/man1/cover.1 %{buildroot}%{_mandir}/man1/cover-go.1 -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/cover.1.gz -ln -sf %{_sysconfdir}/alternatives/cover.1.gz %{buildroot}%{_mandir}/man1/cover.1.gz - %if 0%{?suse_version} >= 1100 %fdupes %{buildroot}%{_prefix} %endif @@ -99,9 +93,6 @@ %if 0%{?suse_version} >= 1210 %service_add_post godoc.service %endif -update-alternatives \ - --install %{_mandir}/man1/cover.1.gz cover.1.gz \ - %{_mandir}/man1/cover-go.1.gz 30 %preun %if 0%{?suse_version} >= 1210 @@ -112,19 +103,14 @@ %if 0%{?suse_version} >= 1210 %service_del_postun godoc.service %endif -if [ $1 -eq 0 ] ; then - update-alternatives --remove cover.1.gz %{_mandir}/man1/cover-go.1.gz -fi %files %defattr(-,root,root,-) %doc LICENSE README CONTRIBUTORS AUTHORS PATENTS -%ghost %{_sysconfdir}/alternatives/cover.1.gz %{go_contribdir}/* %if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 16 %{_unitdir}/godoc.service %endif -%{_libdir}/go/pkg/tool/*/* %{_bindir}/benchcmp %{_bindir}/callgraph %{_bindir}/digraph @@ -145,8 +131,6 @@ %{_bindir}/tipgodoc %{_mandir}/man1/benchcmp.1* %{_mandir}/man1/callgraph.1* -%{_mandir}/man1/cover.1* -%{_mandir}/man1/cover-go.1* %{_mandir}/man1/digraph.1* %{_mandir}/man1/eg.1* %{_mandir}/man1/fiximports.1* @@ -163,7 +147,6 @@ %{_mandir}/man1/stress.1* %{_mandir}/man1/stringer.1* %{_mandir}/man1/tipgodoc.1* -%{_mandir}/man1/vet.1* %files source %defattr(-,root,root,-) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.10N6dp/_old 2015-09-02 00:35:54.000000000 +0200 +++ /var/tmp/diff_new_pack.10N6dp/_new 2015-09-02 00:35:54.000000000 +0200 @@ -1,16 +1,17 @@ <services> - <service name="tar_scm" mode="localonly"> + <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/golang/tools</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">1.4.2+git%cd.%h</param> <param name="revision">master</param> + <param name="changesgenerate">enable</param> </service> - <service name="recompress" mode="localonly"> + <service name="recompress" mode="disabled"> <param name="file">tools-*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="localonly"> + <service name="set_version" mode="disabled"> <param name="basename">tools</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/golang/tools</param> <param name="changesrevision">b48dc8da98ae78c3d11f220e7d327304c84e623a</param></service></servicedata>++++++ tools-1.4.2+git20150710.4cd43f3.tar.xz -> tools-1.4.2+git20150825.b48dc8d.tar.xz ++++++ ++++ 2503 lines of diff (skipped)

1 0

commit python-cliff for openSUSE:Factory
by root＠hilbert.suse.de 01 Sep '15

01 Sep '15

Hello community, here is the log from the commit of package python-cliff for openSUSE:Factory checked in at 2015-09-02 00:35:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cliff (Old) and /work/SRC/openSUSE:Factory/.python-cliff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cliff" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cliff/python-cliff.changes 2015-08-01 11:37:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cliff.new/python-cliff.changes 2015-09-02 00:35:51.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Aug 21 09:06:27 UTC 2015 - tbechtold(a)suse.com + +- update to 1.14.0: + * Add csv formatter test + * Fix encoding issue with the default python csv output + * Remove py26 as a default test from tox.ini + * Set demo app up with deferred help + * Add command fuzzy matching + * Updated from global requirements + * Remove requirements.txt from tox.ini + * Updated from global requirements + * Updated from global requirements + * Allow subcommands to accept --help when using 'deferred_help' + * Updated from global requirements + * Fix logging config in demo app + * Use base command for help test + * Updated from global requirements + * Include the automatically-generated changelog + * Updated from global requirements +- Adjust Requires according to requirements.txt +- Refreshed relax-sphinx-requirement.patch + +------------------------------------------------------------------- Old: ---- cliff-1.13.0.tar.gz New: ---- cliff-1.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cliff.spec ++++++ --- /var/tmp/diff_new_pack.bnvs7r/_old 2015-09-02 00:35:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bnvs7r/_new 2015-09-02 00:35:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-cliff -Version: 1.13.0 +Version: 1.14.0 Release: 0 Url: https://github.com/dreamhost/cliff Summary: Command Line Interface Formulation Framework @@ -35,7 +35,7 @@ BuildRequires: python-cmd2 BuildRequires: python-coverage >= 3.6 BuildRequires: python-httplib2 >= 0.7.5 -BuildRequires: python-mock >= 1.0 +BuildRequires: python-mock >= 1.2 BuildRequires: python-nose BuildRequires: python-oslosphinx BuildRequires: python-pbr @@ -49,7 +49,8 @@ Requires: python-cmd2 >= 0.6.7 Requires: python-pyparsing >= 2.0.1 Requires: python-six >= 1.9.0 -Requires: python-stevedore >= 1.1.0 +Requires: python-stevedore >= 1.5.0 +Requires: python-unicodecsv >= 0.8.0 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %py_requires ++++++ cliff-1.13.0.tar.gz -> cliff-1.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/AUTHORS new/cliff-1.14.0/AUTHORS --- old/cliff-1.13.0/AUTHORS 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/AUTHORS 2015-08-10 22:16:17.000000000 +0200 @@ -6,6 +6,7 @@ Christophe CHAUVET <christophe.chauvet(a)gmail.com> Clint Byrum <clint(a)fewbar.com> Dean Troyer <dtroyer(a)gmail.com> +Derek Higgins <derekh(a)redhat.com> Dirk Mueller <dirk(a)dmllr.de> Dirk Mueller <dirk@dmllr> Doug Hellmann <doug.hellmann(a)dreamhost.com> @@ -25,11 +26,14 @@ Qiu Yu <qiuyu(a)ebaysf.com> Ryan Petrello <lists(a)ryanpetrello.com> Sascha Peilicke <saschpe(a)gmx.de> +Sean Perry <sean.perry(a)hp.com> Terry Howe <terrylhowe(a)gmail.com> TerryHowe <terrylhowe(a)gmail.com> Thomas Bechtold <tbechtold(a)suse.com> Tomaz Muraus <tomaz(a)tomaz.me> Yalei Wang <yalei.wang(a)intel.com> +gcmalloc <gcmalloc(a)gmail.com> heavenshell <heavenshell.jp(a)gmail.com> +kafka <guowang(a)unitedstack.com> markmcclain <mark(a)four-m.org> qneill <quentin.neill(a)gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/ChangeLog new/cliff-1.14.0/ChangeLog --- old/cliff-1.13.0/ChangeLog 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/ChangeLog 2015-08-10 22:16:17.000000000 +0200 @@ -1,6 +1,26 @@ CHANGES ======= +1.14.0 +------ + +* Add csv formatter test +* Fix encoding issue with the default python csv output +* Remove py26 as a default test from tox.ini +* Set demo app up with deferred help +* Add command fuzzy matching +* Updated from global requirements +* Remove requirements.txt from tox.ini +* Updated from global requirements +* Updated from global requirements +* Allow subcommands to accept --help when using 'deferred_help' +* Updated from global requirements +* Fix logging config in demo app +* Use base command for help test +* Updated from global requirements +* Include the automatically-generated changelog +* Updated from global requirements + 1.13.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/PKG-INFO new/cliff-1.14.0/PKG-INFO --- old/cliff-1.13.0/PKG-INFO 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/PKG-INFO 2015-08-10 22:16:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cliff -Version: 1.13.0 +Version: 1.14.0 Summary: Command Line Interface Formulation Framework Home-page: https://launchpad.net/python-cliff Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff/app.py new/cliff-1.14.0/cliff/app.py --- old/cliff-1.13.0/cliff/app.py 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/cliff/app.py 2015-08-10 22:16:00.000000000 +0200 @@ -9,9 +9,11 @@ import logging.handlers import os import sys +import operator from .complete import CompleteCommand from .help import HelpAction, HelpCommand +from .utils import damerau_levenshtein, COST # Make sure the cliff library has a logging handler # in case the app developer doesn't set up logging. @@ -221,6 +223,18 @@ self.options, remainder = self.parser.parse_known_args(argv) self.configure_logging() self.interactive_mode = not remainder + if self.deferred_help and self.options.deferred_help and remainder: + # When help is requested and `remainder` has any values disable + # `deferred_help` and instead allow the help subcommand to + # handle the request during run_subcommand(). This turns + # "app foo bar --help" into "app help foo bar". However, when + # `remainder` is empty use print_help_if_requested() to allow + # for an early exit. + # Disabling `deferred_help` here also ensures that + # print_help_if_requested will not fire if called by a subclass + # during its initialize_app(). + self.options.deferred_help = False + remainder.insert(0, "help") self.initialize_app(remainder) self.print_help_if_requested() except Exception as err: @@ -287,14 +301,60 @@ self.interpreter.cmdloop() return 0 + def get_fuzzy_matches(self, cmd): + """return fuzzy matches of unknown command + """ + + sep = '_' + if self.command_manager.convert_underscores: + sep = ' ' + all_cmds = [k[0] for k in self.command_manager] + dist = [] + for candidate in sorted(all_cmds): + prefix = candidate.split(sep)[0] + # Give prefix match a very good score + if candidate.startswith(cmd): + dist.append((candidate, 0)) + continue + # Levenshtein distance + dist.append((candidate, damerau_levenshtein(cmd, prefix, COST)+1)) + dist = sorted(dist, key=operator.itemgetter(1, 0)) + matches = [] + i = 0 + # Find the best similarity + while (not dist[i][1]): + matches.append(dist[i][0]) + i += 1 + best_similarity = dist[i][1] + while (dist[i][1] == best_similarity): + matches.append(dist[i][0]) + i += 1 + + return matches + def run_subcommand(self, argv): try: subcommand = self.command_manager.find_command(argv) except ValueError as err: - if self.options.debug: - raise + # If there was no exact match, try to find a fuzzy match + the_cmd = argv[0] + fuzzy_matches = self.get_fuzzy_matches(the_cmd) + if fuzzy_matches: + article = 'a' + if self.NAME[0] in 'aeiou': + article = 'an' + self.stdout.write('%s: \'%s\' is not %s %s command. ' + 'See \'%s --help\'.\n' + % (self.NAME, the_cmd, article, + self.NAME, self.NAME)) + self.stdout.write('Did you mean one of these?\n') + for match in fuzzy_matches: + self.stdout.write(' %s\n' % match) else: - self.LOG.error(err) + if self.options.debug: + raise + else: + self.LOG.error(err) return 2 cmd_factory, cmd_name, sub_argv = subcommand kwargs = {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff/formatters/commaseparated.py new/cliff-1.14.0/cliff/formatters/commaseparated.py --- old/cliff-1.13.0/cliff/formatters/commaseparated.py 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/cliff/formatters/commaseparated.py 2015-08-10 22:16:00.000000000 +0200 @@ -1,7 +1,7 @@ """Output formatters using csv format. """ -import csv +import unicodecsv as csv import os from .base import ListFormatter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff/tests/test_app.py new/cliff-1.14.0/cliff/tests/test_app.py --- old/cliff-1.13.0/cliff/tests/test_app.py 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/cliff/tests/test_app.py 2015-08-10 22:16:00.000000000 +0200 @@ -3,8 +3,7 @@ try: from StringIO import StringIO except ImportError: - # Probably python 3, that test won't be run so ignore the error - pass + from io import StringIO import sys import nose @@ -13,6 +12,7 @@ from cliff.app import App from cliff.command import Command from cliff.commandmanager import CommandManager +from cliff.tests import utils def make_app(**kwargs): @@ -401,6 +401,26 @@ _test_help(True) +def test_subcommand_help(): + app, _ = make_app(deferred_help=False) + + # Help is called immediately + with mock.patch('cliff.help.HelpAction.__call__') as helper: + app.run(['show', 'files', '--help']) + + assert helper.called + + +def test_subcommand_deferred_help(): + app, _ = make_app(deferred_help=True) + + # Show that provide_help_if_requested() did not show help and exit + with mock.patch.object(app, 'run_subcommand') as helper: + app.run(['show', 'files', '--help']) + + helper.assert_called_once_with(['help', 'show', 'files']) + + def test_unknown_cmd(): app, command = make_app() assert app.run(['hell']) == 2 @@ -412,3 +432,19 @@ app.run(['--debug', 'hell']) == 2 except ValueError as err: assert "['hell']" in ('%s' % err) + + +def test_list_matching_commands(): + stdout = StringIO() + app = App('testing', '1', + utils.TestCommandManager(utils.TEST_NAMESPACE), + stdout=stdout) + app.NAME = 'test' + try: + assert app.run(['t']) == 2 + except SystemExit: + pass + output = stdout.getvalue() + assert "test: 't' is not a test command. See 'test --help'." in output + assert 'Did you mean one of these?' in output + assert 'three word command\n two words\n' in output diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff/tests/test_formatters_csv.py new/cliff-1.14.0/cliff/tests/test_formatters_csv.py --- old/cliff-1.13.0/cliff/tests/test_formatters_csv.py 1970-01-01 01:00:00.000000000 +0100 +++ new/cliff-1.14.0/cliff/tests/test_formatters_csv.py 2015-08-10 22:16:00.000000000 +0200 @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +import mock + +import six + +from cliff.formatters import commaseparated + + +def test_commaseparated_list_formatter(): + sf = commaseparated.CSVLister() + c = ('a', 'b', 'c') + d1 = ('A', 'B', 'C') + d2 = ('D', 'E', 'F') + data = [d1, d2] + expected = 'a,b,c\nA,B,C\nD,E,F\n' + output = six.StringIO() + parsed_args = mock.Mock() + parsed_args.quote_mode = 'none' + sf.emit_list(c, data, output, parsed_args) + actual = output.getvalue() + assert expected == actual + + +def test_commaseparated_list_formatter_unicode(): + sf = commaseparated.CSVLister() + c = (u'a', u'b', u'c') + d1 = (u'A', u'B', u'C') + happy = u'高兴' + d2 = (u'D', u'E', happy) + data = [d1, d2] + expected = u'a,b,c\nA,B,C\nD,E,%s\n' % happy + output = six.StringIO() + parsed_args = mock.Mock() + parsed_args.quote_mode = 'none' + sf.emit_list(c, data, output, parsed_args) + actual = output.getvalue() + if six.PY2: + actual = actual.decode('utf-8') + assert expected == actual diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff/tests/test_help.py new/cliff-1.14.0/cliff/tests/test_help.py --- old/cliff-1.13.0/cliff/tests/test_help.py 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/cliff/tests/test_help.py 2015-08-10 22:16:00.000000000 +0200 @@ -2,6 +2,8 @@ from StringIO import StringIO except: from io import StringIO +import os +import sys import mock @@ -89,7 +91,8 @@ except SystemExit: pass help_text = stdout.getvalue() - assert 'usage: nosetests [--version]' in help_text + basecommand = os.path.split(sys.argv[0])[1] + assert 'usage: %s [--version]' % basecommand in help_text assert 'optional arguments:\n --version' in help_text assert 'one \n three word command \n' in help_text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff/utils.py new/cliff-1.14.0/cliff/utils.py --- old/cliff-1.13.0/cliff/utils.py 1970-01-01 01:00:00.000000000 +0100 +++ new/cliff-1.14.0/cliff/utils.py 2015-08-10 22:16:00.000000000 +0200 @@ -0,0 +1,88 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Each edit operation is assigned different cost, such as: +# 'w' means swap operation, the cost is 0; +# 's' means substitution operation, the cost is 2; +# 'a' means insertion operation, the cost is 1; +# 'd' means deletion operation, the cost is 3; +# The smaller cost results in the better similarity. +COST = {'w': 0, 's': 2, 'a': 1, 'd': 3} + + +def damerau_levenshtein(s1, s2, cost): + """Calculates the Damerau-Levenshtein distance between two strings. + + The Levenshtein distance says the minimum number of single-character edits + (i.e. insertions, deletions, swap or substitution) required to change one + string to the other. + The idea is to reserve a matrix to hold the Levenshtein distances between + all prefixes of the first string and all prefixes of the second, then we + can compute the values in the matrix in a dynamic programming fashion. To + avoid a large space complexity, only the last three rows in the matrix is + needed.(row2 holds the current row, row1 holds the previous row, and row0 + the row before that.) + + More details: + https://en.wikipedia.org/wiki/Levenshtein_distance + https://github.com/git/git/commit/8af84dadb142f7321ff0ce8690385e99da8ede2f + """ + + if s1 == s2: + return 0 + + len1 = len(s1) + len2 = len(s2) + + if len1 == 0: + return len2 * cost['a'] + if len2 == 0: + return len1 * cost['d'] + + row1 = [i * cost['a'] for i in range(len2 + 1)] + row2 = row1[:] + row0 = row1[:] + + for i in range(len1): + row2[0] = (i + 1) * cost['d'] + + for j in range(len2): + + # substitution + sub_cost = row1[j] + (s1[i] != s2[j]) * cost['s'] + + # insertion + ins_cost = row2[j] + cost['a'] + + # deletion + del_cost = row1[j + 1] + cost['d'] + + # swap + swp_condition = ((i > 0) + and (j > 0) + and (s1[i - 1] == s2[j]) + and (s1[i] == s2[j - 1]) + ) + + # min cost + if swp_condition: + swp_cost = row0[j - 1] + cost['w'] + p_cost = min(sub_cost, ins_cost, del_cost, swp_cost) + else: + p_cost = min(sub_cost, ins_cost, del_cost) + + row2[j + 1] = p_cost + + row0, row1, row2 = row1, row2, row0 + + return row1[-1] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff.egg-info/PKG-INFO new/cliff-1.14.0/cliff.egg-info/PKG-INFO --- old/cliff-1.13.0/cliff.egg-info/PKG-INFO 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/cliff.egg-info/PKG-INFO 2015-08-10 22:16:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: cliff -Version: 1.13.0 +Version: 1.14.0 Summary: Command Line Interface Formulation Framework Home-page: https://launchpad.net/python-cliff Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff.egg-info/SOURCES.txt new/cliff-1.14.0/cliff.egg-info/SOURCES.txt --- old/cliff-1.13.0/cliff.egg-info/SOURCES.txt 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/cliff.egg-info/SOURCES.txt 2015-08-10 22:16:17.000000000 +0200 @@ -23,6 +23,7 @@ cliff/interactive.py cliff/lister.py cliff/show.py +cliff/utils.py cliff.egg-info/PKG-INFO cliff.egg-info/SOURCES.txt cliff.egg-info/dependency_links.txt @@ -42,6 +43,7 @@ cliff/tests/test_command.py cliff/tests/test_commandmanager.py cliff/tests/test_complete.py +cliff/tests/test_formatters_csv.py cliff/tests/test_formatters_shell.py cliff/tests/test_formatters_value.py cliff/tests/test_help.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff.egg-info/pbr.json new/cliff-1.14.0/cliff.egg-info/pbr.json --- old/cliff-1.13.0/cliff.egg-info/pbr.json 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/cliff.egg-info/pbr.json 2015-08-10 22:16:17.000000000 +0200 @@ -1 +1 @@ -{"git_version": "bff7d6b", "is_release": true} \ No newline at end of file +{"git_version": "3473869", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/cliff.egg-info/requires.txt new/cliff-1.14.0/cliff.egg-info/requires.txt --- old/cliff-1.13.0/cliff.egg-info/requires.txt 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/cliff.egg-info/requires.txt 2015-08-10 22:16:17.000000000 +0200 @@ -1,7 +1,8 @@ -pbr>=0.11,<2.0 +pbr<2.0,>=1.3 argparse cmd2>=0.6.7 -PrettyTable>=0.7,<0.8 +PrettyTable<0.8,>=0.7 pyparsing>=2.0.1 six>=1.9.0 -stevedore>=1.3.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 +unicodecsv>=0.8.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/demoapp/cliffdemo/main.py new/cliff-1.14.0/demoapp/cliffdemo/main.py --- old/cliff-1.13.0/demoapp/cliffdemo/main.py 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/demoapp/cliffdemo/main.py 2015-08-10 22:16:00.000000000 +0200 @@ -1,4 +1,3 @@ -import logging import sys from cliff.app import App @@ -7,25 +6,24 @@ class DemoApp(App): - log = logging.getLogger(__name__) - def __init__(self): super(DemoApp, self).__init__( description='cliff demo app', version='0.1', command_manager=CommandManager('cliff.demo'), + deferred_help=True, ) def initialize_app(self, argv): - self.log.debug('initialize_app') + self.LOG.debug('initialize_app') def prepare_to_run_command(self, cmd): - self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__) + self.LOG.debug('prepare_to_run_command %s', cmd.__class__.__name__) def clean_up(self, cmd, result, err): - self.log.debug('clean_up %s', cmd.__class__.__name__) + self.LOG.debug('clean_up %s', cmd.__class__.__name__) if err: - self.log.debug('got an error: %s', err) + self.LOG.debug('got an error: %s', err) def main(argv=sys.argv[1:]): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/doc/source/demoapp.rst new/cliff-1.14.0/doc/source/demoapp.rst --- old/cliff-1.13.0/doc/source/demoapp.rst 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/doc/source/demoapp.rst 2015-08-10 22:16:00.000000000 +0200 @@ -66,6 +66,10 @@ (.venv)$ cliffdemo help files +or the ``--help`` option:: + + (.venv)$ cliffdemo files --help + The Source ========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/doc/source/history.rst new/cliff-1.14.0/doc/source/history.rst --- old/cliff-1.13.0/doc/source/history.rst 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/doc/source/history.rst 2015-08-10 22:16:00.000000000 +0200 @@ -1,230 +1 @@ -================= - Release History -================= - -1.7.0 ------ - -* Updated dependencies from OpenStack global requirements -* Clean up default tox environment list -* Do not allow wheels for stable tests -* Set the main logger name to match the application -* CSV formatter should use system-dependent line ending -* Make show option compatible with Python 2.6 -* Use six.add_metaclass instead of __metaclass__ -* fixed typos found by RETF rules -* The --variable option to shell format is redundant -* Expose load_commands publicly -* Fix wrong method name assert_called_once -* Fix pep8 failures on rule E265 - -1.6.1 ------ - -* Remove PrettyTable from documentation requirements -* Fix a bug in ShellFormatter's escaping of double quotes in strings -* Import run_cross_tests.sh from oslo-incubator -* add doc requirements to venv - -1.6.0 ------ - -* Add max-width support for table formatter -* Add value only output formattter -* Update readme with links to bug tracker and source -* Move pep8 dependency into pep8 tox test -* Fix doc build with Python 2.6.x -* Fix interactive mode with command line args -* Update .gitreview after repo rename -* Escape double quotes in shell formatter -* Add unit test for shell formatter -* Rename private attribute to avoid conflict -* Sync with global requirements -* Add integration tests with known consumers -* update history for previous change -* Make the formatters a private part of the command - -1.5.2 ------ - -- Fix the arguments passed to commands when they are instantiated to - pull out help. See https://github.com/dreamhost/cliff/issues/52 for - details. -- Add bash command completion. (Contributed by Terry Howe) -- Use stevedore to load formatter plugins. -- Use pbr for packaging. - -1.4.5 ------ - -- Update the pyparsing dependency to a version that supports both - Python 2 and Python 3. -- Add PyPy testing. - -1.4.4 ------ - -- Provide better error handling for unknown commands run from the - command line. (Contributed by Christophe Chauvet.) - -1.4.3 ------ - -- More stdout encoding issues with Python 2.6. - -1.4.2 ------ - -- Fix an issue with unicode output under Python 2.6. See - https://github.com/dreamhost/cliff/pull/40 for details. - -1.4.1 ------ - -- Add ``dict2columns`` method to ``ShowOne``. (Contributed by Dean - Troyer) -- Pin the requirement for cmd2 more tightly. - -1.4 ---- - -- Store a reference to the InteractiveApp on the App while in - interactive mode to allow commands to update the interactive - state. (Contributed by Tomaz Muraus) -- Remove reliance on distribute, now that it has merged with - setuptools 0.7. Providing an explicit dependency on setuptools - breaks updates in some cases, so just fail if it isn't there. - -1.3.3 ------ - - - Restore compatibility with prettytable < 0.7.2 by forcing no - output if there is no data (instead of printing an empty - table). Contributed by Dirk Mueller. - - Update to allow cmd2 version 0.6.5.1. Contributed by Dirk Mueller. - -1.3.2 ------ - - - Add ``convert_underscores`` parameter to ``CommandManager`` ``__init__`` - method to allow underscores to be used in command names. This optional - argument is defaulted to True to maintain current behavior. - (contributed by Joe Server) - - Use flake8_ for style checking. - - Relax version requirement for PrettyTable dependency to allow - point releases of 0.7. - -.. _flake8: https://pypi.python.org/pypi/flake8 - -1.3.1 ------ - - - Sort list of commands in interactive help mode. (contributed by - Ilya Shakhat) - - Fix a dependency issue with PyParsing until the cmd2 package can - release an update setting the version of its dependency based on - the Python version. - -1.3 ---- - - - Allow user to pass ``argparse_kwargs`` argument to the - ``build_option_parser`` method. This argument can contain extra - keyword arguments which are passed to the ``ArgumentParser`` constructor. - (contributed by Tomaz Muraus) - - Updated documentation to include dependency on distribute. - -1.2.1 ------ - - - Fix problem with documentation packaging. - - Fix problem with missing ``izip`` import in ``lister.py``. - -1.2 ---- - - - Fix problem with interactive mode ``help`` command. - - Disable logging by default but add a ``--log-file`` option to - re-enable it at runtime. - - Add support for python 2.6. (contributed by Mark McClain for - OpenStack Quantum) - -1.1.2 ------ - - - Fix a packaging problem introduced in version 1.1. - -1.1 ---- - - - Move tablib support (JSON, YAML, and HTML formatters) to a - separate project to comply with Ubuntu packaging requirements. See - https://github.com/dreamhost/cliff-tablib - -1.0 ---- - - - Add trailing newlines after output from tablib-based formatters - (JSON, YAML, and HTML). Contributed by Matt Joyce. - - Some :pep:`8` fixes. - - Refactor the API in :class:`Command` to add :func:`take_action` - and make :func:`run` a concrete method. Existing users should only - need to rename :func:`run()` to :func:`take_action()` since the - function signatures have not changed. - - In :class:`Lister` and :class:`ShowOne` use :func:`take_action` - instead of :func:`get_data`. - -0.7 ---- - - - Clean up interactive mode flag setting. - - Add support for Python 2.6, contributed by heavenshell. - - Fix multi-word commands in interactive mode. - -0.6 ---- - - - Pass the non-global argument list to :func:`initialize_app` to be - used in initialization work. - -0.5.1 ------ - - - Remove pinned version requirement for PrettyTable until the - OpenStack clients catch up to the API change. - -0.5 ---- - - - Asking for help about a command by prefix lists all matching - commands. - - Add formatters for HTML, JSON, and YAML. - -0.4 ---- - - - Add shell formatter for single objects. - - Add interactive mode. - - Expand documentation. - -0.3 ---- - - - Add ShowOne base class for commands that show details about single - objects. - - Fix a problem with Lister when there is no data to be printed. - -0.2 ---- - - - Incorporate changes from dtroyer to replace use of optparse in App - with argparse. - - Added "help" subcommand to replace ``--help`` option handling in - subcommands. - -0.1 ---- - - - Initial public release. - - Included App, CommandManager, Lister, csv and table formatters, a - demo application, and basic documentation. +.. include:: ../../ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/requirements.txt new/cliff-1.14.0/requirements.txt --- old/cliff-1.13.0/requirements.txt 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/requirements.txt 2015-08-10 22:16:00.000000000 +0200 @@ -1,10 +1,11 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.11,<2.0 +pbr<2.0,>=1.3 argparse cmd2>=0.6.7 -PrettyTable>=0.7,<0.8 +PrettyTable<0.8,>=0.7 pyparsing>=2.0.1 six>=1.9.0 -stevedore>=1.3.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 +unicodecsv>=0.8.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/setup.cfg new/cliff-1.14.0/setup.cfg --- old/cliff-1.13.0/setup.cfg 2015-06-09 18:23:57.000000000 +0200 +++ new/cliff-1.14.0/setup.cfg 2015-08-10 22:16:17.000000000 +0200 @@ -44,7 +44,7 @@ source-dir = doc/source [egg_info] +tag_build = tag_date = 0 tag_svn_revision = 0 -tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/setup.py new/cliff-1.14.0/setup.py --- old/cliff-1.13.0/setup.py 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/setup.py 2015-08-10 22:16:00.000000000 +0200 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,5 +25,5 @@ pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.3'], pbr=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/test-requirements.txt new/cliff-1.14.0/test-requirements.txt --- old/cliff-1.13.0/test-requirements.txt 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/test-requirements.txt 2015-08-10 22:16:00.000000000 +0200 @@ -2,9 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. nose -mock>=1.0 +mock>=1.2 coverage>=3.6 # this is required for the docs build jobs -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 httplib2>=0.7.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cliff-1.13.0/tox.ini new/cliff-1.14.0/tox.ini --- old/cliff-1.13.0/tox.ini 2015-06-09 18:23:37.000000000 +0200 +++ new/cliff-1.14.0/tox.ini 2015-08-10 22:16:00.000000000 +0200 @@ -1,13 +1,11 @@ [tox] -envlist = py34,py26,py27,pypy,pep8 +envlist = py34,py27,pypy,pep8 [testenv] distribute = False install_command = pip install -U {opts} {packages} commands = nosetests -d --with-coverage --cover-inclusive --cover-package cliff [] -deps = - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt [testenv:pep8] deps = flake8 ++++++ relax-sphinx-requirement.patch ++++++ --- /var/tmp/diff_new_pack.bnvs7r/_old 2015-09-02 00:35:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bnvs7r/_new 2015-09-02 00:35:52.000000000 +0200 @@ -1,10 +1,12 @@ ---- test-requirements.txt +Index: test-requirements.txt +=================================================================== +--- test-requirements.txt.orig +++ test-requirements.txt -@@ -5,6 +5,6 @@ - mock>=1.0 +@@ -5,6 +5,6 @@ nose + mock>=1.2 coverage>=3.6 # this is required for the docs build jobs --sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx - oslosphinx>=2.5.0 # Apache-2.0 + oslosphinx>=2.5.0 # Apache-2.0 httplib2>=0.7.5

1 0