Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package profanity for openSUSE:Factory 
checked in at 2021-01-18 14:39:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/profanity (Old)
 and      /work/SRC/openSUSE:Factory/.profanity.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "profanity"

Mon Jan 18 14:39:20 2021 rev:24 rq:864029 version:0.10.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/profanity/profanity.changes      2021-01-10 
19:46:21.038095116 +0100
+++ /work/SRC/openSUSE:Factory/.profanity.new.28504/profanity.changes   
2021-01-18 14:46:15.974060281 +0100
@@ -1,0 +2,14 @@
+Mon Jan 18 10:26:58 UTC 2021 - Michael Vetter <[email protected]>
+
+- Fix Factory build:
+  * Create correct symlinks
+  * Use update-alternatives correctly
+  * Use clearer style
+
+-------------------------------------------------------------------
+Mon Jan 18 09:36:57 UTC 2021 - Michael Vetter <[email protected]>
+
+- boo#1180739: Fix typo in themes:
+  * Add profanity-0.10.0-theme-typo.patch
+
+-------------------------------------------------------------------

New:
----
  profanity-0.10.0-theme-typo.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ profanity.spec ++++++
--- /var/tmp/diff_new_pack.EGhq85/_old  2021-01-18 14:46:16.618061252 +0100
+++ /var/tmp/diff_new_pack.EGhq85/_new  2021-01-18 14:46:16.622061258 +0100
@@ -25,6 +25,8 @@
 URL:            https://profanity-im.github.io
 Source:         
https://github.com/profanity-im/profanity/releases/download/%{version}/profanity-%{version}.tar.gz
 Source1:        profanity-rpmlintrc
+# FIX-UPSTREAM - [email protected] - boo#1180739
+Patch0:         profanity-0.10.0-theme-typo.patch
 BuildRequires:  glib2-devel >= 2.62
 BuildRequires:  gtk2-devel
 BuildRequires:  libcurl-devel
@@ -81,6 +83,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "s/python-config/python3-config/g" configure
 
 %build
@@ -102,7 +105,7 @@
 %make_install
 rm %{buildroot}%{_libdir}/libprofanity.la
 
-mv %{buildroot}%{_bindir}/profanity{,-standard}
+mv %{buildroot}%{_bindir}/profanity %{buildroot}%{_bindir}/profanity-standard
 
 make clean
 
@@ -122,12 +125,11 @@
 %make_install
 rm %{buildroot}%{_libdir}/libprofanity.la
 
-mv %{buildroot}%{_bindir}/profanity{,-mini}
+mv %{buildroot}%{_bindir}/profanity %{buildroot}%{_bindir}/profanity-mini
 
 # u-a handling
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
-ln -s profanity %{buildroot}%{_sysconfdir}/alternatives/profanity
-ln -s profanity %{buildroot}%{_bindir}/profanity
+ln -s -f %{_sysconfdir}/alternatives/profanity %{buildroot}%{_bindir}/profanity
 
 %files
 %{_mandir}/man1/profanity.1%{?ext_man}
@@ -144,32 +146,32 @@
 
 %files mini
 %ghost %{_sysconfdir}/alternatives/profanity
-%ghost %{_bindir}/profanity
+%{_bindir}/profanity
 %{_bindir}/profanity-mini
 
 %files standard
 %ghost %{_sysconfdir}/alternatives/profanity
-%ghost %{_bindir}/profanity
+%{_bindir}/profanity
 %{_bindir}/profanity-standard
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+
 %post mini
 %{_sbindir}/update-alternatives --install \
     %{_bindir}/profanity profanity %{_bindir}/profanity-mini 10
 
-%preun mini
-if [ "$1" = 0 ] ; then
+%postun mini
+if [ ! -f %{_bindir}/profanity-mini ] ; then
   %{_sbindir}/update-alternatives --remove profanity %{_bindir}/profanity-mini
 fi
 
 %post standard
 %{_sbindir}/update-alternatives --install \
     %{_bindir}/profanity profanity %{_bindir}/profanity-standard 20
-/sbin/ldconfig
 
-%preun standard
-if [ "$1" = 0 ] ; then
+%postun standard
+if [ ! -f %{_bindir}/profanity-standard ] ; then
   %{_sbindir}/update-alternatives --remove profanity 
%{_bindir}/profanity-standard
 fi
 

++++++ profanity-0.10.0-theme-typo.patch ++++++
>From 9e679a03a5180f0c6a7b8d466ec7b544647459f4 Mon Sep 17 00:00:00 2001
From: Michael Vetter <[email protected]>
Date: Mon, 18 Jan 2021 10:32:53 +0100
Subject: [PATCH] Fix color typo in headache and whiteness theme

Reported at: https://bugzilla.suse.com/show_bug.cgi?id=1180739
Fixes https://github.com/profanity-im/profanity/issues/1471
---
 themes/headache  | 2 +-
 themes/whiteness | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/headache b/themes/headache
index 5b2f5cba1..cf2c8f259 100644
--- a/themes/headache
+++ b/themes/headache
@@ -36,7 +36,7 @@ otr.untrusted=yellow
 online=red
 away=cyan
 chat=green
-dnd=megenta
+dnd=magenta
 xa=cyan
 offline=green
 incoming=yellow
diff --git a/themes/whiteness b/themes/whiteness
index bea6722e2..8115b99a9 100644
--- a/themes/whiteness
+++ b/themes/whiteness
@@ -16,7 +16,7 @@ titlebar.xa=white
 statusbar=blue
 statusbar.text=white
 statusbar.brackets=white
-statusbar.active=megenta
+statusbar.active=magenta
 statusbar.new=red
 main.text=black
 main.text.me=black

Reply via email to