Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-10-19 22:50:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-02 00:36:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-10-20 00:04:39.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Oct 12 18:33:02 UTC 2015 - [email protected] + +- update to 0.9.8 +* better %license logic +* fix handling of versions without '.' +* no duplicate test deps +* drop fix-macro-licence.patch + +------------------------------------------------------------------- Old: ---- cabal-rpm-0.9.7.tar.gz fix-macro-license.patch New: ---- cabal-rpm-0.9.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cabal-rpm.spec ++++++ --- /var/tmp/diff_new_pack.VBOPFi/_old 2015-10-20 00:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.VBOPFi/_new 2015-10-20 00:04:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version: 0.9.7 +Version: 0.9.8 Release: 0 Summary: RPM packaging tool for Haskell Cabal-based packages License: GPL-3.0+ @@ -25,9 +25,6 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz Source2: cabal-rpm.1 -# PATCH-FIX-UPSTREAM fix-macro-license.patch [email protected] 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 @@ -54,7 +51,6 @@ %prep %setup -q -%patch0 -p1 %build %define cabal_configure_options --flags="-old-locale" ++++++ cabal-rpm-0.9.7.tar.gz -> cabal-rpm-0.9.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.7/ChangeLog new/cabal-rpm-0.9.8/ChangeLog --- old/cabal-rpm-0.9.7/ChangeLog 2015-08-28 10:47:23.000000000 +0200 +++ new/cabal-rpm-0.9.8/ChangeLog 2015-10-08 05:36:01.000000000 +0200 @@ -1,3 +1,8 @@ +* 0.9.8 (2015-10-08) +- better %license logic +- fix handling of versions without '.' +- no duplicate test deps + * 0.9.7 (2015-08-28) - only list buildable executables in spec file - bring back 'build' as an alias for 'local' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.7/cabal-rpm.cabal new/cabal-rpm-0.9.8/cabal-rpm.cabal --- old/cabal-rpm-0.9.7/cabal-rpm.cabal 2015-08-28 10:47:23.000000000 +0200 +++ new/cabal-rpm-0.9.8/cabal-rpm.cabal 2015-10-08 05:36:01.000000000 +0200 @@ -1,5 +1,5 @@ Name: cabal-rpm -Version: 0.9.7 +Version: 0.9.8 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.7/src/Commands/Spec.hs new/cabal-rpm-0.9.8/src/Commands/Spec.hs --- old/cabal-rpm-0.9.7/src/Commands/Spec.hs 2015-08-28 10:47:23.000000000 +0200 +++ new/cabal-rpm-0.9.8/src/Commands/Spec.hs 2015-10-08 05:36:01.000000000 +0200 @@ -226,9 +226,9 @@ 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 @@ 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,10 +254,6 @@ 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 @@ -272,23 +268,24 @@ put "%install" put $ "%ghc_" ++ pkgType ++ "_install" + 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) + 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 + unless (null licensefiles || distro /= Fedora) $ 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) putNewline putNewline @@ -312,12 +309,14 @@ docs <- findDocs cabalPath licensefiles + let license_macro = if (distro == Fedora) then "%license" else "%doc" + when hasExecPkg $ do put "%files" 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 $ "%license" +-+ l) licensefiles + mapM_ (\ l -> put $ license_macro +-+ l) licensefiles unless (null docs) $ put $ "%doc" +-+ unwords docs @@ -333,7 +332,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 $ "%license" +-+ l) licensefiles + mapM_ (\ l -> put $ license_macro +-+ l) licensefiles -- be strict for now -- unless (null (dataFiles pkgDesc) || binlib) $ -- put "%{_datadir}/%{pkg_name}-%{version}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.7/src/Dependencies.hs new/cabal-rpm-0.9.8/src/Dependencies.hs --- old/cabal-rpm-0.9.7/src/Dependencies.hs 2015-08-28 10:47:23.000000000 +0200 +++ new/cabal-rpm-0.9.8/src/Dependencies.hs 2015-10-08 05:36:01.000000000 +0200 @@ -123,7 +123,7 @@ -> String -- ^self -> [String] -- ^depends testsuiteDependencies pkgDesc self = - map showDep . delete self . filter excludedPkgs . map depName . nub $ concatMap targetBuildDepends $ map testBuildInfo $ testSuites pkgDesc + map showDep . delete self . filter excludedPkgs . nub . map depName $ concatMap targetBuildDepends $ map testBuildInfo $ testSuites pkgDesc missingPackages :: PackageDescription -> IO [String] missingPackages pkgDesc = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.7/src/Main.hs new/cabal-rpm-0.9.8/src/Main.hs --- old/cabal-rpm-0.9.7/src/Main.hs 2015-08-28 10:47:23.000000000 +0200 +++ new/cabal-rpm-0.9.8/src/Main.hs 2015-10-08 05:36:01.000000000 +0200 @@ -27,7 +27,7 @@ import Setup (parseArgs) import Control.Exception (bracket) -import System.Directory (removeDirectoryRecursive) +import System.Directory (removeDirectoryRecursive) import System.Environment (getArgs) main :: IO () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.7/src/PackageUtils.hs new/cabal-rpm-0.9.8/src/PackageUtils.hs --- old/cabal-rpm-0.9.7/src/PackageUtils.hs 2015-08-28 10:47:23.000000000 +0200 +++ new/cabal-rpm-0.9.8/src/PackageUtils.hs 2015-10-08 05:36:01.000000000 +0200 @@ -202,7 +202,7 @@ tryUnpack :: String -> IO (FilePath, Maybe FilePath) tryUnpack pkg = do - pkgver <- if '.' `elem` pkg then return pkg else latestPkg pkg + pkgver <- if stripVersion pkg == pkg then latestPkg pkg else return pkg isdir <- doesDirectoryExist pkgver if isdir then do
