Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package librecad for openSUSE:Factory checked in at 2021-12-21 18:40:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librecad (Old) and /work/SRC/openSUSE:Factory/.librecad.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librecad" Tue Dec 21 18:40:35 2021 rev:25 rq:941616 version:2.2.0~rc3 Changes: -------- --- /work/SRC/openSUSE:Factory/librecad/librecad.changes 2021-05-04 22:01:12.616550818 +0200 +++ /work/SRC/openSUSE:Factory/.librecad.new.2520/librecad.changes 2021-12-21 18:41:00.785894385 +0100 @@ -1,0 +2,15 @@ +Mon Dec 20 09:15:40 UTC 2021 - Jiri Slaby <[email protected]> + +- update to 2.2.0-rc3 + * major release + * DWG imports are more reliable now + * and a lot more of bugfixes and improvements +- remove (they are in upstream now) + * 0001-fix-build-with-gcc-9.patch + * add-boost-tuple-include-to-fix-build.patch + * ensured-all-objects-are-shown-when-a-layer-is-toggle.patch + * fix-build-with-Qt-5.11.patch + * fix-build-with-Qt-5.15.patch +- remove qcad provides/obsoletes -- it's an ancient history + +------------------------------------------------------------------- Old: ---- 0001-fix-build-with-gcc-9.patch 2.1.3.tar.gz add-boost-tuple-include-to-fix-build.patch ensured-all-objects-are-shown-when-a-layer-is-toggle.patch fix-build-with-Qt-5.11.patch fix-build-with-Qt-5.15.patch New: ---- librecad-2.2.0-rc3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librecad.spec ++++++ --- /var/tmp/diff_new_pack.uDY5hS/_old 2021-12-21 18:41:01.341894884 +0100 +++ /var/tmp/diff_new_pack.uDY5hS/_new 2021-12-21 18:41:01.345894888 +0100 @@ -16,8 +16,10 @@ # +%define tar_version 2.2.0-rc3 + Name: librecad -Version: 2.1.3 +Version: 2.2.0~rc3 Release: 0 Summary: Computer-aided design (CAD) software package for 2D design and drafting License: (Apache-2.0 OR SUSE-GPL-3.0+-with-font-exception) AND GPL-2.0-only @@ -25,7 +27,7 @@ URL: http://librecad.org/ #Git-Web: https://github.com/LibreCAD/LibreCAD -Source: https://github.com/LibreCAD/LibreCAD/archive/%version.tar.gz +Source: https://github.com/LibreCAD/LibreCAD/archive/%{tar_version}.tar.gz#/librecad-%{tar_version}.tar.gz # Version is actually 8, not 3 (it is 3 in the filename due to how MediaWiki # works -- see http://wiki.librecad.org/index.php/File:Architect3-LCAD.zip) Source2: http://wiki.librecad.org/images/d/d9/Architect3-LCAD.zip @@ -33,16 +35,11 @@ Source4: http://wiki.librecad.org/images/9/9d/Electrical1-LCAD.zip Source10: ttf2lff.1 Source20: %name-rpmlintrc -Patch1: ensured-all-objects-are-shown-when-a-layer-is-toggle.patch -Patch2: fix-build-with-Qt-5.11.patch -Patch3: fix-build-with-Qt-5.15.patch Patch4: librecad-no-date.diff Patch5: librecad-use-system-libdxfrw.patch Patch6: librecad-install.diff Patch7: librecad-plugindir.diff Patch8: librecad-use-system-shapelib.patch -Patch9: 0001-fix-build-with-gcc-9.patch -Patch10: add-boost-tuple-include-to-fix-build.patch BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ >= 4.7 @@ -52,21 +49,18 @@ BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: wqy-microhei-fonts -BuildRequires: (pkgconfig(libdxfrw) or pkgconfig(libdxfrw0)) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Help) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(libdxfrw) >= 1 Requires(post): desktop-file-utils Requires(post): shared-mime-info Requires(postun):desktop-file-utils Requires(postun):shared-mime-info Recommends: %name-parts -# old qcad had a newer version, so we provide all versions here. -Provides: qcad -Obsoletes: qcad <= 2.0.5 %description LibreCAD is a Qt4 Computer-aided design (CAD) software package for 2D design @@ -83,7 +77,7 @@ CAD drawings. %prep -%setup -qn LibreCAD-%version -a 2 -a 3 -a 4 +%setup -qn LibreCAD-%{tar_version} -a2 -a3 -a4 %autopatch -p1 pc="libdxfrw" @@ -102,7 +96,7 @@ rm -rf plugins/importshp/shapelib # Fix "wrong-file-end-of-line-encoding" rpmlint warning -sed -i 's/\r$//' LICENSE-MIT.txt LICENSE_KST32B_v2.txt license-lc_opengost-fonts.txt +sed -i 's/\r$//' licenses/{MIT,KST32B_v2,lc_opengost-fonts}.txt %build echo 'DISABLE_POSTSCRIPT = true' > librecad/src/custom.pri @@ -134,7 +128,7 @@ install -Dpm0644 "desktop/%name.sharedmimeinfo" "$b/%_datadir/mime/packages/%name.xml" install -Dpm0644 "%_sourcedir/ttf2lff.1" "$b/%_mandir/man1/" -mkdir -p "$b/%_datadir/%name/library/architecture" \ +install -d "$b/%_datadir/%name/library/architecture" \ "$b/%_datadir/%name/library/electronics" \ "$b/%_datadir/%name/library/electrical" cp -a Architect8-LCAD "$b/%_datadir/%name/library/architecture/" @@ -159,7 +153,7 @@ %files %doc README.md -%license LICENSE* gpl-2.0* license-lc_opengost-fonts.txt +%license LICENSE licenses/*txt %_bindir/librecad %_bindir/ttf2lff %_libdir/%name ++++++ librecad-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.uDY5hS/_old 2021-12-21 18:41:01.397894935 +0100 +++ /var/tmp/diff_new_pack.uDY5hS/_new 2021-12-21 18:41:01.401894938 +0100 @@ -1,3 +1,3 @@ # We are not a library, dammit -addFilter("libre.* shlib-policy-") +addFilter("explicit-lib-dependency librecad") ++++++ librecad-use-system-shapelib.patch ++++++ --- /var/tmp/diff_new_pack.uDY5hS/_old 2021-12-21 18:41:01.413894949 +0100 +++ /var/tmp/diff_new_pack.uDY5hS/_new 2021-12-21 18:41:01.417894952 +0100 @@ -5,10 +5,8 @@ plugins/importshp/importshp.pro | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) -Index: LibreCAD-2.0.8/plugins/importshp/importshp.pro -=================================================================== ---- LibreCAD-2.0.8.orig/plugins/importshp/importshp.pro -+++ LibreCAD-2.0.8/plugins/importshp/importshp.pro +--- a/plugins/importshp/importshp.pro ++++ b/plugins/importshp/importshp.pro @@ -17,12 +17,9 @@ include(../../common.pri) # For plugins INCLUDEPATH += ../../librecad/src/plugins @@ -23,10 +21,10 @@ +HEADERS += importshp.h +LIBS += -lshp + # Installation Directory win32 { - DLLDESTDIR = ../../windows/resources/plugins @@ -36,5 +33,3 @@ unix { - TARGET = ../../unix/resources/plugins/$$PLUGIN_NAME + DESTDIR = ../../unix/resources/plugins } } -
