Hello community, here is the log from the commit of package Qross for openSUSE:Factory checked in at 2016-07-05 09:51:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-24 09:35:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Qross.new/Qross.changes 2016-07-05 09:51:22.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jun 22 14:41:27 UTC 2016 - [email protected] + +- Drop duplicate pkgconfig require again +- Summary improvement + +------------------------------------------------------------------- +Tue Jun 21 16:22:21 UTC 2016 - [email protected] + +- %%cmake macro. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/Qross/Qrosspython.changes 2016-05-24 09:35:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Qross.new/Qrosspython.changes 2016-07-05 09:51:22.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jun 22 14:41:27 UTC 2016 - [email protected] + +- Drop duplicate pkgconfig require again +- Summary improvement + +------------------------------------------------------------------- +Tue Jun 21 16:22:21 UTC 2016 - [email protected] + +- The latest cmake workaround for openSUSE Leap 42.2. +- %%cmake macro. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Qross.spec ++++++ --- /var/tmp/diff_new_pack.ZWge5f/_old 2016-07-05 09:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.ZWge5f/_new 2016-07-05 09:51:23.000000000 +0200 @@ -18,7 +18,7 @@ %define so_postfix 0_1 -%define pack_summ A Qt-only fork of Kross +%define pack_summ A Qt-only fork of Kross, a KDE scripting framework %define pack_desc Qross is a Qt-only fork of Kross, \ the KDE scripting framework. \ @@ -33,7 +33,7 @@ Release: 0 Summary: %{pack_summ} License: LGPL-2.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Url: https://github.com/0xd34df00d/Qross # WARNING: don't forget to remove at least # src/bindings/csharp directory from upstream sources, @@ -41,8 +41,9 @@ # https://bugzilla.novell.com/show_bug.cgi?id=861882 Source0: %{name}-%{version}.tar.xz -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3 BuildRequires: fdupes +BuildRequires: pkgconfig BuildRequires: pkgconfig(QtCore) %description @@ -71,22 +72,11 @@ %setup -q -n %{name}-%{version}/src/qross %build -mkdir build && cd build - -cmake .. \ -%if "%{_lib}" == "lib64" - -DLIB_SUFFIX=64 \ -%endif - -DCMAKE_C_FLAGS="%{optflags}" \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo - +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo make %{?_smp_mflags} VERBOSE=1 %install -cd build -%make_install +%cmake_install %fdupes -s %{buildroot}%{_datadir} ++++++ Qrosspython.spec ++++++ --- /var/tmp/diff_new_pack.ZWge5f/_old 2016-07-05 09:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.ZWge5f/_new 2016-07-05 09:51:23.000000000 +0200 @@ -17,12 +17,22 @@ %if 0%{?suse_version} > 1320 +%define cmake34 1 +%else +%if 0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200 && 0%{?is_opensuse} +%define cmake34 1 +%else +%define cmake34 0 +%endif +%endif + +%if %{cmake34} %define sopackname libqrosspython %else %define sopackname libqrosspython1 %endif -%define pack_summ A Qt-only fork of Kross +%define pack_summ A Qt-only fork of Kross, a KDE scripting framework %define pack_desc Qross is a Qt-only fork of Kross, \ the KDE scripting framework. \ @@ -37,7 +47,7 @@ Release: 0 Summary: %{pack_summ}, python2 engine License: LGPL-2.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Url: https://github.com/0xd34df00d/Qross # WARNING: don't forget to remove at least # src/bindings/csharp directory from upstream sources, @@ -49,9 +59,11 @@ Patch0: Qrosspython-cmake3.patch BuildRequires: Qross-devel +BuildRequires: cmake >= 3 +BuildRequires: pkgconfig BuildRequires: python-sip-devel BuildRequires: pkgconfig(python2) -%if 0%{?suse_version} > 1320 +%if %{cmake34} Provides: %{name}-devel = %{version} Obsoletes: %{name}-devel < %{version} %endif @@ -64,7 +76,7 @@ Group: System/Libraries # NOTE! There are no linking against this library so let's take care # about backward compatibility: -%if 0%{?suse_version} > 1320 +%if %{cmake34} Provides: libqrosspython1 = %{version} Obsoletes: libqrosspython1 < %{version} %endif @@ -72,7 +84,7 @@ %description -n %{sopackname} %{pack_desc} -%if 0%{?suse_version} <= 1320 +%if %{cmake34} == 0 %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ @@ -88,22 +100,11 @@ %patch0 -p1 %build -mkdir build && cd build - -cmake .. \ -%if "%{_lib}" == "lib64" - -DLIB_SUFFIX=64 \ -%endif - -DCMAKE_C_FLAGS="%{optflags}" \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo - +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo make %{?_smp_mflags} VERBOSE=1 %install -cd build -%make_install +%cmake_install %post -n %{sopackname} -p /sbin/ldconfig @@ -111,13 +112,13 @@ %files -n %{sopackname} %defattr(-,root,root) -%if 0%{?suse_version} <= 1320 +%if %{cmake34} == 0 %{_libdir}/*qrosspython*.so.* %else %{_libdir}/*qrosspython*.so %endif -%if 0%{?suse_version} <= 1320 +%if %{cmake34} == 0 %files devel %defattr(-,root,root) %{_libdir}/*qrosspython*.so
