Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2017-06-04 02:00:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Sun Jun 4 02:00:18 2017 rev:40 rq:500591 version:0.16.584.748+1 Changes: -------- New Changes file: --- /dev/null 2017-03-01 00:40:19.279048016 +0100 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+-lang.changes 2017-06-04 02:00:23.907377693 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Tue May 23 08:03:19 UTC 2017 - [email protected] + +- split off psi+ to handle versions of -lang correctly +- update to 0.16.584.737+0 --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2017-05-22 18:09:53.777610282 +0200 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+.changes 2017-06-04 02:00:23.935373741 +0200 @@ -1,0 +2,11 @@ +Tue May 23 07:47:55 UTC 2017 - [email protected] + +- update to 0.16.584.748+1 + * some bugfixes + * code unification of psi and psi+ +- switch to sane versioning, according to upstream version which + started being sane recently too. +- split -lang to a separate .spec (lang comes from a differen + repository with different versioning) + +------------------------------------------------------------------- Old: ---- psi+-20170502.tar.xz psi-plus-l10n-1.tar.xz New: ---- psi+-0.16.584.748+1.tar.xz psi+-lang.changes psi+-lang.spec psi-plus-l10n-0.16.584.737+0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+-lang.spec ++++++ # # spec file for package psi+-lang # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %if 0%{?suse_version} > 1320 || 0%{?leap_version} >= 420200 %define with_qt5 1 %endif %define version_unconverted 0.16.584.737+0 Name: psi+-lang Url: https://github.com/psi-plus/psi-plus-l10n Version: 0.16.584.737+0 Release: 0 Summary: Translations for Psi+ License: GPL-2.0+ Group: Productivity/Networking/Talk/Clients Source0: psi-plus-l10n-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?with_qt5} BuildRequires: libqt5-linguist # for qmake-qt5: BuildRequires: libqt5-qtbase-common-devel %else BuildRequires: libqt4-devel >= 4.7.0 %endif BuildRequires: xz Requires: psi+ BuildArch: noarch Obsoletes: psi+-lang > 20100101 %description Various translations for Psi+. %prep %setup -q -n psi-plus-l10n-%{version} %if 0%{?with_qt5} sed -i 's@\<lrelease\>@&-qt5@' update-translations.sh %endif %build ./update-translations.sh make %install install -d %{buildroot}%{_datadir}/psi-plus install -m 0644 -t %{buildroot}%{_datadir}/psi-plus out/*.qm %files %defattr(-,root,root) %dir %{_datadir}/psi-plus/ %{_datadir}/psi-plus/*.qm %changelog ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.rG1q9i/_old 2017-06-04 02:00:24.675269306 +0200 +++ /var/tmp/diff_new_pack.rG1q9i/_new 2017-06-04 02:00:24.679268741 +0200 @@ -21,19 +21,18 @@ %define __builder ninja %endif -%define version_unconverted 20170502 +%define version_unconverted 0.16.584.748+1 Name: psi+ Url: https://github.com/psi-plus -Version: 20170502 +Version: 0.16.584.748+1 Release: 0 Summary: Jabber client using Qt License: GPL-2.0+ Group: Productivity/Networking/Talk/Clients Source0: psi+-%{version}.tar.xz -Source1: psi-plus-l10n-1.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake >= 3 +BuildRequires: cmake >= 3.1 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hunspell-devel @@ -68,9 +67,10 @@ BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: zlib-devel -Recommends: %{name}-lang = %{version} +Recommends: %{name}-lang Requires: %{name}-data = %{version} Obsoletes: psi +Obsoletes: psi+ > 20100101 %define iconspath %{_datadir}/psi-plus/iconsets %define pluginspath %{_libdir}/psi-plus/plugins @@ -88,24 +88,15 @@ Group: Productivity/Networking/Talk/Clients BuildArch: noarch Provides: %{name}-icons = %{version} -Obsoletes: %{name}-icons <= %{version} +Obsoletes: %{name}-icons > 20100101 Provides: %{name}-sounds = %{version} -Obsoletes: %{name}-sounds <= %{version} +Obsoletes: %{name}-sounds > 20100101 Provides: %{name}-themes = %{version} -Obsoletes: %{name}-themes <= %{version} +Obsoletes: %{name}-themes > 20100101 %description data Icons, sounds, and themes for Psi+. -%package lang -Summary: Translations for Psi+ -Group: Productivity/Networking/Talk/Clients -Requires: %{name} = %{version} -BuildArch: noarch - -%description lang -Various translations for Psi+. - %package plugins-devel Summary: Headers for Psi plugins Group: Development/Libraries/C and C++ @@ -406,11 +397,7 @@ other resources for Psi+. %prep -%setup -q -b 1 - -%if 0%{?with_qt5} -sed -i 's@\<lrelease\>@&-qt5@' ../psi-plus-l10n-1/update-translations.sh -%endif +%setup -q %build %cmake \ @@ -426,9 +413,6 @@ %__make %{?_smp_mflags} VERBOSE=1 %endif -cd %{_builddir}/psi-plus-l10n-1/ -./update-translations.sh make - %install %cmake_install @@ -440,9 +424,6 @@ install -m 0644 -t %{buildroot}%{_datadir}/psi-plus/plugins/include/ src/plugins/include/* sed -e 's:target.path.*:target.path = %pluginspath:' src/plugins/psiplugin.pri > %{buildroot}%{_datadir}/psi-plus/plugins/psiplugin.pri -# translations -install -m 0644 -t %{buildroot}%{_datadir}/psi-plus ../psi-plus-l10n-1/out/*.qm - %fdupes $RPM_BUILD_ROOT/%{_datadir} %files plugins-juickplugin @@ -592,10 +573,6 @@ %dir %{_libdir}/psi-plus %dir %{_libdir}/psi-plus/plugins -%files lang -%defattr(-,root,root) -%{_datadir}/psi-plus/*.qm - %files data %defattr(-,root,root) %dir %{iconspath}/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rG1q9i/_old 2017-06-04 02:00:24.711264225 +0200 +++ /var/tmp/diff_new_pack.rG1q9i/_new 2017-06-04 02:00:24.715263660 +0200 @@ -3,13 +3,13 @@ <param name="url">git://github.com/psi-plus/psi-plus-snapshots.git</param> <param name="scm">git</param> <param name="filename">psi+</param> - <param name="versionformat">%cd</param> + <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> </service> <service mode="disabled" name="tar_scm"> <param name="url">git://github.com/psi-plus/psi-plus-l10n.git</param> <param name="scm">git</param> <param name="filename">psi-plus-l10n</param> - <param name="version">1</param> + <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> @@ -17,5 +17,10 @@ </service> <service mode="disabled" name="set_version"> <param name="basename">psi+</param> + <param name="file">psi+.spec</param> + </service> + <service mode="disabled" name="set_version"> + <param name="basename">psi-plus-l10n</param> + <param name="file">psi+-lang.spec</param> </service> </services>
