Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2016-01-28 17:23:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-20 00:04:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-01-28 17:23:49.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Jan 25 09:20:25 UTC 2016 - mimi...@gmail.com + +- update to 0.9.9 +- drop remove_exclusivearch.patch +- drop cabal-rpm.1 manpage, use instead link to upstream cblrpm.1 +* couple of minor improvements for SUSE packaging + +------------------------------------------------------------------- Old: ---- cabal-rpm-0.9.8.tar.gz cabal-rpm.1 New: ---- cabal-rpm-0.9.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cabal-rpm.spec ++++++ --- /var/tmp/diff_new_pack.dsT9st/_old 2016-01-28 17:23:50.000000000 +0100 +++ /var/tmp/diff_new_pack.dsT9st/_new 2016-01-28 17:23:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cabal-rpm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: cabal-rpm -Version: 0.9.8 +Version: 0.9.9 Release: 0 Summary: RPM packaging tool for Haskell Cabal-based packages License: GPL-3.0+ Group: Development/Tools/Other Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Source2: cabal-rpm.1 BuildRequires: ghc-Cabal-devel # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel @@ -53,16 +52,15 @@ %setup -q %build -%define cabal_configure_options --flags="-old-locale" %{ghc_bin_build} %install %{ghc_bin_install} install -p -m 0644 -D man/cblrpm.1 %{buildroot}%{_mandir}/man1/cblrpm.1 -install -p -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/ ln -s cblrpm %{buildroot}%{_bindir}/%{name} +ln -s %{_mandir}/man1/cblrpm.1 %{buildroot}%{_mandir}/man1/%{name}.1 %files %defattr(-,root,root,-) ++++++ cabal-rpm-0.9.8.tar.gz -> cabal-rpm-0.9.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/ChangeLog new/cabal-rpm-0.9.9/ChangeLog --- old/cabal-rpm-0.9.8/ChangeLog 2015-10-08 05:36:01.000000000 +0200 +++ new/cabal-rpm-0.9.9/ChangeLog 2016-01-25 10:33:19.000000000 +0100 @@ -1,3 +1,6 @@ +* 0.9.9 (2016-01-25) +- couple of minor improvements for SUSE packaging + * 0.9.8 (2015-10-08) - better %license logic - fix handling of versions without '.' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/cabal-rpm.cabal new/cabal-rpm-0.9.9/cabal-rpm.cabal --- old/cabal-rpm-0.9.8/cabal-rpm.cabal 2015-10-08 05:36:01.000000000 +0200 +++ new/cabal-rpm-0.9.9/cabal-rpm.cabal 2016-01-25 10:33:19.000000000 +0100 @@ -1,5 +1,5 @@ Name: cabal-rpm -Version: 0.9.8 +Version: 0.9.9 Synopsis: RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. @@ -17,7 +17,7 @@ Author: Jens Petersen <j...@community.haskell.org>, Bryan O'Sullivan <b...@serpentine.com> Maintainer: Jens Petersen <peter...@fedoraproject.org> Copyright: 2007-2008 Bryan O'Sullivan <b...@serpentine.com>, - 2012-2015 Jens Petersen <peter...@fedoraproject.org> + 2012-2016 Jens Petersen <peter...@fedoraproject.org> Category: Distribution Build-type: Simple Extra-source-files: README.md ChangeLog man/cblrpm.1.md man/cblrpm.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/src/Commands/Spec.hs new/cabal-rpm-0.9.9/src/Commands/Spec.hs --- old/cabal-rpm-0.9.8/src/Commands/Spec.hs 2015-10-08 05:36:01.000000000 +0200 +++ new/cabal-rpm-0.9.9/src/Commands/Spec.hs 2016-01-25 10:33:19.000000000 +0100 @@ -3,7 +3,7 @@ -- | -- Module : Commands.Spec -- Copyright : (C) 2007-2008 Bryan O'Sullivan --- (C) 2012-2015 Jens Petersen +-- (C) 2012-2016 Jens Petersen -- -- Maintainer : Jens Petersen <peter...@fedoraproject.org> -- Stability : alpha @@ -32,7 +32,7 @@ import Data.List (groupBy, intercalate, isPrefixOf, isSuffixOf, sort, (\\)) import Data.Maybe (fromMaybe) -import Data.Time.Clock (UTCTime, getCurrentTime) +import Data.Time.Clock (getCurrentTime) import Data.Time.Format (formatTime) import Data.Version (showVersion) @@ -58,13 +58,15 @@ import qualified Paths_cabal_rpm (version) -defaultRelease :: FilePath -> UTCTime -> IO String -defaultRelease cabalPath now = do +defaultRelease :: FilePath -> Distro -> IO String +defaultRelease cabalPath distro = do let pkgDir = takeDirectory cabalPath scmRepo <- isScmDir pkgDir - return $ if scmRepo - then formatTime defaultTimeLocale "0.%Y%m%d" now - else "1" + if scmRepo + then do + now <- getCurrentTime + return $ formatTime defaultTimeLocale "0.%Y%m%d" now + else return $ if (distro == SUSE) then "0" else "1" rstrip :: (Char -> Bool) -> String -> String rstrip p = reverse . dropWhile p . reverse @@ -80,15 +82,11 @@ verbose = rpmVerbosity flags hasExec = hasExes pkgDesc hasLib = hasLibs pkgDesc - now <- getCurrentTime - defRelease <- defaultRelease cabalPath now (pkgname, binlib) <- getPkgName mspec pkgDesc (rpmBinary flags) let pkg_name = if pkgname == name then "%{name}" else "%{pkg_name}" basename | binlib = "%{pkg_name}" | hasExecPkg = name | otherwise = "ghc-%{pkg_name}" - version = packageVersion pkg - release = fromMaybe defRelease (rpmRelease flags) specFile = fromMaybe "" mdest </> pkgname ++ ".spec" hasExecPkg = binlib || (hasExec && not hasLib) -- run commands before opening file to prevent empty file on error @@ -119,6 +117,7 @@ if distro /= SUSE then put "# https://fedoraproject.org/wiki/Packaging:Haskell"; else do + now <- getCurrentTime let year = formatTime defaultTimeLocale "%Y" now put "#" put $ "# spec file for package " ++ pkgname @@ -178,6 +177,9 @@ -- putDef "debug_package" "%{nil}" -- putNewline + defRelease <- defaultRelease cabalPath distro + let version = packageVersion pkg + release = fromMaybe defRelease (rpmRelease flags) putHdr "Name" (if binlib then "%{pkg_name}" else basename) putHdr "Version" version putHdr "Release" $ release ++ (if distro == SUSE then [] else "%{?dist}") @@ -205,7 +207,8 @@ unless (null $ alldeps ++ extraTestDeps) $ do put "# Begin cabal-rpm deps:" mapM_ (putHdr "BuildRequires") alldeps - when (any (\ d -> d `elem` map showDep ["template-haskell", "hamlet"]) deps) $ + when (distro /= SUSE && + any (\ d -> d `elem` map showDep ["template-haskell", "hamlet"]) deps) $ putHdr "ExclusiveArch" "%{ghc_arches_with_ghci}" unless (null extraTestDeps) $ do put "%if %{with tests}" @@ -349,6 +352,7 @@ put "%changelog" unless (distro == SUSE) $ do + now <- getCurrentTime let date = formatTime defaultTimeLocale "%a %b %e %Y" now put $ "*" +-+ date +-+ "Fedora Haskell SIG <hask...@lists.fedoraproject.org> - " ++ version ++ "-" ++ release put $ "- spec file generated by cabal-rpm-" ++ showVersion Paths_cabal_rpm.version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.8/src/Dependencies.hs new/cabal-rpm-0.9.9/src/Dependencies.hs --- old/cabal-rpm-0.9.8/src/Dependencies.hs 2015-10-08 05:36:01.000000000 +0200 +++ new/cabal-rpm-0.9.9/src/Dependencies.hs 2016-01-25 10:33:19.000000000 +0100 @@ -1,6 +1,6 @@ -- | -- Module : Dependencies --- Copyright : (C) 2012-2015 Jens Petersen +-- Copyright : (C) 2012-2016 Jens Petersen -- -- Maintainer : Jens Petersen <peter...@fedoraproject.org> -- Stability : alpha @@ -123,7 +123,7 @@ -> String -- ^self -> [String] -- ^depends testsuiteDependencies pkgDesc self = - map showDep . delete self . filter excludedPkgs . nub . map depName $ concatMap targetBuildDepends $ map testBuildInfo $ testSuites pkgDesc + map showDep . delete self . filter excludedPkgs . nub . map depName $ concatMap (targetBuildDepends . testBuildInfo) (testSuites pkgDesc) missingPackages :: PackageDescription -> IO [String] missingPackages pkgDesc = do
