Hello community, here is the log from the commit of package librecad for openSUSE:Factory checked in at 2015-09-13 09:45:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librecad (Old) and /work/SRC/openSUSE:Factory/.librecad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librecad" Changes: -------- --- /work/SRC/openSUSE:Factory/librecad/librecad.changes 2015-05-07 09:22:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librecad.new/librecad.changes 2015-09-13 09:45:09.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Sep 9 21:03:17 UTC 2015 - [email protected] + +- Update to new upstream release 2.0.8: + * DWG read support. + * SVG export support. + * Arabic Language GUI support. More work is needed for: + Right-to-left support for Text entities. + Arabic fonts for Text. + * More user configurable settings in App Preferences. + * Many fixes and enhancements, see: + http://forum.librecad.org/2-0-8-released-td5712049.html + for details. +- Added new Part Library: + Electrical1-LCAD.zip +- Rebased librecad-install.diff, librecad-no-date.diff and + librecad-use-system-libdxfrw.patch to apply cleanly. +- Added a patch "librecad-use-system-shapelib.patch" to use the + system shapelib instead of the bundled one and new build + requirement libshp-devel (for openSUSE > 13.2). +- Update includes the fix for boo#937874. + +------------------------------------------------------------------- Old: ---- LibreCAD-2.0.7.tar.gz New: ---- 2.0.8.tar.gz Electrical1-LCAD.zip librecad-use-system-shapelib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librecad.spec ++++++ --- /var/tmp/diff_new_pack.EHkDor/_old 2015-09-13 09:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.EHkDor/_new 2015-09-13 09:45:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: librecad -Version: 2.0.7 +Version: 2.0.8 Release: 0 Summary: Computer-aided design (CAD) software package for 2D design and drafting License: GPL-2.0 and (Apache-2.0 or SUSE-GPL-3.0+-with-font-exception) @@ -26,23 +26,27 @@ #Git-Clone: git://github.com/LibreCAD/LibreCAD #Git-Web: http://github.com/LibreCAD/LibreCAD/tags -#DL-URL: https://github.com/LibreCAD/LibreCAD/archive/2.0.7.tar.gz -Source: LibreCAD-%version.tar.gz +Source: https://github.com/LibreCAD/LibreCAD/archive/2.0.8.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 Source3: http://wiki.librecad.org/images/7/70/Electronics3-LCAD.zip -Source4: ttf2lff.1 -Source10: %name-rpmlintrc +Source4: http://wiki.librecad.org/images/9/9d/Electrical1-LCAD.zip +Source10: ttf2lff.1 +Source20: %name-rpmlintrc Patch1: librecad-no-date.diff Patch2: librecad-use-system-libdxfrw.patch Patch3: librecad-install.diff Patch4: librecad-plugindir.diff +Patch5: librecad-use-system-shapelib.patch BuildRequires: boost-devel BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ >= 4.7 -BuildRequires: libdxfrw-devel +BuildRequires: libdxfrw-devel >= 0.6.1 +%if 0%{?suse_version} >= 1321 +BuildRequires: libshp-devel +%endif %if 0%{?suse_version} >= 1321 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -82,8 +86,11 @@ CAD drawings. %prep -%setup -qn LibreCAD-%version -a 2 -a 3 +%setup -qn LibreCAD-%version -a 2 -a 3 -a 4 %patch -P 1 -P 2 -P 3 -P 4 -p1 +%if 0%{?suse_version} >= 1321 +%patch -P 5 -p1 +%endif dxfrw_includedir=$(pkg-config --cflags-only-I libdxfrw0 | sed 's|-I||g') @@ -93,9 +100,12 @@ # Make sure bundled libraries are not used rm -rf libraries/libdxfrw +%if 0%{?suse_version} >= 1321 +rm -rf plugins/importshp/shapelib +%endif # Fix "wrong-file-end-of-line-encoding" rpmlint warning -sed -i 's/\r$//' LICENSE-MIT.txt license-lc_opengost-fonts.txt +sed -i 's/\r$//' LICENSE-MIT.txt LICENSE_KST32B_v2.txt license-lc_opengost-fonts.txt %build %if 0%{?suse_version} >= 1321 @@ -136,6 +146,9 @@ mkdir -p %buildroot%_datadir/%name/library/electronics cp -a Electronic8-LCAD %buildroot%_datadir/%name/library/electronics +mkdir -p %buildroot%_datadir/%name/library/electrical +cp -a Electrical1-LCAD %buildroot%_datadir/%name/library/electrical + %if 0%{?suse_version} %suse_update_desktop_file -G "CAD Program" -r %name Graphics 2DGraphics VectorGraphics %endif ++++++ LibreCAD-2.0.7.tar.gz -> 2.0.8.tar.gz ++++++ /work/SRC/openSUSE:Factory/librecad/LibreCAD-2.0.7.tar.gz /work/SRC/openSUSE:Factory/.librecad.new/2.0.8.tar.gz differ: char 26, line 1 ++++++ librecad-install.diff ++++++ --- /var/tmp/diff_new_pack.EHkDor/_old 2015-09-13 09:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.EHkDor/_new 2015-09-13 09:45:10.000000000 +0200 @@ -3,11 +3,11 @@ scripts/postprocess-unix.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -Index: LibreCAD-2.0.7/librecad/src/src.pro +Index: LibreCAD-2.0.8/librecad/src/src.pro =================================================================== ---- LibreCAD-2.0.7.orig/librecad/src/src.pro -+++ LibreCAD-2.0.7/librecad/src/src.pro -@@ -61,7 +61,6 @@ unix { +--- LibreCAD-2.0.8.orig/librecad/src/src.pro ++++ LibreCAD-2.0.8/librecad/src/src.pro +@@ -64,7 +64,6 @@ unix { DEFINES += QC_APPDIR="\"librecad\"" DEFINES += QINITIMAGES_LIBRECAD="qInitImages_librecad" RC_FILE = ../res/main/librecad.icns @@ -15,10 +15,10 @@ } } win32 { -Index: LibreCAD-2.0.7/scripts/postprocess-unix.sh +Index: LibreCAD-2.0.8/scripts/postprocess-unix.sh =================================================================== ---- LibreCAD-2.0.7.orig/scripts/postprocess-unix.sh -+++ LibreCAD-2.0.7/scripts/postprocess-unix.sh +--- LibreCAD-2.0.8.orig/scripts/postprocess-unix.sh ++++ LibreCAD-2.0.8/scripts/postprocess-unix.sh @@ -3,7 +3,7 @@ THISDIR="`pwd`" LCDIR="${THISDIR}/librecad" ++++++ librecad-no-date.diff ++++++ --- /var/tmp/diff_new_pack.EHkDor/_old 2015-09-13 09:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.EHkDor/_new 2015-09-13 09:45:10.000000000 +0200 @@ -1,8 +1,14 @@ Remove build time references so build-compare can do its work ---- LibreCAD-2.0.2/librecad/src/main/qc_applicationwindow.cpp.orig 2014-01-09 20:31:10.000000000 +0200 -+++ LibreCAD-2.0.2/librecad/src/main/qc_applicationwindow.cpp 2014-04-20 20:09:25.808375807 +0300 -@@ -3851,7 +3851,6 @@ +--- + librecad/src/main/qc_applicationwindow.cpp | 1 - + 1 file changed, 1 deletion(-) + +Index: LibreCAD-2.0.8/librecad/src/main/qc_applicationwindow.cpp +=================================================================== +--- LibreCAD-2.0.8.orig/librecad/src/main/qc_applicationwindow.cpp ++++ LibreCAD-2.0.8/librecad/src/main/qc_applicationwindow.cpp +@@ -3358,7 +3358,6 @@ void QC_ApplicationWindow::slotHelpAbout tr("Compiler: Microsoft Visual C++<br>") + #endif tr("Qt Version: %1").arg(qVersion()) + "<br>" + ++++++ librecad-use-system-libdxfrw.patch ++++++ --- /var/tmp/diff_new_pack.EHkDor/_old 2015-09-13 09:45:11.000000000 +0200 +++ /var/tmp/diff_new_pack.EHkDor/_new 2015-09-13 09:45:11.000000000 +0200 @@ -3,13 +3,13 @@ --- libraries/libraries.pro | 1 - - librecad/src/src.pro | 3 +-- - 2 files changed, 1 insertion(+), 3 deletions(-) + librecad/src/src.pro | 5 ++--- + 2 files changed, 2 insertions(+), 4 deletions(-) -Index: LibreCAD-2.0.7/libraries/libraries.pro +Index: LibreCAD-2.0.8/libraries/libraries.pro =================================================================== ---- LibreCAD-2.0.7.orig/libraries/libraries.pro -+++ LibreCAD-2.0.7/libraries/libraries.pro +--- LibreCAD-2.0.8.orig/libraries/libraries.pro ++++ LibreCAD-2.0.8/libraries/libraries.pro @@ -9,7 +9,6 @@ TEMPLATE = subdirs TARGET = libraries @@ -18,19 +18,21 @@ jwwlib macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){ -Index: LibreCAD-2.0.7/librecad/src/src.pro +Index: LibreCAD-2.0.8/librecad/src/src.pro =================================================================== ---- LibreCAD-2.0.7.orig/librecad/src/src.pro -+++ LibreCAD-2.0.7/librecad/src/src.pro -@@ -39,7 +39,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) { - CONFIG += help - } +--- LibreCAD-2.0.8.orig/librecad/src/src.pro ++++ LibreCAD-2.0.8/librecad/src/src.pro +@@ -42,8 +42,7 @@ greaterThan( QT_MAJOR_VERSION, 4 ) { + } --PRE_TARGETDEPS += ../../generated/lib/libdxfrw.a - PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a + GEN_LIB_DIR = ../../generated/lib +-PRE_TARGETDEPS += $$GEN_LIB_DIR/libdxfrw.a \ +- $$GEN_LIB_DIR/libjwwlib.a ++PRE_TARGETDEPS += $$GEN_LIB_DIR/libjwwlib.a DESTDIR = $${INSTALLDIR} -@@ -88,7 +87,7 @@ LIBS += -L../../generated/lib \ + +@@ -91,7 +90,7 @@ LIBS += -L../../generated/lib \ -ljwwlib DEPENDPATH += \ ++++++ librecad-use-system-shapelib.patch ++++++ build: avoid using bundled shapelib [[email protected]: patch imported from Fedora] --- 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 @@ -17,12 +17,9 @@ include(../../common.pri) # For plugins INCLUDEPATH += ../../librecad/src/plugins -SOURCES += importshp.cpp \ - shapelib/shpopen.c \ - shapelib/safileio.c \ - shapelib/dbfopen.c -HEADERS += importshp.h \ - shapelib/shapefil.h +SOURCES += importshp.cpp +HEADERS += importshp.h +LIBS += -lshp win32 { DLLDESTDIR = ../../windows/resources/plugins @@ -36,5 +33,3 @@ unix { TARGET = ../../unix/resources/plugins/$$PLUGIN_NAME } } - -INCLUDEPATH += shapelib
