Hello community, here is the log from the commit of package librecad for openSUSE:Factory checked in at 2015-02-03 11:40:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-25 11:03:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librecad.new/librecad.changes 2015-02-03 11:40:59.000000000 +0100 @@ -1,0 +2,30 @@ +Sat Jan 31 22:21:05 UTC 2015 - asterios.dra...@gmail.com + +- Update to new upstream release 2.0.7: + * A serious command line regression since 2.0.6 was fixed: + keyboard Enter/Esc support, command line widget in a second + screen, etc. Also fixed are some crashes for tangential circle + drawing and polyline addition. + * Improved LFF font support + * The command line can be used as a calculator by typing math + expression after command “cal”. For example, command "cal 1+1" + to get output "2" + * Many fixes and enhancements, see: + http://blog.librecad.org/ + for details + From version 2.0.5: + * Interpolation spline. Draw->Spline->Spline Points. + * File -> Export as PDF. + * Korean language support. + * Smooth scrolling/zooming + * Work-in-progress, finding enclosed area within a contour. + * “Modify->Round” renamed to “Modify->Fillet”. + * Command line aliases can be made for both regular commands and + short commands. +- Added new Part Libraries: + Architect8-LCAD.zip and Electronics8-LCAD.zip. +- Added new build requirement unzip. +- Rebased librecad-install.diff and + librecad-use-system-libdxfrw.patch to apply cleanly. + +------------------------------------------------------------------- Old: ---- LibreCAD-2.0.4.tar.gz New: ---- Architect3-LCAD.zip Electronics3-LCAD.zip LibreCAD-2.0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librecad.spec ++++++ --- /var/tmp/diff_new_pack.k8Gppr/_old 2015-02-03 11:41:02.000000000 +0100 +++ /var/tmp/diff_new_pack.k8Gppr/_new 2015-02-03 11:41:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package librecad # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: librecad -Version: 2.0.4 +Version: 2.0.7 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,10 +26,14 @@ #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.3.tar.gz -Source0: LibreCAD-%version.tar.gz -Source1: ttf2lff.1 -Source2: %name-rpmlintrc +#DL-URL: https://github.com/LibreCAD/LibreCAD/archive/2.0.7.tar.gz +Source: LibreCAD-%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 +Source3: http://wiki.librecad.org/images/7/70/Electronics3-LCAD.zip +Source4: ttf2lff.1 +Source10: %name-rpmlintrc Patch1: librecad-no-date.diff Patch2: librecad-use-system-libdxfrw.patch Patch3: librecad-install.diff @@ -40,6 +44,7 @@ BuildRequires: libdxfrw-devel BuildRequires: libqt4-devel BuildRequires: muparser-devel +BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: wqy-microhei-fonts Requires(post): desktop-file-utils @@ -67,7 +72,7 @@ CAD drawings. %prep -%setup -qn LibreCAD-%version +%setup -qn LibreCAD-%version -a 2 -a 3 %patch -P 1 -P 2 -P 3 -P 4 -p1 dxfrw_includedir=$(pkg-config --cflags-only-I libdxfrw0 | sed 's|-I||g') @@ -79,12 +84,18 @@ # Make sure bundled libraries are not used rm -rf libraries/libdxfrw +# Fix "wrong-file-end-of-line-encoding" rpmlint warning +sed -i 's/\r$//' LICENSE-MIT.txt license-lc_opengost-fonts.txt + %build -qmake librecad.pro CONFIG+="release" QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags" +qmake librecad.pro CONFIG+="release" \ + QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags" make %{?_smp_mflags} rm -f unix/resources/fonts/wqy-unicode.lff mkdir -p unix/resources/fonts -./unix/ttf2lff -L "Apache-2.0 or SUSE-GPL-3.0+-with-font-exception" /usr/share/fonts/truetype/wqy-microhei.ttc unix/resources/fonts/wqy-unicode.lff +./unix/ttf2lff -L "Apache-2.0 or SUSE-GPL-3.0+-with-font-exception" \ + "%_datadir/fonts/truetype/wqy-microhei.ttc" \ + unix/resources/fonts/wqy-unicode.lff %install b="%buildroot"; @@ -93,6 +104,7 @@ sh scripts/postprocess-unix.sh; install -Dpm0755 "unix/%name" "$b/%_bindir/%name"; +install -Dpm0644 "unix/appdata/%name.appdata.xml" "$b/%_datadir/appdata/%name.appdata.xml" install -Dpm0755 "unix/ttf2lff" "$b/%_bindir/ttf2lff" install -Dpm0644 "desktop/%name.1" "$b/%_mandir/man1/%name.1"; p="$b/%_libdir/%name/plugins"; @@ -101,7 +113,13 @@ install -Dpm0644 "desktop/%name.desktop" "$b/%_datadir/applications/%name.desktop"; install -Dpm0644 "librecad/res/main/%name.png" "$b/%_datadir/pixmaps/%name.png"; install -Dpm0644 "desktop/%name.sharedmimeinfo" "$b/%_datadir/mime/packages/%name.xml" -install -Dpm0644 %SOURCE1 "$b/%_mandir/man1/ttf2lff.1" +install -Dpm0644 "%_sourcedir/ttf2lff.1" "$b/%_mandir/man1/" + +mkdir -p %buildroot%_datadir/%name/library/architecture +cp -a Architect8-LCAD %buildroot%_datadir/%name/library/architecture + +mkdir -p %buildroot%_datadir/%name/library/electronics +cp -a Electronic8-LCAD %buildroot%_datadir/%name/library/electronics %if 0%{?suse_version} %suse_update_desktop_file -G "CAD Program" -r %name Graphics 2DGraphics VectorGraphics @@ -121,12 +139,16 @@ %files %defattr(-,root,root) -%doc LICENSE* README.md gpl-2.0* +%doc LICENSE* README.md gpl-2.0* license-lc_opengost-fonts.txt %_bindir/librecad %_bindir/ttf2lff %_libdir/%name %_mandir/man1/librecad.1* %_mandir/man1/ttf2lff.1* +%if 0%{?suse_version} < 1320 +%dir %_datadir/appdata/ +%endif +%_datadir/appdata/%name.appdata.xml %_datadir/applications/librecad.desktop %_datadir/mime/packages/%name.xml %_datadir/pixmaps/librecad.png ++++++ LibreCAD-2.0.4.tar.gz -> LibreCAD-2.0.7.tar.gz ++++++ /work/SRC/openSUSE:Factory/librecad/LibreCAD-2.0.4.tar.gz /work/SRC/openSUSE:Factory/.librecad.new/LibreCAD-2.0.7.tar.gz differ: char 20, line 1 ++++++ librecad-install.diff ++++++ --- /var/tmp/diff_new_pack.k8Gppr/_old 2015-02-03 11:41:02.000000000 +0100 +++ /var/tmp/diff_new_pack.k8Gppr/_new 2015-02-03 11:41:02.000000000 +0100 @@ -3,11 +3,11 @@ scripts/postprocess-unix.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -Index: LibreCAD-2.0.2/librecad/src/src.pro +Index: LibreCAD-2.0.7/librecad/src/src.pro =================================================================== ---- LibreCAD-2.0.2.orig/librecad/src/src.pro -+++ LibreCAD-2.0.2/librecad/src/src.pro -@@ -58,7 +58,6 @@ unix { +--- LibreCAD-2.0.7.orig/librecad/src/src.pro ++++ LibreCAD-2.0.7/librecad/src/src.pro +@@ -61,7 +61,6 @@ unix { DEFINES += QC_APPDIR="\"librecad\"" DEFINES += QINITIMAGES_LIBRECAD="qInitImages_librecad" RC_FILE = ../res/main/librecad.icns @@ -15,16 +15,16 @@ } } win32 { -Index: LibreCAD-2.0.2/scripts/postprocess-unix.sh +Index: LibreCAD-2.0.7/scripts/postprocess-unix.sh =================================================================== ---- LibreCAD-2.0.2.orig/scripts/postprocess-unix.sh -+++ LibreCAD-2.0.2/scripts/postprocess-unix.sh +--- LibreCAD-2.0.7.orig/scripts/postprocess-unix.sh ++++ LibreCAD-2.0.7/scripts/postprocess-unix.sh @@ -3,7 +3,7 @@ THISDIR="`pwd`" LCDIR="${THISDIR}/librecad" PIDIR="${THISDIR}/plugins" -RESOURCEDIR="${THISDIR}/unix/resources" +RESOURCEDIR=$BUILDDIR + APPDATADIR="${THISDIR}/unix/appdata" TSDIRLC="${LCDIR}/ts" TSDIRPI="${PIDIR}/ts" - SPTDIR="${LCDIR}/support" ++++++ librecad-use-system-libdxfrw.patch ++++++ --- /var/tmp/diff_new_pack.k8Gppr/_old 2015-02-03 11:41:02.000000000 +0100 +++ /var/tmp/diff_new_pack.k8Gppr/_new 2015-02-03 11:41:02.000000000 +0100 @@ -6,10 +6,10 @@ librecad/src/src.pro | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) -Index: LibreCAD-2.0.4/libraries/libraries.pro +Index: LibreCAD-2.0.7/libraries/libraries.pro =================================================================== ---- LibreCAD-2.0.4.orig/libraries/libraries.pro -+++ LibreCAD-2.0.4/libraries/libraries.pro +--- LibreCAD-2.0.7.orig/libraries/libraries.pro ++++ LibreCAD-2.0.7/libraries/libraries.pro @@ -9,7 +9,6 @@ TEMPLATE = subdirs TARGET = libraries @@ -17,12 +17,12 @@ - libdxfrw \ jwwlib - macx|win32|equals(build_muparser, "true"){ -Index: LibreCAD-2.0.4/librecad/src/src.pro + macx|win32|equals(build_muparser, "true")|!packagesExist(muparser){ +Index: LibreCAD-2.0.7/librecad/src/src.pro =================================================================== ---- LibreCAD-2.0.4.orig/librecad/src/src.pro -+++ LibreCAD-2.0.4/librecad/src/src.pro -@@ -37,7 +37,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) { +--- 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 } @@ -30,7 +30,7 @@ PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a DESTDIR = $${INSTALLDIR} -@@ -86,7 +85,7 @@ LIBS += -L../../generated/lib \ +@@ -88,7 +87,7 @@ LIBS += -L../../generated/lib \ -ljwwlib DEPENDPATH += \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
