Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package QR-Code-generator for openSUSE:Factory checked in at 2024-10-09 22:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QR-Code-generator (Old) and /work/SRC/openSUSE:Factory/.QR-Code-generator.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QR-Code-generator" Wed Oct 9 22:13:09 2024 rev:5 rq:1206501 version:1.8.0+git17.856ba8a Changes: -------- --- /work/SRC/openSUSE:Factory/QR-Code-generator/QR-Code-generator.changes 2023-11-17 20:51:36.157674950 +0100 +++ /work/SRC/openSUSE:Factory/.QR-Code-generator.new.19354/QR-Code-generator.changes 2024-10-09 22:13:42.944177027 +0200 @@ -1,0 +2,17 @@ +Wed Oct 9 10:51:51 UTC 2024 - Marcus Rueckert <mrueck...@suse.de> + +- Update to 1.8.0+git17.856ba8a + https://github.com/nayuki/QR-Code-generator/compare/v1.8.0...856ba8a +- switch build to cmake files from + https://github.com/EasyCoding/qrcodegen-cmake.git + - This build also adds the pkgconfig and cmake files for easier + integration with other projects ( like the upcoming obs-studio + 31.0.0) + - drop patches: + 0002-Make-use-of-fPIC-parameter-when-building.patch + 0003-Generate-both-shared-and-static-libraries.patch + 0004-Create-install-targets-for-C-and-CPP.patch +- use %ldconfig_scriptlets +- add BR for pkgconfig to ensure we get the pkgconfig provides + +------------------------------------------------------------------- Old: ---- 0002-Make-use-of-fPIC-parameter-when-building.patch 0003-Generate-both-shared-and-static-libraries.patch 0004-Create-install-targets-for-C-and-CPP.patch v1.8.0.tar.gz New: ---- QR-Code-generator-1.8.0+git17.856ba8a.tar.zst _service _servicedata qrcodegen-cmake-1.8.0.cmake3.tar.zst BETA DEBUG BEGIN: Old: - drop patches: 0002-Make-use-of-fPIC-parameter-when-building.patch 0003-Generate-both-shared-and-static-libraries.patch Old: 0002-Make-use-of-fPIC-parameter-when-building.patch 0003-Generate-both-shared-and-static-libraries.patch 0004-Create-install-targets-for-C-and-CPP.patch Old: 0003-Generate-both-shared-and-static-libraries.patch 0004-Create-install-targets-for-C-and-CPP.patch - use %ldconfig_scriptlets BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QR-Code-generator.spec ++++++ --- /var/tmp/diff_new_pack.083oWX/_old 2024-10-09 22:13:44.224230396 +0200 +++ /var/tmp/diff_new_pack.083oWX/_new 2024-10-09 22:13:44.228230563 +0200 @@ -1,7 +1,7 @@ # # spec file for package QR-Code-generator # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,25 @@ %define libcname libqrcodegen1 %define libcppname libqrcodegencpp1 + +%global cmake_code_version 1.8.0.cmake3 + %{?sle15_python_module_pythons} + Name: QR-Code-generator -Version: 1.8.0 +Version: 1.8.0+git17.856ba8a Release: 0 Summary: QR Code generator library License: MIT URL: https://github.com/nayuki/QR-Code-generator -Source: https://github.com/nayuki/QR-Code-generator/archive/v%{version}.tar.gz -Patch2: 0002-Make-use-of-fPIC-parameter-when-building.patch -Patch3: 0003-Generate-both-shared-and-static-libraries.patch -Patch4: 0004-Create-install-targets-for-C-and-CPP.patch +Source0: %{name}-%{version}.tar.zst +Source1: qrcodegen-cmake-%cmake_code_version.tar.zst BuildRequires: %{python_module setuptools} +BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRequires: python-rpm-macros +BuildRequires: zstd %python_subpackages %description @@ -70,46 +75,42 @@ C++ QR Code generator library %prep -%setup -q -%autopatch -p1 +%autosetup -p1 -a1 +ln -s qrcodegen-cmake-%cmake_code_version/{CMakeLists.txt,cmake} . +cp qrcodegen-cmake-%cmake_code_version/{README.md,LICENSE} . %build -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" -pushd c -make -j1 -popd -pushd cpp -make -j1 -popd -pushd python +%cmake + +pushd ../python %python_build popd %install -pushd c -%make_install LIBDIR=%{buildroot}%{_libdir} -popd -pushd cpp -%make_install LIBDIR=%{buildroot}%{_libdir} -popd +%cmake_install + pushd python %python_install popd -rm -rf %{buildroot}%{_libdir}/*.a -%post -n %{libcname} -p /sbin/ldconfig -%postun -n %{libcname} -p /sbin/ldconfig -%post -n %{libcppname} -p /sbin/ldconfig -%postun -n %{libcppname} -p /sbin/ldconfig +%ldconfig_scriptlets -n %{libcname} +%ldconfig_scriptlets -n %{libcppname} %files %{python_files} %license Readme.markdown %{python_sitelib}/* %files -n QR-Code-generator-devel -%{_includedir}/* -%{_libdir}/*.so +%license LICENSE Readme.markdown +%doc README.md Readme.markdown +%{_libdir}/cmake/qrcodegencpp/ +%{_libdir}/cmake/qrcodegen/ +%{_libdir}/libqrcodegen.so +%{_libdir}/libqrcodegencpp.so +%{_includedir}/qrcodegen/ +%{_includedir}/qrcodegencpp/ +%{_libdir}/pkgconfig/qrcodegencpp.pc +%{_libdir}/pkgconfig/qrcodegen.pc %files -n %{libcname} %license Readme.markdown ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param> <param name="revision">master</param> <param name="url">https://github.com/nayuki/QR-Code-generator.git</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> </service> <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@</param> <param name="revision">v1.8.0-cmake3</param> <param name="url">https://github.com/EasyCoding/qrcodegen-cmake.git</param> <param name="versionrewrite-pattern">v([\.\d]+)-([a-z].*)</param> <param name="versionrewrite-replacement">\1.\2</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="compression">zst</param> <param name="file">*.tar</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/nayuki/QR-Code-generator.git</param> <param name="changesrevision">856ba8a74b48a6b3b32dd86f13b66b61b8579fcd</param></service><service name="tar_scm"> <param name="url">https://github.com/EasyCoding/qrcodegen-cmake.git</param> <param name="changesrevision">0bc38a5c3ce8bc700a7e1b3082a55b82e292530e</param></service></servicedata> (No newline at EOF)
