Hello community, here is the log from the commit of package Qross for openSUSE:Factory checked in at 2016-05-24 09:35:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Qross (Old) and /work/SRC/openSUSE:Factory/.Qross.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Qross" Changes: -------- --- /work/SRC/openSUSE:Factory/Qross/Qross.changes 2014-02-19 07:24:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Qross.new/Qross.changes 2016-05-24 09:35:14.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 14 09:47:53 UTC 2016 - [email protected] + +- The library package name ought to be libqross0_1 (not libqross1) + because the SONAME is .so.0.1. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/Qross/Qrosspython.changes 2014-07-11 06:46:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Qross.new/Qrosspython.changes 2016-05-24 09:35:14.000000000 +0200 @@ -1,0 +2,11 @@ +Sat May 14 09:54:18 UTC 2016 - [email protected] + +- libqrosspython1 does not match up with qrosspython.so file + for openSUSE:Factory. + +------------------------------------------------------------------- +Sat May 7 12:31:43 UTC 2016 - [email protected] + +- Another cmake workaround. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Qross.spec ++++++ --- /var/tmp/diff_new_pack.j453xy/_old 2016-05-24 09:35:15.000000000 +0200 +++ /var/tmp/diff_new_pack.j453xy/_new 2016-05-24 09:35:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Qross # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,6 +16,8 @@ # +%define so_postfix 0_1 + %define pack_summ A Qt-only fork of Kross %define pack_desc Qross is a Qt-only fork of Kross, \ @@ -26,14 +28,13 @@ other, already existing scripting languages, like JavaScript or \ Python. - Name: Qross Version: 0.3.1 Release: 0 -License: LGPL-2.0+ Summary: %{pack_summ} -Url: https://github.com/0xd34df00d/Qross +License: LGPL-2.0+ Group: System/Libraries +Url: https://github.com/0xd34df00d/Qross # WARNING: don't forget to remove at least # src/bindings/csharp directory from upstream sources, # really only src/bindings/python works now, see more at @@ -47,19 +48,18 @@ %description %{pack_desc} - -%package -n libqross1 +%package -n libqross%{so_postfix} Summary: %{pack_summ} +Group: System/Libraries -%description -n libqross1 +%description -n libqross%{so_postfix} %{pack_desc} - %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ Requires: cmake -Requires: libqross1 = %{version} +Requires: libqross%{so_postfix} = %{version} Requires: pkgconfig(QtCore) %description devel @@ -70,7 +70,6 @@ %prep %setup -q -n %{name}-%{version}/src/qross - %build mkdir build && cd build @@ -85,25 +84,21 @@ make %{?_smp_mflags} VERBOSE=1 - %install cd build %make_install %fdupes -s %{buildroot}%{_datadir} +%post -n libqross%{so_postfix} -p /sbin/ldconfig -%post -n libqross1 -p /sbin/ldconfig +%postun -n libqross%{so_postfix} -p /sbin/ldconfig -%postun -n libqross1 -p /sbin/ldconfig - - -%files -n libqross1 +%files -n libqross%{so_postfix} %defattr(-,root,root) %{_libdir}/*qross*.so.* %{_libdir}/qt4/plugins/script/*qross*.so.* - %files devel %defattr(-,root,root) %{_bindir}/qross ++++++ Qrosspython.spec ++++++ --- /var/tmp/diff_new_pack.j453xy/_old 2016-05-24 09:35:15.000000000 +0200 +++ /var/tmp/diff_new_pack.j453xy/_new 2016-05-24 09:35:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Qrosspython # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1320 +%define sopackname libqrosspython +%else +%define sopackname libqrosspython1 +%endif + %define pack_summ A Qt-only fork of Kross %define pack_desc Qross is a Qt-only fork of Kross, \ @@ -26,14 +32,13 @@ other, already existing scripting languages, like JavaScript or \ Python. - Name: Qrosspython Version: 0.3.1 Release: 0 -License: LGPL-2.0+ Summary: %{pack_summ}, python2 engine -Url: https://github.com/0xd34df00d/Qross +License: LGPL-2.0+ Group: System/Libraries +Url: https://github.com/0xd34df00d/Qross # WARNING: don't forget to remove at least # src/bindings/csharp directory from upstream sources, # really only src/bindings/python works now, see more at @@ -46,33 +51,42 @@ BuildRequires: Qross-devel BuildRequires: python-sip-devel BuildRequires: pkgconfig(python2) +%if 0%{?suse_version} > 1320 +Provides: %{name}-devel = %{version} +Obsoletes: %{name}-devel < %{version} +%endif %description %{pack_desc} - -%package -n libqrosspython1 +%package -n %{sopackname} Summary: %{pack_summ} +Group: System/Libraries +# NOTE! There are no linking against this library so let's take care +# about backward compatibility: +%if 0%{?suse_version} > 1320 +Provides: libqrosspython1 = %{version} +Obsoletes: libqrosspython1 < %{version} +%endif -%description -n libqrosspython1 +%description -n %{sopackname} %{pack_desc} - +%if 0%{?suse_version} <= 1320 %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ -Requires: libqrosspython1 = %{version} +Requires: %{sopackname} = %{version} %description devel -The %{name}-devel package contains libraries and header files for +The %{name}-devel package contains files for developing applications that use %{name}. - +%endif %prep %setup -q -n Qross-%{version}/src/bindings/python/qrosspython %patch0 -p1 - %build mkdir build && cd build @@ -91,18 +105,22 @@ cd build %make_install +%post -n %{sopackname} -p /sbin/ldconfig -%post -n libqrosspython1 -p /sbin/ldconfig +%postun -n %{sopackname} -p /sbin/ldconfig -%postun -n libqrosspython1 -p /sbin/ldconfig - - -%files -n libqrosspython1 +%files -n %{sopackname} %defattr(-,root,root) +%if 0%{?suse_version} <= 1320 %{_libdir}/*qrosspython*.so.* +%else +%{_libdir}/*qrosspython*.so +%endif +%if 0%{?suse_version} <= 1320 %files devel %defattr(-,root,root) %{_libdir}/*qrosspython*.so +%endif %changelog
