Hello community, here is the log from the commit of package swift-im for openSUSE:Factory checked in at 2017-11-09 13:56:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swift-im (Old) and /work/SRC/openSUSE:Factory/.swift-im.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swift-im" Thu Nov 9 13:56:01 2017 rev:4 rq:536259 version:4.0~rc2 Changes: -------- --- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes 2017-08-24 18:30:14.744640168 +0200 +++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes 2017-11-09 13:56:39.401608896 +0100 @@ -1,0 +2,11 @@ +Thu Oct 19 18:34:04 UTC 2017 - [email protected] + +- Use gcc6 for Leap to fix compilation issue. + +------------------------------------------------------------------- +Tue Oct 17 21:39:59 UTC 2017 - [email protected] + +- Spec cleanup. +- Ship translations within the package. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swift-im.spec ++++++ --- /var/tmp/diff_new_pack.78Spf1/_old 2017-11-09 13:56:40.705561394 +0100 +++ /var/tmp/diff_new_pack.78Spf1/_new 2017-11-09 13:56:40.709561249 +0100 @@ -17,6 +17,12 @@ %define _name swift +%if 0%{?sle_version} == 120300 || 0%{?sle_version} == 120200 +%define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 cc=gcc-6 cxx=g++-6 cxxflags='%{optflags}' +%else +%define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 cxxflags='%{optflags}' +%endif + Name: swift-im Version: 4.0~rc2 Release: 0 @@ -24,35 +30,44 @@ License: GPL-3.0 Group: Productivity/Networking/Talk/Clients Url: http://swift.im/ -#Source0: http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz -Source0: http://swift.im/downloads/releases/swift-4.0rc2/swift-4.0rc2.tar.gz -BuildRequires: avahi-devel +Source0: http://swift.im/downloads/releases/%{_name}-4.0rc2/%{_name}-4.0rc2.tar.gz BuildRequires: boost-devel BuildRequires: desktop-file-utils BuildRequires: docbook-dtds +BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: libQt5Core-devel -BuildRequires: libQt5DBus-devel -BuildRequires: libQt5Gui-devel -BuildRequires: libQt5Network-devel -BuildRequires: libQt5WebKit5-devel -BuildRequires: libQt5WebKitWidgets-devel -BuildRequires: libQt5Widgets-devel -BuildRequires: libexpat-devel -BuildRequires: libidn-devel BuildRequires: libminiupnpc-devel -BuildRequires: libopenssl-devel -BuildRequires: libqt5-linguist-devel -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtdeclarative-devel -BuildRequires: libqt5-qtmultimedia-devel -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-qttools -BuildRequires: libqt5-qtx11extras-devel -BuildRequires: libxslt -BuildRequires: python-xml BuildRequires: scons -BuildRequires: zlib-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(avahi-client) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(libedit) +BuildRequires: pkgconfig(libidn) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(zlib) +%if 0%{?sle_version} == 120300 || 0%{?sle_version} == 120200 +BuildRequires: -gcc +BuildRequires: -gcc-c++ +BuildRequires: gcc6 +BuildRequires: gcc6-c++ +%endif %description Swift is an easy to setup and use Jabber/XMPP instant messaging chat @@ -81,7 +96,6 @@ %prep %setup -q -n swift-4.0rc2 - # Remove 3rd party libraries # Following ones are used from distro: find 3rdParty/Boost/src -delete @@ -108,44 +122,22 @@ # Needed for tests # find 3rdParty/HippoMocks -delete -echo 'ccflags="%{optflags} -fPIC".split(" ")' >> config.py +sed -e 's:, myenv.File("../../COPYING.thirdparty")::' -i Swift/QtUI/SConscript %build -scons V=1 Swift Swiften swiften_dll=1 test=none %{?_smp_mflags} +scons %{_flags} Swift Swiften %{?_smp_mflags} -%install SWIFTEN_INSTALLDIR=%{buildroot}%{prefix} +%install +scons %{_flags} \ + SWIFT_INSTALLDIR=%{buildroot}%{_prefix} \ + SWIFTEN_INSTALLDIR=%{buildroot}%{_prefix} \ + SWIFTEN_LIBDIR=%{buildroot}%{_libdir} \ + %{buildroot}%{_prefix} -scons V=1 swiften_dll=1 SWIFTEN_INSTALLDIR=%{buildroot}%{_prefix} SWIFTEN_LIBDIR=%{buildroot}/%{_libdir} %{buildroot}%{_prefix} -install -p -D -m 755 Swift/QtUI/swift-im \ - %{buildroot}%{_bindir}/swift-im -install -p -m 644 -D Swift/resources/logo/logo-icon-32.xpm \ - %{buildroot}%{_datadir}/pixmaps/%{_name}.xpm -install -p -m 644 -D Swift/resources/logo/logo-icon-128.png \ - %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{_name}.png -install -p -m 644 -D Swift/resources/logo/logo-icon-16.png \ - %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{_name}.png -install -p -m 644 -D Swift/resources/logo/logo-icon-22.png \ - %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/%{_name}.png -install -p -m 644 -D Swift/resources/logo/logo-icon-24.png \ - %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{_name}.png -install -p -m 644 -D Swift/resources/logo/logo-icon-512.png \ - %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/%{_name}.png -install -p -m 644 -D Swift/resources/logo/logo-icon-64.png \ - %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{_name}.png - -# menu -desktop-file-install \ ---dir=%{buildroot}%{_datadir}/applications \ -Swift/resources/swift.desktop - -#some of their Qt tests dont work currently -#check -#LD_LIBRARY_PATH=./Swiften scons V=1 %{?_smp_mflags} test=unit QA +%fdupes %{buildroot}%{_prefix} +%suse_update_desktop_file -r %{_name} Network InstantMessaging -%post %icon_theme_cache_post - -%postun %icon_theme_cache_postun %post -n libSwiften4 -p /sbin/ldconfig @@ -154,12 +146,18 @@ %files %defattr(-,root,root) %doc COPYING -%dir %{_datadir}/icons/hicolor/512x512 -%dir %{_datadir}/icons/hicolor/512x512/apps -%{_bindir}/swift-im +%{_bindir}/%{_name}-im +%{_bindir}/%{_name}-open-uri %{_datadir}/applications/%{_name}.desktop %{_datadir}/pixmaps/%{_name}.xpm %{_datadir}/icons/hicolor/*/apps/%{_name}.png +%{_datadir}/icons/hicolor/32x32/apps/%{_name}.xpm +%{_datadir}/icons/hicolor/scalable/apps/%{_name}.svg +%dir %{_datadir}/%{_name} +%dir %{_datadir}/%{_name}/sounds +%{_datadir}/%{_name}/sounds/message-received.wav +%dir %{_datadir}/%{_name}/translations +%{_datadir}/%{_name}/translations/swift_*.qm %files -n libSwiften4 %defattr(-,root,root)
