diff --git a/.gitignore b/.gitignore index c90a2b7..9799d38 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /bustle-0.7.1.tar.gz /bustle-0.7.4.tar.gz /bustle-0.7.5.tar.gz +/bustle-0.8.0.tar.gz diff --git a/bustle.spec b/bustle.spec index 39c6379..c14aad9 100644 --- a/bustle.spec +++ b/bustle.spec @@ -1,11 +1,11 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.7 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ # testsuite missing deps: test-framework test-framework-hunit Name: bustle -Version: 0.7.5 -Release: 8%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Draw sequence diagrams of D-Bus traffic License: LGPLv2+ @@ -15,7 +15,6 @@ Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-% # End cabal-rpm sources # taken from ghc-hgettext Patch0: bustle-hgettext-Cabal24.patch -Patch1: https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch Requires: gnome-icon-theme BuildRequires: desktop-file-utils @@ -28,24 +27,22 @@ BuildRequires: ghc-base-static BuildRequires: ghc-bytestring-static BuildRequires: ghc-cairo-static BuildRequires: ghc-containers-static -BuildRequires: ghc-dbus-static BuildRequires: ghc-directory-static BuildRequires: ghc-filepath-static BuildRequires: ghc-gio-static BuildRequires: ghc-glib-static BuildRequires: ghc-gtk3-static -BuildRequires: ghc-hgettext-static BuildRequires: ghc-mtl-static BuildRequires: ghc-pango-static -BuildRequires: ghc-pcap-static BuildRequires: ghc-process-static -BuildRequires: ghc-setlocale-static BuildRequires: ghc-text-static BuildRequires: ghc-time-static +BuildRequires: ghc-transformers-static +BuildRequires: libpcap-devel BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: make # End cabal-rpm deps +BuildRequires: make %description Bustle records and draws sequence diagrams of D-Bus activity, showing signal @@ -61,7 +58,6 @@ frequencies and average method call times. %setup -q # End cabal-rpm setup %patch0 -p1 -b .orig -%patch1 -p1 -b .orig %build @@ -94,12 +90,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.freedesktop.Bustl %{_bindir}/%{name}-pcap %{_datadir}/appdata/org.freedesktop.Bustle.appdata.xml %{_datadir}/applications/org.freedesktop.Bustle.desktop -%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg %{_mandir}/man1/%{name}-pcap.1* %changelog +* Thu Aug 5 2021 Jens Petersen - 0.8.0-1 +- update to 0.8.0 + * Wed Jul 21 2021 Fedora Release Engineering - 0.7.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch b/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch deleted file mode 100644 index e269aa8..0000000 --- a/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ee4b81cbc232d47ba9940f1987777b17452e71ff Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Fri, 18 Oct 2019 01:46:19 +0200 -Subject: [PATCH] UI: Fix build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bustle/UI.hs:490:3: error: - • No instance for (Control.Monad.Fail.MonadFail - (Bustle BConfig BState)) - arising from a do statement - with the failable pattern ‘[openItem, openTwoItem]’ - • In a stmt of a 'do' block: - [openItem, openTwoItem] <- mapM - (getW castToMenuItem) ["open", "openTwo"] - In the expression: - do builder <- io builderNew - io - $ builderAddFromFile builder =<< getDataFileName "data/bustle.ui" - let getW cast name = io $ builderGetObject builder cast name - window <- getW castToWindow "diagramWindow" - .... - In an equation for ‘emptyWindow’: - emptyWindow - = do builder <- io builderNew - io - $ builderAddFromFile builder =<< getDataFileName "data/bustle.ui" - let getW cast name = ... - .... - | -490 | [openItem, openTwoItem] <- mapM (getW castToMenuItem) ["open", "openTwo"] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ---- - Bustle/UI.hs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Bustle/UI.hs b/Bustle/UI.hs -index 28ede19..6666c72 100644 ---- a/Bustle/UI.hs -+++ b/Bustle/UI.hs -@@ -487,7 +487,8 @@ emptyWindow = do - subtitle <- getW castToLabel "headerSubtitle" - spinner <- getW castToSpinner "headerSpinner" - -- [openItem, openTwoItem] <- mapM (getW castToMenuItem) ["open", "openTwo"] -+ openItem <- getW castToMenuItem "open" -+ openTwoItem <- getW castToMenuItem "openTwo" - recordSessionItem <- getW castToMenuItem "recordSession" - recordSystemItem <- getW castToMenuItem "recordSystem" - recordAddressItem <- getW castToMenuItem "recordAddress" --- -2.24.1 - diff --git a/sources b/sources index 36bbda7..4e3d505 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bustle-0.7.5.tar.gz) = 7165597026fca85fe27b6a8a3f7db4de087bf95b51df7e7e2aa229bb54b6900c303841699585f6f17c26e125a3caec32b3b2c6863163c12a1af17a60e213b480 +SHA512 (bustle-0.8.0.tar.gz) = 92f4757c4ed9dd88bfa144a0626d7530b6a1f859a8069d8631a9990b6a523dbb59d573c6ba142614c371171ccf391a3e77d1e8ba0c2155ecf231f9e7aa735f72