The package rpms/psi-plus.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/psi-plus.git/commit/?id=2643b99446b….
Change:
+ExclusiveArch: %{qt5_qtwebengine_arches}
Thanks.
Full change:
============
commit b632a40265864a5a969a66963d46517ca240ca07
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Jul 31 17:57:41 2020 +0200
Added virtual provides for the bundled libraries.
diff --git a/psi-plus.spec b/psi-plus.spec
index de1b1c3..83e5ba6 100644
--- a/psi-plus.spec
+++ b/psi-plus.spec
@@ -3,13 +3,15 @@
Name: psi-plus
Version: 1.4.1472
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
# GPLv2+ - core project.
# LGPLv2.1+ - iris library, widgets, several tools.
# zlib/libpng - bundled minizip library.
-License: GPLv2+ and LGPLv2+ and zlib
+# MIT - bundled http-parser and qhttp libraries.
+# ASL 2.0 - bundled libqite library.
+License: GPLv2+ and LGPLv2+ and zlib and MIT and ASL 2.0
Summary: Jabber client based on Qt
URL: https://%{name}.com
@@ -59,8 +61,11 @@ Requires: qca-qt5-gnupg%{?_isa}
Requires: qca-qt5-ossl%{?_isa}
Requires: hicolor-icon-theme
-Provides: bundled(iris)
-Provides: bundled(minizip) = 1.2
+Provides: bundled(iris) = 0~git
+Provides: bundled(minizip) = 1.2.11
+Provides: bundled(qhttp) = 2.0.0
+Provides: bundled(http-parser) = 2.9.4
+Provides: bundled(libqite) = 0~git
# Obsolete and remove old subpackages
Provides: %{name}-i18n = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -144,6 +149,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%{_libdir}/%{name}
%changelog
+* Fri Jul 31 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:1.4.1472-2
+- Added virtual provides for the bundled libraries.
+
* Fri Jul 31 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:1.4.1472-1
- Updated to version 1.4.1472.
- Performed major SPEC cleanup and unification.
commit 1c27e99a26e16ecba6812a593d4a329ebf1f27aa
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Jul 31 17:12:15 2020 +0200
Added Qt5Keychain build requirement.
diff --git a/psi-plus.spec b/psi-plus.spec
index c5adea2..de1b1c3 100644
--- a/psi-plus.spec
+++ b/psi-plus.spec
@@ -21,6 +21,7 @@ BuildRequires: cmake(Qt5XmlPatterns)
BuildRequires: cmake(Qt5Multimedia)
BuildRequires: cmake(Qt5X11Extras)
BuildRequires: cmake(Qt5WebEngine)
+BuildRequires: cmake(Qt5Keychain)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(QJDns-qt5)
BuildRequires: cmake(Qt5Core)
commit 2643b99446bdf4bc27aa6aa559d46145ebd61ee8
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Jul 31 16:58:42 2020 +0200
Updated to version 1.4.1472.
Performed major SPEC cleanup and unification.
Switched from QtWebKit to QtWebEngine.
Enabled voice and video plugin.
diff --git a/.gitignore b/.gitignore
index f3b03e9..0bfb44a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
/psi-plus-1.4.654-1.fc31.src.rpm
/psi-plus-1.4.654.tar.gz
/psi-plus-l10n-1.4.636.tar.gz
+/psi-plus-1.4.1472.tar.gz
+/psi-plus-l10n-1.4.1472.tar.gz
diff --git a/psi-plus.spec b/psi-plus.spec
index 7f91b7f..c5adea2 100644
--- a/psi-plus.spec
+++ b/psi-plus.spec
@@ -1,312 +1,154 @@
-%global version_l10n 1.4.636
-%global genericplugins attentionplugin autoreplyplugin birthdayreminderplugin chessplugin cleanerplugin clientswitcherplugin conferenceloggerplugin contentdownloaderplugin enummessagesplugin extendedmenuplugin extendedoptionsplugin gnupgplugin gomokugameplugin historykeeperplugin httpuploadplugin icqdieplugin imageplugin imagepreviewplugin jabberdiskplugin juickplugin messagefilterplugin omemoplugin otrplugin pepchangenotifyplugin qipxstatusesplugin screenshotplugin skinsplugin stopspamplugin storagenotesplugin translateplugin videostatusplugin watcherplugin
-# %%global unixplugins
-%global devplugins pstoplugin ripperccplugin
-%global desc_common Psi+ is a development branch of Psi XMPP client.
+%undefine __cmake_in_source_build
+%global version_l10n 1.4.1472
-Summary: Jabber client based on Qt
Name: psi-plus
-Version: 1.4.654
-Release: 7%{?dist}
+Version: 1.4.1472
+Release: 1%{?dist}
Epoch: 1
-URL: https://%{name}.com
-# GPLv2+ - core of Psi+
-# LGPLv2.1+ - iris library, Psi+ widgets, several Psi+ tools
-# zlib/libpng - UnZip 0.15 additionnal library
+# GPLv2+ - core project.
+# LGPLv2.1+ - iris library, widgets, several tools.
+# zlib/libpng - bundled minizip library.
License: GPLv2+ and LGPLv2+ and zlib
-Source0: https://github.com/%{name}/%{name}-snapshots/archive/%{version}.tar.gz#/%{n…
-Source1: https://github.com/%{name}/%{name}-l10n/archive/%{version_l10n}.tar.gz#/%{n…
+Summary: Jabber client based on Qt
+URL: https://%{name}.com
-BuildRequires: cmake
-BuildRequires: gcc-c++
+Source0: https://github.com/%{name}/%{name}-snapshots/archive/%{version}/%{name}-%{v…
+Source1: https://github.com/%{name}/%{name}-l10n/archive/%{version_l10n}/%{name}-l10…
+BuildRequires: cmake(Qt5LinguistTools)
+BuildRequires: cmake(Qt5XmlPatterns)
+BuildRequires: cmake(Qt5Multimedia)
+BuildRequires: cmake(Qt5X11Extras)
+BuildRequires: cmake(Qt5WebEngine)
+BuildRequires: cmake(Qt5Network)
+BuildRequires: cmake(QJDns-qt5)
BuildRequires: cmake(Qt5Core)
+BuildRequires: cmake(Qt5DBus)
+BuildRequires: cmake(Qca-qt5)
BuildRequires: cmake(Qt5Gui)
-BuildRequires: cmake(Qt5Widgets)
-BuildRequires: cmake(Qt5WebKit)
-BuildRequires: cmake(Qt5WebKitWidgets)
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Xml)
-BuildRequires: cmake(Qt5XmlPatterns)
-BuildRequires: cmake(Qt5Network)
-BuildRequires: cmake(Qt5Concurrent)
-BuildRequires: cmake(Qt5DBus)
-BuildRequires: cmake(Qt5Sql)
-BuildRequires: cmake(Qt5Script)
-BuildRequires: cmake(Qt5X11Extras)
-BuildRequires: cmake(Qt5Multimedia)
-BuildRequires: cmake(Qt5Keychain)
-BuildRequires: pkgconfig(qca2-qt5)
-BuildRequires: pkgconfig(qjdns-qt5)
-BuildRequires: qt5-linguist
-BuildRequires: pkgconfig(zlib)
-BuildRequires: pkgconfig(enchant)
+BuildRequires: pkgconfig(libsignal-protocol-c)
+BuildRequires: pkgconfig(gstreamer-audio-1.0)
+BuildRequires: pkgconfig(gstreamer-video-1.0)
+BuildRequires: pkgconfig(gstreamer-base-1.0)
+BuildRequires: pkgconfig(gstreamer-app-1.0)
+BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(xscrnsaver)
-BuildRequires: pkgconfig(openssl)
-# FIXME drop compatibility to zlic when F29 becomes EOL
-# https://src.fedoraproject.org/rpms/psi/blob/master/f/psi.spec#_38
-%if 0%{?fedora} && 0%{?fedora} < 30
-BuildRequires: pkgconfig(minizip-compat)
-%else
-Provides: bundled(minizip) = 1.2
-%endif
+BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(libotr)
BuildRequires: pkgconfig(libidn)
-BuildRequires: pkgconfig(libsignal-protocol-c)
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(tidy)
BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: libtidy-devel
-
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: sox%{?_isa}
-Requires: gnupg
-Requires: qca-qt5-ossl%{?_isa}
+BuildRequires: libappstream-glib
+BuildRequires: libgcrypt-devel
+BuildRequires: ninja-build
+BuildRequires: gcc-c++
+BuildRequires: cmake
+BuildRequires: gcc
+Recommends: %{name}-plugins%{?_isa}
Requires: qca-qt5-gnupg%{?_isa}
-
+Requires: qca-qt5-ossl%{?_isa}
Requires: hicolor-icon-theme
-# New Fedora rules allow to use bundled libraries
-# https://bugzilla.redhat.com/show_bug.cgi?id=737304#c15
Provides: bundled(iris)
+Provides: bundled(minizip) = 1.2
-%description
-%{desc_common}
-
-%package i18n
-Summary: Language packs for Psi
-Requires: %{name} = %{epoch}:%{version}-%{release}
-BuildArch: noarch
-
-%description i18n
-%{desc_common}
-This package adds internationalization to Psi+.
-
-%package common
-Summary: Noarch resources for Psi+
-BuildArch: noarch
-
-%description common
-%{desc_common}
-This package contains huge of base mandatory resources for Psi+.
-
-%package plugins
-Summary: Plugins pack for Psi+
-# GPLv2 is used for the most plugins
-# BSD - screenshot plugin
-# Beerware - icqdie plugin
-License: GPLv2+ and BSD and Beerware
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-# Filter out plugins from provides
-%global __provides_exclude_from ^%{_libdir}/%{name}
-
-
-%description plugins
-%{desc_common}
-
- * Attention Plugin
-This plugin is designed to send and receive special messages such as
-Attentions.
-
- * Autoreply Plugin
-This plugin acts as an auto-answering machine.
-
- * Birthday Reminder Plugin
-This plugin is designed to show reminders of upcoming birthdays.
-
- * Chess Plugin
-This plugin allows you to play chess with your friends.
-The plugin is compatible with a similar plugin for Tkabber.
-
- * Cleaner Plugin
-This plugin is designed to clear the avatar cache, saved local copies
-of vCards and history logs.
-
- * Client Switcher Plugin
-This plugin is intended to spoof version of the Jabber client, the
-name and type of operating system. It is possible to manually specify
-the version of the client and the operating system or choose from a
-predefined list.
-
- * Conference Logger Plugin
-This plugin is designed to save conference logs in which the Psi+
-user sits.
-
- * Content Downloader Plugin
-This plugin can currently be used to download and install roster
-iconsets and emoticons.
-
- * Enum Messages Plugin
-The plugin is designed to enumerate messages, adding the messages
-numbers in chat logs and notification of missed messages. Supports
-per contact on / off message enumeration via the buttons on the chats
-toolbar.
-
- * Extended Menu Plugin
-This plugin adds roster submenu 'Extended Actions' to contact's
-context menu. At the moment we have the following items: 'Copy JID',
-'Copy the nickname', 'Copy the status message' and 'Ping'.
-
- * Extended Options Plugin
-This plugin is designed to allow easy configuration of some advanced
-options in Psi+. This plugin gives you access to advanced application
-options, which do not have a graphical user interface.
-
- * GnuPG Key Manager
-GnuPG Key Manager can create, remove, export and import GnuPG keys.
-It can do only the base operations but I hope it will be enough for
-your needs.
-
- * History Keeper Plugin
-This plugin is designed to remove the history of selected contacts
-when the Psi+ is closed.
-
- * HTTP Upload Plugin
-This plugin allows uploading images and other files via XEP-0363.
-
- * ICQ Must Die Plugin
-This plugin is designed to help you transfer as many contacts as
-possible from ICQ to Jabber.
-
- * Image Plugin
-This plugin is designed to send images to roster contacts.
-
- * Image Preview Plugin
-This plugin shows the preview image for an image URL.
-
- * Juick Plugin
-This plugin is designed to work efficiently and comfortably with the
-Juick microblogging service.
-
- * PEP Change Notify Plugin
-The plugin is designed to display popup notifications on change of
-moods, activities and tunes at the contacts of the roster. In the
-settings you can choose which ones to include notification of events,
-specify the time within which a notice will appear, as well as play a
-sound specify.
-
- * Qip X-statuses Plugin
-This plugin is designed to display X-statuses of contacts using the
-QIP Infium jabber client.
-
- * Screenshot Plugin
-This plugin allows you to make a snapshot (screenshot) of the screen,
-edit the visible aria to make a screenshot and save the image to a
-local drive or upload to HTTP/FTP server.
-
- * Stop Spam Plugin
-This plugin is designed to block spam messages and other unwanted
-information from Psi+ users.
-
- * Storage Notes Plugin
-This plugin is an implementation of XEP-0049: Private XML Storage.
-The plugin is fully compatible with notes saved using Miranda IM.
-The plugin is designed to keep notes on the jabber server with the
-ability to access them from anywhere using Psi+ or Miranda IM.
-
- * Translate Plugin
-This plugin allows you to convert selected text into another language.
+# Obsolete and remove old subpackages
+Provides: %{name}-i18n = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-i18n < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-icons = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-icons < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-common < %{?epoch:%{epoch}:}%{version}-%{release}
- * Video Status Changer Plugin
-This plugin is designed to set the custom status when you see the
-video in selected video player. Communication with players made by
-D-Bus.
-
- * Skins Plugin
-This plugin is designed to create, store and apply skins to Psi+.
-
- * Off-the-Record Messaging Plugin
-a cryptographic protocol that provides strong encryption for instant
-messaging conversations. OTR uses a combination of the AES
-symmetric-key algorithm, the Diffie–Hellman key exchange, and the SHA-1
-hash function. In addition to authentication and encryption, OTR
-provides perfect forward secrecy and malleable encryption.
-
- * PSTO Plugin
-Instant bloging service.
-
- * OMEMO Plugin
-A plugin that adds support for OMEMO encryption.
+# Required qt5-qtwebengine is not available on some arches.
+ExclusiveArch: %{qt5_qtwebengine_arches}
+%description
+%{name} is the premiere Instant Messaging application designed for Microsoft
+Windows, Apple Mac OS X and GNU/Linux. Built upon an open protocol named
+Jabber, %{name} is a fast and lightweight messaging client that utilises the best
+in open source technologies. %{name} contains all the features necessary to chat,
+with no bloated extras that slow your computer down. The Jabber protocol
+provides gateways to other protocols as AIM, ICQ, MSN and Yahoo!.
+
+%package plugins
+# GPLv2+ is used for the most plugins.
+# BSD - screenshot plugin.
+License: GPLv2+ and BSD
+Summary: Additional plugins for %{name}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description plugins
+This package adds additional plugins to %{name}.
%prep
-%autosetup -n %{name}-snapshots-%{version}
-
-# fix rpmlint spurious-executable-perm
-find . -name '*.cpp' -or -name '*.h' | xargs chmod 644
+%autosetup -n %{name}-snapshots-%{version} -p1
-# Remove bundled libraries
-%if 0%{?fedora} && 0%{?fedora} < 30
-rm -rf src/libpsi/tools/zip/minizip
-%endif
-rm -fr iris/src/jdns
-
-# Psi+ always uses last iris version. So I need to provide bundled
-# iris to guarantee efficiency of program.
-# rm -fr iris
-
-tar xf %{SOURCE1} -C .
+# Unpacking tarball with additional locales...
+tar -xf %{SOURCE1} %{name}-l10n-%{version}/translations --strip=1
+# Removing bundled libraries...
+rm -rf iris/src/jdns
%build
-mkdir build
-pushd build
-%cmake .. \
- -DUSE_ENCHANT=ON \
- -DUSE_HUNSPELL=OFF \
- -DUSE_KEYCHAIN=ON \
- -DENABLE_PLUGINS=ON
-popd
-%make_build -C build
-
-pushd %{name}-l10n-%{version_l10n}/translations
-lrelease-qt5 *.ts
-popd
-
+%cmake -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DUSE_QT5:BOOL=ON \
+ -DUSE_ENCHANT:BOOL=OFF \
+ -DUSE_HUNSPELL:BOOL=ON \
+ -DUSE_QJDNS:BOOL=ON \
+ -DSEPARATE_QJDNS:BOOL=ON \
+ -DENABLE_PLUGINS:BOOL=ON \
+ -DUSE_KEYCHAIN:BOOL=ON \
+ -DBUILD_PSIMEDIA:BOOL=ON \
+ -DINSTALL_EXTRA_FILES:BOOL=ON \
+ -DUSE_DBUS:BOOL=ON \
+ -DPRODUCTION:BOOL=ON \
+ -DCHAT_TYPE:STRING=WEBENGINE
+%cmake_build
%install
-%make_install -C build
-install -p -m0644 -D psi.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
-for p in 16 32 48 64 128
-do
- install -p -m0644 -D iconsets/system/default/psiplus/logo_${p}.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${p}x${p}/apps/%{name}.png
-done
-
-# Install languages
-cp -p %{name}-l10n-%{version_l10n}/translations/*.qm $RPM_BUILD_ROOT%{_datadir}/%{name}
+%cmake_install
%find_lang psi --with-qt
-
+rm -rf %{buildroot}%{_datadir}/%{name}/COPYING
%check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-%files
+%files -f psi.lang
%license COPYING
%doc README
%{_bindir}/%{name}
-%{_datadir}/appdata/%{name}.appdata.xml
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/certs
+%{_datadir}/%{name}/iconsets
+%{_datadir}/%{name}/sound
+%{_datadir}/%{name}/*.{txt,html}
+%{_metainfodir}/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.png
-%files i18n -f psi.lang
-
%files plugins
-%{_libdir}/%{name}/
-
-%files common
-%license COPYING
-%{_datadir}/%{name}/
-%exclude %{_datadir}/%{name}/*.qm
-
+%{_libdir}/%{name}
%changelog
+* Fri Jul 31 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:1.4.1472-1
+- Updated to version 1.4.1472.
+- Performed major SPEC cleanup and unification.
+- Switched from QtWebKit to QtWebEngine.
+- Enabled voice and video plugin.
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.4.654-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 8b95fd1..80af58c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (psi-plus-1.4.654.tar.gz) = d346c6025db5545829425800f102f79439d405213b481ba3101029032ad11ba6ab5c71c1f2cafde9a43d62fddbe4a021a36adc65d66ff9d8f7afdd95753b5c0b
-SHA512 (psi-plus-l10n-1.4.636.tar.gz) = b07d9ea094cf0148577de25355f2c2c99f579c7f1c5a27ce2d028b36c724730fd4b37cff3682f76fb1a85e14a46e92476fdf2c2c042d36b9ade59259d18ff060
+SHA512 (psi-plus-1.4.1472.tar.gz) = d37fa8587c8a714fc5fd813a354065cd250e9e31099b394bddf388fe154425b7fa8e9b535bf5800fc827d1b14d76d32f16ceaa122e3259a86b4bd77634c467bb
+SHA512 (psi-plus-l10n-1.4.1472.tar.gz) = 92fb3d7098ae34637fd37483453e160fbec89a91836204cb54726316597fd24d716602318b26c0178891c55f172fef05145b50200361565be4098d6247c177dd
commit 6a6a2a08f90a5fae630d135b160e46cf26279776
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 28 23:06:30 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/psi-plus.spec b/psi-plus.spec
index a6d3e15..7f91b7f 100644
--- a/psi-plus.spec
+++ b/psi-plus.spec
@@ -7,7 +7,7 @@
Summary: Jabber client based on Qt
Name: psi-plus
Version: 1.4.654
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
URL: https://%{name}.com
@@ -307,6 +307,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.4.654-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.4.654-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 4f477a47525eeb40572c798f237d25a10aa11015
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 30 09:53:05 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/psi-plus.spec b/psi-plus.spec
index 53fbbc8..a6d3e15 100644
--- a/psi-plus.spec
+++ b/psi-plus.spec
@@ -7,7 +7,7 @@
Summary: Jabber client based on Qt
Name: psi-plus
Version: 1.4.654
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
URL: https://%{name}.com
@@ -307,6 +307,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.4.654-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:1.4.654-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
The package rpms/bout++.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bout++.git/commit/?id=57a7ec5166d41….
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit 57a7ec5166d417e8f09a71904dd62d8b97c6343a
Author: David Schwörer <dave(a)ipp.mpg.de>
Date: Sat Aug 8 22:09:35 2020 +0100
Re-enable lto for s390x
Scratch build succeeded
diff --git a/bout++.spec b/bout++.spec
index 8115c23..f1782f0 100644
--- a/bout++.spec
+++ b/bout++.spec
@@ -24,12 +24,6 @@ Patch0: remove-mpark.patch
%bcond_without mpich
%bcond_without openmpi
-%ifarch s390x
-# This package fails its testsuite when LTO is enabled. It is not yet clear if
-# this is an LTO issue or an issue with the package itself
-%define _lto_cflags %{nil}
-%endif
-
# Enable weak dependencies
%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 7 )
%bcond_without recommend
The package rpms/bout++.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bout++.git/commit/?id=ac269ff1f3893….
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit ac269ff1f3893a520d42bbcd0028e0708ba4a7e4
Author: David Schwörer <dave(a)ipp.mpg.de>
Date: Sat Aug 8 13:54:41 2020 +0100
Disable LTO on s390x
Minor cleanup of with mpi section
Always debug errors in %check
diff --git a/bout++.spec b/bout++.spec
index c511a56..7b22de9 100644
--- a/bout++.spec
+++ b/bout++.spec
@@ -20,22 +20,14 @@ Patch0: remove-mpark.patch
%bcond_without test
%endif
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%ifarch ppc64
-# No mpich on ppc64 in EL6
-%bcond_with mpich
-%else
+# Enable both mpi every where
%bcond_without mpich
-%endif
-%else
-%bcond_without mpich
-%endif
-
-%ifarch s390 s390x
-# No openmpi on s390(x)
-%bcond_with openmpi
-%else
%bcond_without openmpi
+
+%ifarch s390x
+# This package fails its testsuite when LTO is enabled. It is not yet clear if
+# this is an LTO issue or an issue with the package itself
+%define _lto_cflags %{nil}
%endif
# Enable weak dependencies
@@ -420,7 +412,7 @@ do
export OMPI_MCA_rmaps_base_oversubscribe=yes
pushd build_$mpi
make %{?_smp_mflags} build-check
- make check
+ SEGFAULT_SIGNALS="abrt segv" LD_PRELOAD=%{_libdir}/libSegFault.so make check
popd
if [ $mpi = mpich ] ; then
%_mpich_unload
@@ -501,6 +493,9 @@ done
#
%changelog
+* Sat Aug 08 2020 David Schwörer <schword2mail.dcu.ie> - 4.3.1-5
+- Disable lto for s390x
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.3.1-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
The package rpms/supermin.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/supermin.git/commit/?id=517a7171c7e….
Change:
+ExclusiveArch: %{kernel_arches}
Thanks.
Full change:
============
commit 517a7171c7ecdee52056cc80fbb820568e31dfaf
Author: Troy Dawson <tdawson(a)fedoraproject.org>
Date: Fri Aug 7 16:14:21 2020 +0000
Use ExclusiveArch: %{kernel_arches}
kernel_arches is a new rpm macro variable that is now in the Fedora buildroot as of redhat-rpm-config-167.
It lists what architectures the full kernel is built on.
Architectures that only have the kernel-header (such as i686) is not listed.
Thus, it can be used as a variable so that packages that depend on the kernel, can have a consistent way of listing the architectures.
The variable is currently only in Fedora, but is expected to be in RHEL9, and hopefully backported to earlier RHEL versions.
This pull request updates the spec to use %{kernel_arches} for ExclusiveArch:
diff --git a/supermin.spec b/supermin.spec
index 9b371b7..4d1345d 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -29,14 +29,10 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
-%if 0%{?rhel} >= 7
-ExclusiveArch: x86_64
-%endif
-
-ExcludeArch: %{ix86}
+ExclusiveArch: %{kernel_arches}
URL: http://people.redhat.com/~rjones/supermin/
Source0: http://download.libguestfs.org/supermin/%{source_directory}/%{name}-%{versi…
@@ -168,6 +164,9 @@ make check || {
%changelog
+* Fri Aug 07 2020 Troy Dawson <tdawson(a)redhat.com> - 5.2.0-4
+- Use ExclusiveArch: %{kernel_arches}
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
The package rpms/python-theano.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-theano.git/commit/?id=b15c2b….
Change:
-%ifarch %{power64}
Thanks.
Full change:
============
commit b15c2bd5c4b7637e94e7cfc7229f594adc6602a9
Author: Jerry James <loganjerry(a)gmail.com>
Date: Fri Aug 7 17:02:19 2020 -0600
Do not use %ifarch in a noarch package.
diff --git a/python-theano.spec b/python-theano.spec
index 358571e..601a5f6 100644
--- a/python-theano.spec
+++ b/python-theano.spec
@@ -150,15 +150,15 @@ cd -
chmod a+x $(find %{buildroot} -name \*.py -o -name \*.sh | xargs grep -l '^#!')
%check
-%ifarch %{power64}
# FIXME: some tests fail on ppc64le
# The conv3d2d tests compute the wrong type of values (float32 instead of
# float64) and the wrong values.
-sed -i '/parameterized\.expand/,$d' ttheano/tensor/nnet/tests/test_conv3d2d.py
+if [ "uname -m" = "ppc64le" ]; then
+ sed -i '/parameterized\.expand/,$d' ttheano/tensor/nnet/tests/test_conv3d2d.py
-# An unexpected GradientError is thrown at theano/gradient.py line 1790
-rm theano/tensor/nnet/tests/test_corr3d.py
-%endif
+ # An unexpected GradientError is thrown at theano/gradient.py line 1790
+ rm theano/tensor/nnet/tests/test_corr3d.py
+fi
%{python3} bin/theano-nose --processes=0 --process-restartworker