commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2017-04-12 17:34:41 Comparing /work/SRC/openSUSE:Factory/cabal-rpm (Old) and /work/SRC/openSUSE:Factory/.cabal-rpm.new (New) Package is "cabal-rpm" Wed Apr 12 17:34:41 2017 rev:18 rq:485098 version:0.11.1 Changes: --- /work/SRC/openSUSE:Factory/cabal-rpm/cabal-rpm.changes 2017-03-14 10:04:00.205987484 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2017-04-12 18:01:20.772112110 +0200 @@ -1,0 +2,5 @@ +Mon Mar 27 12:39:27 UTC 2017 - psim...@suse.com + +- Update to version 0.11.1 with cabal2obs. + +--- Old: cabal-rpm-0.11.tar.gz New: cabal-rpm-0.11.1.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.eUg5wQ/_old 2017-04-12 18:01:21.440017676 +0200 +++ /var/tmp/diff_new_pack.eUg5wQ/_new 2017-04-12 18:01:21.444017111 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.11 +Version:0.11.1 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ ++ cabal-rpm-0.11.tar.gz -> cabal-rpm-0.11.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.11/ChangeLog new/cabal-rpm-0.11.1/ChangeLog --- old/cabal-rpm-0.11/ChangeLog2017-01-27 14:18:23.0 +0100 +++ new/cabal-rpm-0.11.1/ChangeLog 2017-03-13 16:12:42.0 +0100 @@ -1,3 +1,12 @@ +* 0.11.1 (2017-03-13) +- support building meta (compat) packages +- invocation of optional stackage-query to update to LTS now works +- initial --subpackage support for %{subpkgs} of missing deps: + including downloading, but update is not properly implemented yet +- new %{pkgver} macro +- (+-+) absorbs extra space +- update no longer resets release for %{subpkgs} + * 0.11 (2017-01-27) - refresh command now reads the cabal-rpm version header in the spec file and installs that version of cabal-rpm under ~/.cblrpm/ and uses it to make patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.11/cabal-rpm.cabal new/cabal-rpm-0.11.1/cabal-rpm.cabal --- old/cabal-rpm-0.11/cabal-rpm.cabal 2017-01-27 14:18:23.0 +0100 +++ new/cabal-rpm-0.11.1/cabal-rpm.cabal2017-03-13 16:12:42.0 +0100 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.11 +Version: 0.11.1 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.11/src/Commands/Depends.hs new/cabal-rpm-0.11.1/src/Commands/Depends.hs --- old/cabal-rpm-0.11/src/Commands/Depends.hs 2017-01-27 14:18:23.0 +0100 +++ new/cabal-rpm-0.11.1/src/Commands/Depends.hs2017-03-13 16:12:42.0 +0100 @@ -19,8 +19,8 @@ import Dependencies (dependencies, missingPackages, packageDependencies) import Options (quiet) -import PackageUtils (PackageData (..), prepare, stripPkgDevel) -import SysCmd (repoquery, (+-+)) +import PackageUtils (PackageData (..), prepare, repoquery, stripPkgDevel) +import SysCmd ((+-+)) #if (defined(MIN_VERSION_base) && MIN_VERSION_base(4,8,2)) #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.11/src/Commands/Install.hs new/cabal-rpm-0.11.1/src/Commands/Install.hs --- old/cabal-rpm-0.11/src/Commands/Install.hs 2017-01-27 14:18:23.0 +0100 +++ new/cabal-rpm-0.11.1/src/Commands/Install.hs2017-03-13 16:12:42.0 +0100 @@ -20,14 +20,15 @@ import Commands.RpmBuild (rpmBuild) import Dependencies (missingPackages, notInstalled) import Options (RpmFlags (..)) -import PackageUtils (PackageData (..), RpmStage (..), stripPkgDevel) -import SysCmd (cmd, cmd_, pkgInstall, rpmInstall, (+-+)) +import PackageUtils (PackageData (..), pkgInstall, rpmInstall, RpmStage (..), stripPkgDevel) +import SysCmd (cmd, cmd_, (+-+)) #if (defined(MIN_VERSION_base) && MIN_VERSION_base(4,8,2)) #else import Control.Applicative ((<$>)) #endif -import Control.Monad (unless, when) +import Control.Monad (filterM, unless, when) +import System.Directory (doesFileExist) import System.FilePath (()) install :: PackageData -> RpmFlags -> IO () @@ -45,7 +46,8 @@ rpmdir <- cmd "rpm" ["--eval", "%{_rpmdir}"] rpms <- (map (\ p -> rpmdir arch p ++ ".rpm") . lines) <$> cmd "rpmspec" ["-q", spec] - rpmInstall rpms + -- metapkgs don't
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2017-03-14 10:03:59 Comparing /work/SRC/openSUSE:Factory/cabal-rpm (Old) and /work/SRC/openSUSE:Factory/.cabal-rpm.new (New) Package is "cabal-rpm" Tue Mar 14 10:03:59 2017 rev:17 rq:461519 version:0.11 Changes: --- /work/SRC/openSUSE:Factory/cabal-rpm/cabal-rpm.changes 2017-01-12 15:46:31.390429581 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2017-03-14 10:04:00.205987484 +0100 @@ -1,0 +2,5 @@ +Sun Feb 12 14:20:27 UTC 2017 - psim...@suse.com + +- Update to version 0.11 with cabal2obs. + +--- Old: cabal-rpm-0.10.1.tar.gz New: cabal-rpm-0.11.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.boT1Tq/_old 2017-03-14 10:04:00.805902537 +0100 +++ /var/tmp/diff_new_pack.boT1Tq/_new 2017-03-14 10:04:00.809901970 +0100 @@ -1,7 +1,7 @@ # # spec file for package cabal-rpm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,7 +17,7 @@ Name: cabal-rpm -Version:0.10.1 +Version:0.11 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ @@ -44,8 +44,9 @@ It can rpmbuild packages, yum/dnf install their dependencies, prep packages, and install them. There are commands to list package dependencies and missing dependencies. The diff command compares the current spec file with a freshly -generated one and the update command updates the spec file to latest version -from Hackage. +generated one, the update command updates the spec file to latest version from +Hackage, and the refresh command updates the spec file to the current cabal-rpm +packaging. %prep %setup -q ++ cabal-rpm-0.10.1.tar.gz -> cabal-rpm-0.11.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.10.1/ChangeLog new/cabal-rpm-0.11/ChangeLog --- old/cabal-rpm-0.10.1/ChangeLog 2016-11-29 02:38:51.0 +0100 +++ new/cabal-rpm-0.11/ChangeLog2017-01-27 14:18:23.0 +0100 @@ -1,3 +1,14 @@ +* 0.11 (2017-01-27) +- refresh command now reads the cabal-rpm version header in the spec file and + installs that version of cabal-rpm under ~/.cblrpm/ and uses it to make patch +- diff and update now follow package-version args +- update tries to use stackage-query to check latest Stackage version + before falling back to latest Hackage +- update from Hackage now follows "Default available version" +- sync some changes from opensuse-haskell/cabal-rpm +- rename Setup to Options +- silence <$> import warnings + * 0.10.1 (2016-11-29) - no longer need to remove License file by hand - use new %ghc_fix_rpath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.10.1/README.md new/cabal-rpm-0.11/README.md --- old/cabal-rpm-0.10.1/README.md 2016-11-29 02:38:51.0 +0100 +++ new/cabal-rpm-0.11/README.md2017-01-27 14:18:23.0 +0100 @@ -18,8 +18,7 @@ ## Requirements cabal-rpm assumes you are using ghc-rpm-macros for Haskell RPM packaging. -It currently needs Cabal 1.10 or later to build (ie ghc7), -but it should not be hard to patch it to build at least for ghc-6.12. +It currently needs Cabal 1.10 or later to build (ie ghc 7 or later). ## Installation The package is on Hackage. If you have cabal-install (part of Haskell Platform) @@ -30,37 +29,52 @@ ## Usage To create a `.spec` file for a Haskell src package in the current dir: -$ cblrpm spec +$ cabal-rpm spec or directly on a `.cabal` file: -$ cblrpm spec path/to/mypkg.cabal +$ cabal-rpm spec path/to/mypkg.cabal or on a package source dir: -$ cblrpm spec mypkg-0.1 +$ cabal-rpm spec mypkg-0.1 You can also package directly from hackage: -$ cblrpm srpm somepkg +$ cabal-rpm srpm somepkg or -$ cblrpm local somepkg-0.1 +$ cabal-rpm local somepkg-0.1 -will unpack the (latest) 'somepkg' package from hackage +will unpack 'somepkg-0.1' from hackage (if the dir does not exist, otherwise it uses the existing dir), create a spec file for it, and build it. -cblrpm creates `.spec` files in the current dir +cabal-rpm creates `.spec` files in the current dir and if a `.spec` file already exists it will append `.cblrpm` to the generated filename to avoid overwriting an existing
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2016-10-19 13:02:17 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 2016-07-21 07:59:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-10-19 13:02:20.0 +0200 @@ -1,0 +2,5 @@ +Thu Sep 15 07:00:41 UTC 2016 - psim...@suse.com + +- Update to version 0.10.0 revision 0 with cabal2obs. + +--- Old: cabal-rpm-0.9.11.tar.gz New: cabal-rpm-0.10.0.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.P2TBd8/_old 2016-10-19 13:02:21.0 +0200 +++ /var/tmp/diff_new_pack.P2TBd8/_new 2016-10-19 13:02:21.0 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.9.11 +Version:0.10.0 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ @@ -25,7 +25,6 @@ Url:https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-old-locale-devel @@ -37,7 +36,6 @@ Recommends: ghc Recommends: yum-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description This package provides a RPM packaging tool for Haskell Cabal-based packages. @@ -52,22 +50,18 @@ %prep %setup -q - %build %ghc_bin_build -install -p -m 0644 -D man/cblrpm.1 %{buildroot}%{_mandir}/man1/cblrpm.1 - - %install %ghc_bin_install - +install -p -m 0644 -D man/cabal-rpm.1 %{buildroot}%{_mandir}/man1/cabal-rpm.1 %files %defattr(-,root,root,-) %doc COPYING %doc ChangeLog README.md -%{_bindir}/cblrpm -%{_mandir}/man1/cblrpm.1* +%{_bindir}/%{name} +%{_mandir}/man1/cabal-rpm.1* %changelog ++ cabal-rpm-0.9.11.tar.gz -> cabal-rpm-0.10.0.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.11/ChangeLog new/cabal-rpm-0.10.0/ChangeLog --- old/cabal-rpm-0.9.11/ChangeLog 2016-05-06 13:31:16.0 +0200 +++ new/cabal-rpm-0.10.0/ChangeLog 2016-07-27 13:15:19.0 +0200 @@ -1,3 +1,22 @@ +* 0.10.0 (2016-07-27) +- rename executable and manpage back to 'cabal-rpm': more predictable +- explicit error for unknown command +- sort docs and include upstream changelogs and news +- add cabal-rpm version header line to spec files +- new highly experimental command to refresh spec files +- only add "ExclusiveArch: %{ghc_arches_with_ghci}" for RHEL/EPEL +- use revised Hackage .cabal files on SUSE (@peti) +- on SUSE add explicit requires for pkgconfig +- new --compiler option (@peti) +- new --distro option (@peti) +- new --strict option which fails when missing cdeps (@peti), + otherwise a warning is not output +- update now shows the generated patch +- use %cabal_test (@mimi1vx) +- no longer duplicate docs in datadir +- package datadir better +- for SUSE libs executables now go in the base package + * 0.9.11 (2016-05-06) - build with Cabal-1.24 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.11/cabal-rpm.cabal new/cabal-rpm-0.10.0/cabal-rpm.cabal --- old/cabal-rpm-0.9.11/cabal-rpm.cabal2016-05-06 13:31:16.0 +0200 +++ new/cabal-rpm-0.10.0/cabal-rpm.cabal2016-07-27 13:15:19.0 +0200 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.9.11 +Version: 0.10.0 Synopsis:RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. @@ -20,8 +20,10 @@ 2012-2016 Jens PetersenCategory:Distribution Build-type: Simple -Extra-source-files: README.md ChangeLog man/cblrpm.1.md man/cblrpm.1 +Extra-source-files: README.md ChangeLog man/cabal-rpm.1.md man/cabal-rpm.1 Cabal-version: >=1.6 +Tested-with: GHC == 7.0.4, GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, + GHC == 7.10.3, GHC == 8.0.1 source-repository head type: git @@ -31,7 +33,7 @@ Description: Use old-locale and time < 1.5 Default: True -Executable cblrpm +Executable cabal-rpm Main-is:Main.hs Build-depends: base < 5,
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2016-07-21 07:59:49 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 2016-05-17 17:14:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-07-21 07:59:56.0 +0200 @@ -1,0 +2,5 @@ +Sun Jul 10 17:24:21 UTC 2016 - psim...@suse.com + +- Update to version 0.9.11 revision 0 with cabal2obs. + +--- Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.vsQCFI/_old 2016-07-21 07:59:57.0 +0200 +++ /var/tmp/diff_new_pack.vsQCFI/_new 2016-07-21 07:59:57.0 +0200 @@ -28,13 +28,14 @@ # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-old-locale-devel BuildRequires: ghc-process-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel -Recommends: yum-utils Recommends: cabal-install Recommends: ghc +Recommends: yum-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps @@ -42,8 +43,8 @@ This package provides a RPM packaging tool for Haskell Cabal-based packages. cblrpm has commands to generate a RPM spec file and srpm for a package. -It can rpmbuild packages, yum install their dependencies, prep packages, and -install them. There are commands to list package dependencies and missing +It can rpmbuild packages, yum/dnf install their dependencies, prep packages, +and install them. There are commands to list package dependencies and missing dependencies. The diff command compares the current spec file with a freshly generated one and the update command updates the spec file to latest version from Hackage. @@ -51,23 +52,22 @@ %prep %setup -q -%build -%{ghc_bin_build} -%install -%{ghc_bin_install} +%build +%ghc_bin_build install -p -m 0644 -D man/cblrpm.1 %{buildroot}%{_mandir}/man1/cblrpm.1 -ln -s cblrpm %{buildroot}%{_bindir}/%{name} -ln -s %{_mandir}/man1/cblrpm.1 %{buildroot}%{_mandir}/man1/%{name}.1 + +%install +%ghc_bin_install + %files %defattr(-,root,root,-) -%doc COPYING ChangeLog README.md -%attr(755,root,root) %{_bindir}/%{name} +%doc COPYING +%doc ChangeLog README.md %{_bindir}/cblrpm -%{_mandir}/man1/%{name}.1* %{_mandir}/man1/cblrpm.1* %changelog
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2016-05-17 17:14:28 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 2016-03-31 13:02:31.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-05-17 17:14:28.0 +0200 @@ -1,0 +2,6 @@ +Sat May 7 06:18:12 UTC 2016 - mimi...@gmail.com + +- update to 0.9.11 +* build with Cabal-1.24 + +--- Old: cabal-rpm-0.9.10.tar.gz New: cabal-rpm-0.9.11.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.ngGH2H/_old 2016-05-17 17:14:29.0 +0200 +++ /var/tmp/diff_new_pack.ngGH2H/_new 2016-05-17 17:14:29.0 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.9.10 +Version:0.9.11 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ ++ cabal-rpm-0.9.10.tar.gz -> cabal-rpm-0.9.11.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.10/ChangeLog new/cabal-rpm-0.9.11/ChangeLog --- old/cabal-rpm-0.9.10/ChangeLog 2016-03-24 08:29:55.0 +0100 +++ new/cabal-rpm-0.9.11/ChangeLog 2016-05-06 13:31:16.0 +0200 @@ -1,3 +1,6 @@ +* 0.9.11 (2016-05-06) +- build with Cabal-1.24 + * 0.9.10 (2016-03-24) - bugfixes - update no longer tries to grep non-existent .git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.10/cabal-rpm.cabal new/cabal-rpm-0.9.11/cabal-rpm.cabal --- old/cabal-rpm-0.9.10/cabal-rpm.cabal2016-03-24 08:29:55.0 +0100 +++ new/cabal-rpm-0.9.11/cabal-rpm.cabal2016-05-06 13:31:16.0 +0200 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.9.10 +Version: 0.9.11 Synopsis:RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. @@ -34,7 +34,7 @@ Executable cblrpm Main-is:Main.hs Build-depends: base < 5, - Cabal > 1.10 && < 1.24, + Cabal > 1.10 && < 1.25, directory, filepath, process, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.10/src/Commands/Spec.hs new/cabal-rpm-0.9.11/src/Commands/Spec.hs --- old/cabal-rpm-0.9.10/src/Commands/Spec.hs 2016-03-24 08:29:55.0 +0100 +++ new/cabal-rpm-0.9.11/src/Commands/Spec.hs 2016-05-06 13:31:16.0 +0200 @@ -66,7 +66,7 @@ then do now <- getCurrentTime return $ formatTime defaultTimeLocale "0.%Y%m%d" now -else return $ if (distro == SUSE) then "0" else "1" +else return $ if distro == SUSE then "0" else "1" rstrip :: (Char -> Bool) -> String -> String rstrip p = reverse . dropWhile p . reverse @@ -100,7 +100,7 @@ if specAlreadyExists then notice verbose $ specFile +-+ "exists:" +-+ if rpmForce flags then "forcing overwrite" else "creating" +-+ specFile' else do -let realdir dir = ("cblrpm." `isPrefixOf` takeBaseName dir) +let realdir dir = "cblrpm." `isPrefixOf` takeBaseName dir when (maybe True realdir mdest) $ putStrLn pkgname @@ -274,7 +274,7 @@ 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) +put $ "%ghc_fix_dynamic_rpath" +-+ unwords (map (\ p -> if p == name then "%{pkg_name}" else p) execs) let licensefiles = #if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(1,20,0) @@ -312,7 +312,7 @@ docs <- findDocs cabalPath licensefiles - let license_macro = if (distro == Fedora) then "%license" else "%doc" + let license_macro = if distro == Fedora then "%license" else "%doc" when hasExecPkg $ do put "%files" @@ -345,7 +345,7 @@ when (distro /= Fedora) $ put "%defattr(-,root,root,-)" unless (null docs) $ put $ "%doc" +-+ unwords docs -when (not binlib) $ +unless binlib $ mapM_ (\ p -> put $ "%{_bindir}/" ++ (if p == name then "%{pkg_name}" else p)) execs putNewline putNewline diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.10/src/Dependencies.hs
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2016-03-31 13:02:29 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 2016-01-28 17:23:49.0 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-03-31 13:02:31.0 +0200 @@ -1,0 +2,9 @@ +Fri Mar 25 07:57:37 UTC 2016 - mimi...@gmail.com + +- update to 0.9.10 +* update no longer tries to grep non-existent .git +* fix duplicate clibs +* fix build with ghc-8.0 +* SuSE improvements: no disttag or rpmdev-bumpspec + +--- Old: cabal-rpm-0.9.9.tar.gz New: cabal-rpm-0.9.10.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.1pF7CN/_old 2016-03-31 13:02:32.0 +0200 +++ /var/tmp/diff_new_pack.1pF7CN/_new 2016-03-31 13:02:32.0 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.9.9 +Version:0.9.10 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ ++ cabal-rpm-0.9.9.tar.gz -> cabal-rpm-0.9.10.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.9/ChangeLog new/cabal-rpm-0.9.10/ChangeLog --- old/cabal-rpm-0.9.9/ChangeLog 2016-01-25 10:33:19.0 +0100 +++ new/cabal-rpm-0.9.10/ChangeLog 2016-03-24 08:29:55.0 +0100 @@ -1,3 +1,10 @@ +* 0.9.10 (2016-03-24) +- bugfixes + - update no longer tries to grep non-existent .git + - fix duplicate clibs +- fix build with ghc-8.0 (Cabal-1.23 and time-1.6) +- SuSE improvements: no disttag or rpmdev-bumpspec + * 0.9.9 (2016-01-25) - couple of minor improvements for SUSE packaging diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.9/cabal-rpm.cabal new/cabal-rpm-0.9.10/cabal-rpm.cabal --- old/cabal-rpm-0.9.9/cabal-rpm.cabal 2016-01-25 10:33:19.0 +0100 +++ new/cabal-rpm-0.9.10/cabal-rpm.cabal2016-03-24 08:29:55.0 +0100 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.9.9 +Version: 0.9.10 Synopsis:RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. @@ -34,7 +34,7 @@ Executable cblrpm Main-is:Main.hs Build-depends: base < 5, - Cabal > 1.10 && < 1.23, + Cabal > 1.10 && < 1.24, directory, filepath, process, @@ -43,7 +43,7 @@ Build-Depends: old-locale >= 1 && < 1.1, time >= 1.2 && < 1.5 else - Build-Depends: time >= 1.5 && < 1.6 + Build-Depends: time >= 1.5 && < 1.7 Other-modules: Commands.Depends, Commands.Diff, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.9/src/Commands/Spec.hs new/cabal-rpm-0.9.10/src/Commands/Spec.hs --- old/cabal-rpm-0.9.9/src/Commands/Spec.hs2016-01-25 10:33:19.0 +0100 +++ new/cabal-rpm-0.9.10/src/Commands/Spec.hs 2016-03-24 08:29:55.0 +0100 @@ -17,7 +17,7 @@ -- (at your option) any later version. module Commands.Spec ( - createSpecFile, createSpecFile_ + createSpecFile, createSpecFile_, detectDistro, Distro(..) ) where import Dependencies (notInstalled, packageDependencies, showDep, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.9/src/Commands/Update.hs new/cabal-rpm-0.9.10/src/Commands/Update.hs --- old/cabal-rpm-0.9.9/src/Commands/Update.hs 2016-01-25 10:33:19.0 +0100 +++ new/cabal-rpm-0.9.10/src/Commands/Update.hs 2016-03-24 08:29:55.0 +0100 @@ -1,6 +1,6 @@ -- | -- Module : Commands.Update --- Copyright : (C) 2014-2015 Jens Petersen +-- Copyright : (C) 2014-2016 Jens Petersen -- -- Maintainer : Jens Petersen-- Stability : alpha @@ -16,9 +16,9 @@ update ) where -import Commands.Spec (createSpecFile) +import Commands.Spec (createSpecFile, detectDistro, Distro(..)) import FileUtils (withTempDirectory) -import PackageUtils (PackageData (..), bringTarball, latestPkg, +import PackageUtils (PackageData (..), bringTarball, isGitDir, latestPkg, packageName, packageVersion, prepare, removePrefix) import Setup (RpmFlags (..)) import SysCmd
commit cabal-rpm for openSUSE:Factory
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.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2016-01-28 17:23:49.0 +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.0 +0100 +++ /var/tmp/diff_new_pack.dsT9st/_new 2016-01-28 17:23:50.0 +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.0 +0200 +++ new/cabal-rpm-0.9.9/ChangeLog 2016-01-25 10:33:19.0 +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.0 +0200 +++ new/cabal-rpm-0.9.9/cabal-rpm.cabal 2016-01-25 10:33:19.0 +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, Bryan O'Sullivan Maintainer: Jens Petersen Copyright: 2007-2008 Bryan O'Sullivan , - 2012-2015 Jens Petersen + 2012-2016 Jens Petersen 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.hs2015-10-08 05:36:01.0 +0200 +++ new/cabal-rpm-0.9.9/src/Commands/Spec.hs2016-01-25 10:33:19.0 +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 -- Stability : alpha @@ -32,7 +32,7 @@ import Data.List(groupBy,
commit cabal-rpm for openSUSE:Factory
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.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-10-20 00:04:39.0 +0200 @@ -1,0 +2,9 @@ +Mon Oct 12 18:33:02 UTC 2015 - mimi...@gmail.com + +- 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.0 +0200 +++ /var/tmp/diff_new_pack.VBOPFi/_new 2015-10-20 00:04:40.0 +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 mimi...@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 @@ -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.0 +0200 +++ new/cabal-rpm-0.9.8/ChangeLog 2015-10-08 05:36:01.0 +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.0 +0200 +++ new/cabal-rpm-0.9.8/cabal-rpm.cabal 2015-10-08 05:36:01.0 +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.hs2015-08-28 10:47:23.0 +0200 +++ new/cabal-rpm-0.9.8/src/Commands/Spec.hs2015-10-08 05:36:01.0 +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
commit cabal-rpm for openSUSE:Factory
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.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-09-02 00:36:02.0 +0200 @@ -1,0 +2,15 @@ +Mon Aug 31 06:58:52 UTC 2015 - mimi...@gmail.com + +- change fix-macro-license.patch to upstream solution + +--- +Sun Aug 30 14:38:54 UTC 2015 - mimi...@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.0 +0200 +++ /var/tmp/diff_new_pack.WWB65t/_new 2015-09-02 00:36:03.0 +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}.tar.gz Source2:cabal-rpm.1 +# PATCH-FIX-UPSTREAM fix-macro-license.patch mimi...@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.0 +0200 +++ new/cabal-rpm-0.9.7/ChangeLog 2015-08-28 10:47:23.0 +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.0 +0200 +++ new/cabal-rpm-0.9.7/cabal-rpm.cabal 2015-08-28 10:47:23.0 +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.hs2015-05-21 11:52:28.0 +0200 +++ new/cabal-rpm-0.9.7/src/Commands/Spec.hs2015-08-28 10:47:23.0 +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) +
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-08-25 07:19:43 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-05-26 12:36:12.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-08-25 08:46:23.0 +0200 @@ -2 +2 @@ -Tue May 26 08:10:55 UTC 2015 - mimi...@gmail.com +Fri May 22 14:26:06 UTC 2015 - mimi...@gmail.com @@ -6,0 +7 @@ +* remove unneeded ghc-old-locale dep @@ -12 +13 @@ -* add old-locale Cabal flag to fix build on ghc-7.10 +* add '-old-locale' Cabal flag to fix build on ghc-7.10 Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.SqDFxH/_old 2015-08-25 08:46:23.0 +0200 +++ /var/tmp/diff_new_pack.SqDFxH/_new 2015-08-25 08:46:23.0 +0200 @@ -29,7 +29,6 @@ # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel -BuildRequires: ghc-old-locale-devel BuildRequires: ghc-process-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-time-devel @@ -54,6 +53,7 @@ %setup -q %build +%define cabal_configure_options --flags=-old-locale %{ghc_bin_build} %install
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-05-26 12:36:11 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-05-11 19:48:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-05-26 12:36:12.0 +0200 @@ -1,0 +2,7 @@ +Tue May 26 08:10:55 UTC 2015 - mimi...@gmail.com + +- update to 0.9.6 +* make cabal list quiet +* filter missing packages from repoquery + +--- Old: cabal-rpm-0.9.5.1.tar.gz New: cabal-rpm-0.9.6.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.ZKlsZs/_old 2015-05-26 12:36:13.0 +0200 +++ /var/tmp/diff_new_pack.ZKlsZs/_new 2015-05-26 12:36:13.0 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.9.5.1 +Version:0.9.6 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ ++ cabal-rpm-0.9.5.1.tar.gz - cabal-rpm-0.9.6.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.5.1/ChangeLog new/cabal-rpm-0.9.6/ChangeLog --- old/cabal-rpm-0.9.5.1/ChangeLog 2015-05-01 11:09:22.0 +0200 +++ new/cabal-rpm-0.9.6/ChangeLog 2015-05-21 11:52:28.0 +0200 @@ -1,3 +1,7 @@ +* 0.9.6 (2015-05-21) +- make cabal list quiet +- filter missing packages from repoquery + * 0.9.5.1 (2015-05-01) - add old-locale Cabal flag to fix build on ghc-7.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.5.1/cabal-rpm.cabal new/cabal-rpm-0.9.6/cabal-rpm.cabal --- old/cabal-rpm-0.9.5.1/cabal-rpm.cabal 2015-05-01 11:09:22.0 +0200 +++ new/cabal-rpm-0.9.6/cabal-rpm.cabal 2015-05-21 11:52:28.0 +0200 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.9.5.1 +Version: 0.9.6 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.5.1/src/PackageUtils.hs new/cabal-rpm-0.9.6/src/PackageUtils.hs --- old/cabal-rpm-0.9.5.1/src/PackageUtils.hs 2015-05-01 11:09:22.0 +0200 +++ new/cabal-rpm-0.9.6/src/PackageUtils.hs 2015-05-21 11:52:28.0 +0200 @@ -219,7 +219,7 @@ latestPkg :: String - IO String latestPkg pkg = do - contains_pkg - lines $ cmd cabal [list, --simple-output, pkg] + contains_pkg - lines $ cmd cabal [list, -v0, --simple-output, pkg] let pkgs = filter ((== pkg) . takeWhile (not . (== ' '))) contains_pkg if null pkgs then error $ pkg ++ hackage not found diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.5.1/src/SysCmd.hs new/cabal-rpm-0.9.6/src/SysCmd.hs --- old/cabal-rpm-0.9.5.1/src/SysCmd.hs 2015-05-01 11:09:22.0 +0200 +++ new/cabal-rpm-0.9.6/src/SysCmd.hs 2015-05-21 11:52:28.0 +0200 @@ -140,7 +140,7 @@ pkgInstall pkgs hard = do pkginstaller - packageManager putStrLn $ Running repoquery +-+ unwords pkgs - repopkgs - mapM (repoquery [--qf, %{name}]) pkgs + repopkgs - filter (/= ) $ mapM (repoquery [--qf, %{name}]) pkgs let missing = pkgs \\ repopkgs if not (null missing) hard then error $ unwords missing +-+ not available.
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-05-11 19:38:21 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-04-30 11:51:16.0 +0200 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-05-11 19:48:40.0 +0200 @@ -1,0 +2,6 @@ +Mon May 4 05:39:58 UTC 2015 - mimi...@gmail.com + +- update to 0.9.5.1 +* add old-locale Cabal flag to fix build on ghc-7.10 + +--- Old: cabal-rpm-0.9.5.tar.gz New: cabal-rpm-0.9.5.1.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.fyTplX/_old 2015-05-11 19:48:41.0 +0200 +++ /var/tmp/diff_new_pack.fyTplX/_new 2015-05-11 19:48:41.0 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.9.5 +Version:0.9.5.1 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ ++ cabal-rpm-0.9.5.tar.gz - cabal-rpm-0.9.5.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.5/ChangeLog new/cabal-rpm-0.9.5.1/ChangeLog --- old/cabal-rpm-0.9.5/ChangeLog 2015-04-20 15:24:51.0 +0200 +++ new/cabal-rpm-0.9.5.1/ChangeLog 2015-05-01 11:09:22.0 +0200 @@ -1,3 +1,6 @@ +* 0.9.5.1 (2015-05-01) +- add old-locale Cabal flag to fix build on ghc-7.10 + * 0.9.5 (2015-04-20) - fix for dnf repoquery - create SOURCES/ for tarball diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.5/cabal-rpm.cabal new/cabal-rpm-0.9.5.1/cabal-rpm.cabal --- old/cabal-rpm-0.9.5/cabal-rpm.cabal 2015-04-20 15:24:51.0 +0200 +++ new/cabal-rpm-0.9.5.1/cabal-rpm.cabal 2015-05-01 11:09:22.0 +0200 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.9.5 +Version: 0.9.5.1 Synopsis:RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. @@ -27,16 +27,23 @@ type: git location: https://github.com/juhp/cabal-rpm +Flag old-locale + Description: Use old-locale and time 1.5 + Default: True + Executable cblrpm Main-is:Main.hs Build-depends: base 5, Cabal 1.10 1.23, directory, filepath, - old-locale, process, - time, unix +if flag(old-locale) + Build-Depends: old-locale = 1 1.1, + time = 1.2 1.5 +else + Build-Depends: time = 1.5 1.6 Other-modules: Commands.Depends, Commands.Diff, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.5/src/Commands/Depends.hs new/cabal-rpm-0.9.5.1/src/Commands/Depends.hs --- old/cabal-rpm-0.9.5/src/Commands/Depends.hs 2015-04-20 15:24:51.0 +0200 +++ new/cabal-rpm-0.9.5.1/src/Commands/Depends.hs 2015-05-01 11:09:22.0 +0200 @@ -25,7 +25,7 @@ import Control.Applicative (($)) import Control.Monad (filterM, unless, void) import Data.List (nub, sort, (\\)) -import System.Directory(removeDirectoryRecursive) +import System.Directory (removeDirectoryRecursive) data Depends = Depends | Requires | Missing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.5/src/Commands/Spec.hs new/cabal-rpm-0.9.5.1/src/Commands/Spec.hs --- old/cabal-rpm-0.9.5/src/Commands/Spec.hs2015-04-20 15:24:51.0 +0200 +++ new/cabal-rpm-0.9.5.1/src/Commands/Spec.hs 2015-05-01 11:09:22.0 +0200 @@ -47,7 +47,11 @@ import System.Directory (doesFileExist, getDirectoryContents) import System.IO (IOMode (..), hClose, hPutStrLn, openFile) +#if defined(MIN_VERSION_time) MIN_VERSION_time(1,5,0) +import Data.Time.Format (defaultTimeLocale) +#else import System.Locale (defaultTimeLocale) +#endif import System.FilePath (dropFileName, takeBaseName, takeDirectory, (/)) import qualified Paths_cabal_rpm (version)
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-04-30 11:51:15 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-03-11 09:59:02.0 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-04-30 11:51:16.0 +0200 @@ -1,0 +2,10 @@ +Sun Apr 26 17:18:50 UTC 2015 - mimi...@gmail.com + +- update to 0.9.5 +- fix for dnf repoquery +- create SOURCES/ for tarball +- fixes for Cabal-1.22 +- nogpgcheck for Fedora 22+ +- warn about hidden backup spec files + +--- Old: cabal-rpm-0.9.4.tar.gz New: cabal-rpm-0.9.5.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.mURTpt/_old 2015-04-30 11:51:17.0 +0200 +++ /var/tmp/diff_new_pack.mURTpt/_new 2015-04-30 11:51:17.0 +0200 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.9.4 +Version:0.9.5 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ ++ cabal-rpm-0.9.4.tar.gz - cabal-rpm-0.9.5.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.4/ChangeLog new/cabal-rpm-0.9.5/ChangeLog --- old/cabal-rpm-0.9.4/ChangeLog 2015-02-17 14:43:22.0 +0100 +++ new/cabal-rpm-0.9.5/ChangeLog 2015-04-20 15:24:51.0 +0200 @@ -1,3 +1,10 @@ +* 0.9.5 (2015-04-20) +- fix for dnf repoquery +- create SOURCES/ for tarball +- fixes for Cabal-1.22 +- nogpgcheck for Fedora 22+ +- warn about hidden backup spec files + * 0.9.4 (2015-02-17) - use dnf if installed instead of yum for install and repoquery - update now only commits changes and new source if git origin is ssh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.4/cabal-rpm.cabal new/cabal-rpm-0.9.5/cabal-rpm.cabal --- old/cabal-rpm-0.9.4/cabal-rpm.cabal 2015-02-17 14:43:22.0 +0100 +++ new/cabal-rpm-0.9.5/cabal-rpm.cabal 2015-04-20 15:24:51.0 +0200 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.9.4 +Version: 0.9.5 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-2014 Jens Petersen peter...@fedoraproject.org + 2012-2015 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.4/src/Commands/Depends.hs new/cabal-rpm-0.9.5/src/Commands/Depends.hs --- old/cabal-rpm-0.9.4/src/Commands/Depends.hs 2015-02-17 14:43:22.0 +0100 +++ new/cabal-rpm-0.9.5/src/Commands/Depends.hs 2015-04-20 15:24:51.0 +0200 @@ -1,6 +1,6 @@ -- | -- Module : Commands.Depends --- Copyright : (C) 2014 Jens Petersen +-- Copyright : (C) 2014-2015 Jens Petersen -- -- Maintainer : Jens Petersen peter...@fedoraproject.org -- Stability : alpha diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.4/src/Commands/Install.hs new/cabal-rpm-0.9.5/src/Commands/Install.hs --- old/cabal-rpm-0.9.4/src/Commands/Install.hs 2015-02-17 14:43:22.0 +0100 +++ new/cabal-rpm-0.9.5/src/Commands/Install.hs 2015-04-20 15:24:51.0 +0200 @@ -1,6 +1,6 @@ -- | -- Module : Commands.Install --- Copyright : (C) 2012-2014 Jens Petersen +-- Copyright : (C) 2012-2015 Jens Petersen -- -- Maintainer : Jens Petersen peter...@fedoraproject.org -- Stability : alpha diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.4/src/Commands/RpmBuild.hs new/cabal-rpm-0.9.5/src/Commands/RpmBuild.hs --- old/cabal-rpm-0.9.4/src/Commands/RpmBuild.hs2015-02-17 14:43:22.0 +0100 +++ new/cabal-rpm-0.9.5/src/Commands/RpmBuild.hs2015-04-20 15:24:51.0 +0200 @@ -1,7 +1,7 @@ -- | -- Module : Commands.RpmBuild -- Copyright : (C) 2007-2008 Bryan O'Sullivan
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-03-11 09:59: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-02-20 12:01:23.0 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-03-11 09:59:02.0 +0100 @@ -1,0 +2,5 @@ +Tue Mar 10 14:24:48 UTC 2015 - mplus...@suse.com + +- Recommend cabal-install and ghc as they are necessary for usage + +--- Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.wrM69y/_old 2015-03-11 09:59:03.0 +0100 +++ /var/tmp/diff_new_pack.wrM69y/_new 2015-03-11 09:59:03.0 +0100 @@ -35,6 +35,8 @@ BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel Recommends: yum-utils +Recommends: cabal-install +Recommends: ghc BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-02-20 12:01:21 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-02-16 22:12:45.0 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-02-20 12:01:23.0 +0100 @@ -1,0 +2,9 @@ +Wed Feb 18 18:36:09 UTC 2015 - mimi...@gmail.com + +- Bump to version 0.9.4 ++ remove requires-space.patch +* use dnf if installed instead of yum for install and repoquery +* update now only commits changes and new source if git origin is ssh +* allow Cabal-1.22 + +--- Old: cabal-rpm-0.9.3.tar.gz requires-space.patch New: cabal-rpm-0.9.4.tar.gz Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.CntBTk/_old 2015-02-20 12:01:24.0 +0100 +++ /var/tmp/diff_new_pack.CntBTk/_new 2015-02-20 12:01:24.0 +0100 @@ -17,7 +17,7 @@ Name: cabal-rpm -Version:0.9.3 +Version:0.9.4 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ @@ -25,8 +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 requires-space.patch - fix missed space in Requires - Ondřej Súkup mimi...@gmail.com -Patch0: requires-space.patch BuildRequires: ghc-Cabal-devel # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel @@ -52,7 +50,6 @@ %prep %setup -q -%patch0 -p1 %build %{ghc_bin_build} ++ cabal-rpm-0.9.3.tar.gz - cabal-rpm-0.9.4.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/ChangeLog new/cabal-rpm-0.9.4/ChangeLog --- old/cabal-rpm-0.9.3/ChangeLog 2015-02-05 16:50:49.0 +0100 +++ new/cabal-rpm-0.9.4/ChangeLog 2015-02-17 14:43:22.0 +0100 @@ -1,3 +1,8 @@ +* 0.9.4 (2015-02-17) +- use dnf if installed instead of yum for install and repoquery +- update now only commits changes and new source if git origin is ssh +- allow Cabal-1.22 + * 0.9.3 (2015-02-05) - make sure tarball destdir exists before copying - improve output for listing missing packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/README.md new/cabal-rpm-0.9.4/README.md --- old/cabal-rpm-0.9.3/README.md 2015-02-05 16:50:49.0 +0100 +++ new/cabal-rpm-0.9.4/README.md 2015-02-17 14:43:22.0 +0100 @@ -4,7 +4,7 @@ # cabal-rpm cabal-rpm is a tool for RPM packaging of Haskell Cabal-based packages. -It interacts with yum to install build dependencies and can also act as +It interacts with yum/dnf to install build dependencies and can also act as a cabal-install wrapper installing dependencies packaged in Fedora before running cabal install. @@ -58,7 +58,7 @@ $ cblrpm install [pkg][-ver] -will yum install available missing dependencies and +will yum/dnf install available missing dependencies and run cabal install to build the package. ## Development diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.3/cabal-rpm.cabal new/cabal-rpm-0.9.4/cabal-rpm.cabal --- old/cabal-rpm-0.9.3/cabal-rpm.cabal 2015-02-05 16:50:49.0 +0100 +++ new/cabal-rpm-0.9.4/cabal-rpm.cabal 2015-02-17 14:43:22.0 +0100 @@ -1,11 +1,11 @@ Name:cabal-rpm -Version: 0.9.3 +Version: 0.9.4 Synopsis:RPM packaging tool for Haskell Cabal-based packages Description: This package provides a RPM packaging tool for Haskell Cabal-based packages. . cblrpm has commands to generate a RPM spec file and srpm for a package. -It can rpmbuild packages, yum install their dependencies, prep packages, +It can rpmbuild packages, yum/dnf install their dependencies, prep packages, and install them. There are commands to list package dependencies and missing dependencies. The diff command compares the current spec file with a freshly generated one and the update command updates the spec file @@ -30,7 +30,7 @@ Executable cblrpm Main-is:Main.hs Build-depends: base 5, - Cabal 1.10 1.21, + Cabal 1.10 1.23, directory, filepath,
commit cabal-rpm for openSUSE:Factory
Hello community, here is the log from the commit of package cabal-rpm for openSUSE:Factory checked in at 2015-02-16 22:12:44 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-02-03 11:40:50.0 +0100 +++ /work/SRC/openSUSE:Factory/.cabal-rpm.new/cabal-rpm.changes 2015-02-16 22:12:45.0 +0100 @@ -1,0 +2,16 @@ +Sun Feb 15 09:42:56 UTC 2015 - mimi...@gmail.com + +- add requires-space.patch + +--- +Sat Feb 14 10:11:27 UTC 2015 - mimi...@gmail.com + +- Bump to version 0.9.3 +* make sure tarball destdir exists before copying ++ improve output for listing missing packages ++ update improvements: new-sources first, continue if patch fails, git commit changes ++ spec: sort executables and use %pkg_name in %ghc_fix_dynamic_rpath ++ drop the debuginfo handling for C files ++ ignore emacs temp .#pkgname.spec files- + +--- Old: cabal-rpm-0.9.2.tar.gz New: cabal-rpm-0.9.3.tar.gz requires-space.patch Other differences: -- ++ cabal-rpm.spec ++ --- /var/tmp/diff_new_pack.eUEH6o/_old 2015-02-16 22:12:46.0 +0100 +++ /var/tmp/diff_new_pack.eUEH6o/_new 2015-02-16 22:12:46.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package cabal-rpm # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,7 +17,7 @@ Name: cabal-rpm -Version:0.9.2 +Version:0.9.3 Release:0 Summary:RPM packaging tool for Haskell Cabal-based packages License:GPL-3.0+ @@ -25,6 +25,8 @@ 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 requires-space.patch - fix missed space in Requires - Ondřej Súkup mimi...@gmail.com +Patch0: requires-space.patch BuildRequires: ghc-Cabal-devel # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel @@ -50,6 +52,7 @@ %prep %setup -q +%patch0 -p1 %build %{ghc_bin_build} ++ cabal-rpm-0.9.2.tar.gz - cabal-rpm-0.9.3.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.2/ChangeLog new/cabal-rpm-0.9.3/ChangeLog --- old/cabal-rpm-0.9.2/ChangeLog 2014-12-18 03:09:47.0 +0100 +++ new/cabal-rpm-0.9.3/ChangeLog 2015-02-05 16:50:49.0 +0100 @@ -1,3 +1,11 @@ +* 0.9.3 (2015-02-05) +- make sure tarball destdir exists before copying +- improve output for listing missing packages +- update improvements: new-sources first, continue if patch fails, git commit changes +- spec: sort executables and use %pkg_name in %ghc_fix_dynamic_rpath +- drop the debuginfo handling for C files +- ignore emacs temp .#pkgname.spec files + * 0.9.2 (2014-12-18) - lots of bug fixes - improved missingdeps output diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-rpm-0.9.2/cabal-rpm.cabal new/cabal-rpm-0.9.3/cabal-rpm.cabal --- old/cabal-rpm-0.9.2/cabal-rpm.cabal 2014-12-18 03:09:47.0 +0100 +++ new/cabal-rpm-0.9.3/cabal-rpm.cabal 2015-02-05 16:50:49.0 +0100 @@ -1,5 +1,5 @@ Name:cabal-rpm -Version: 0.9.2 +Version: 0.9.3 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.2/src/Commands/RpmBuild.hs new/cabal-rpm-0.9.3/src/Commands/RpmBuild.hs --- old/cabal-rpm-0.9.2/src/Commands/RpmBuild.hs2014-12-18 03:09:47.0 +0100 +++ new/cabal-rpm-0.9.3/src/Commands/RpmBuild.hs2015-02-05 16:50:49.0 +0100 @@ -33,7 +33,8 @@ --import Distribution.Version (VersionRange, foldVersionRange') -import System.Directory (doesFileExist) +import System.Directory (createDirectoryIfMissing, doesDirectoryExist, + doesFileExist) import System.FilePath (takeDirectory, (/)) -- autoreconf :: Verbosity - PackageDescription - IO () @@ -74,6 +75,9 @@ when scmRepo $ error No tarball for source repo +destExists - doesDirectoryExist