Hello community, here is the log from the commit of package libdxfrw for openSUSE:Factory checked in at 2019-05-25 13:21:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdxfrw (Old) and /work/SRC/openSUSE:Factory/.libdxfrw.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdxfrw" Sat May 25 13:21:06 2019 rev:8 rq:705288 version:0.6.3+git.20190501 Changes: -------- --- /work/SRC/openSUSE:Factory/libdxfrw/libdxfrw.changes 2016-06-14 23:07:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdxfrw.new.5148/libdxfrw.changes 2019-05-25 13:21:19.916312087 +0200 @@ -1,0 +2,23 @@ +Sun May 19 17:50:31 UTC 2019 - [email protected] + +- switch from sourceforge to more up-to-date github repo +- Update to version 0.6.3+git.20190501: + * Add build status and update example link + * Add Travis-CI script + * [#10] Fix compilation on GCC + * Fix bugs with .dwg import of TEXT and MTEXT entities + * This was unnecessary + * Link libdxfrw against libstdc++ + * Return an error when the file ends prematurely + * Add version getter + * Fix polyline 2d/3d write + * Initialize return buffers in GetRawChar8 et al. +- add + * 0001-cmake-use-GNUInstallDirs.patch + * 0002-cmake-set-library-VERSIONs.patch + * 0003-cmake-add-one-for-dwg2dxf.patch + * 0004-cmake-generate-and-install-pkgconfig.patch +- remove + * libdxfrw-LibreCad-2.1.0-changes.patch + +------------------------------------------------------------------- Old: ---- libdxfrw-0.6.3.tar.bz2 libdxfrw-LibreCad-2.1.0-changes.patch New: ---- 0001-cmake-use-GNUInstallDirs.patch 0002-cmake-set-library-VERSIONs.patch 0003-cmake-add-one-for-dwg2dxf.patch 0004-cmake-generate-and-install-pkgconfig.patch _service _servicedata libdxfrw-0.6.3+git.20190501.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdxfrw.spec ++++++ --- /var/tmp/diff_new_pack.OiVbgD/_old 2019-05-25 13:21:20.756311775 +0200 +++ /var/tmp/diff_new_pack.OiVbgD/_new 2019-05-25 13:21:20.756311775 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdxfrw # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 Asterios Dramis <[email protected]>. # # All modifications and additions to the file contributed by third parties @@ -13,24 +13,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define so_ver 0 Name: libdxfrw -Version: 0.6.3 +Version: 0.6.3+git.20190501 Release: 0 Summary: Library to read and write DXF files -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Url: http://sourceforge.net/p/libdxfrw/home/Home/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: libdxfrw-LibreCad-2.1.0-changes.patch +Url: https://github.com/LibreCAD/libdxfrw/ +Source0: %{name}-%{version}.tar.xz +Patch0: 0001-cmake-use-GNUInstallDirs.patch +Patch1: 0002-cmake-set-library-VERSIONs.patch +Patch2: 0003-cmake-add-one-for-dwg2dxf.patch +Patch3: 0004-cmake-generate-and-install-pkgconfig.patch +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ninja %description libdxfrw is a free C++ library to read and write DXF files in both formats, @@ -61,18 +64,15 @@ %prep %setup -q -%patch0 -p1 +%autopatch -p1 %build -CXXFLAGS="$CXXFLAGS -std=c++11" -%configure --disable-static -make %{?_smp_mflags} +%define __builder ninja +%cmake +%make_jobs %install -make DESTDIR=%{buildroot} install - -# Remove libtool config files -rm -f %{buildroot}%{_libdir}/*.la +%cmake_install %post -n libdxfrw%{so_ver} -p /sbin/ldconfig @@ -80,15 +80,18 @@ %files devel %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS ChangeLog README TODO +%license COPYING %{_includedir}/libdxfrw0/ %{_libdir}/pkgconfig/libdxfrw0.pc %{_libdir}/libdxfrw.so %files tools %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS ChangeLog README TODO +%license COPYING %{_bindir}/dwg2dxf +%{_mandir}/man1/dwg2dxf.1.gz %files -n libdxfrw%{so_ver} %defattr(-,root,root,-) ++++++ 0001-cmake-use-GNUInstallDirs.patch ++++++ From 0ac4187c34a8e4a9512a41426a20b1bb8dc41d21 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Mon, 20 May 2019 07:25:18 +0200 Subject: [PATCH 1/4] cmake: use GNUInstallDirs This installs the files to lib64 where appropriate. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 990d253..24d7e26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) PROJECT (DXFRW) ADD_DEFINITIONS(-std=c++11) +include(GNUInstallDirs) + # SOURCE FILES set(libdxfrw_srcs src/intern/drw_dbg.cpp @@ -69,6 +71,6 @@ endforeach() add_library(dxfrw SHARED ${libdxfrw_srcs} ${libdxfrw_hdrs}) # INSTALLATION -install(TARGETS dxfrw DESTINATION lib) +install(TARGETS dxfrw DESTINATION "${CMAKE_INSTALL_LIBDIR}") set(HDRSUBDIR "/libdxfrw0/") -install(FILES ${installdxfrw_hdrs} DESTINATION include${HDRSUBDIR}) +install(FILES ${installdxfrw_hdrs} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${HDRSUBDIR}") -- 2.21.0 ++++++ 0002-cmake-set-library-VERSIONs.patch ++++++ From 5377425b11c38c51a9209e55346bf8f0dee45cc0 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Mon, 20 May 2019 07:48:13 +0200 Subject: [PATCH 2/4] cmake: set library VERSIONs Especially soversion is needed to have a correctly linked and named libraries. --- CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24d7e26..4ff736d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,15 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) -PROJECT (DXFRW) + +if(${CMAKE_MAJOR_VERSION} LESS 3) + project(DXFRW) + set(VERSION 0.6.3) + set(PROJECT_VERSION 0.6.3) + set(PROJECT_VERSION_MAJOR 0) +else() + cmake_policy(SET CMP0048 NEW) + project(DXFRW VERSION 0.6.3) +endif() + ADD_DEFINITIONS(-std=c++11) include(GNUInstallDirs) @@ -69,8 +79,9 @@ foreach(dir ${dirs}) endforeach() add_library(dxfrw SHARED ${libdxfrw_srcs} ${libdxfrw_hdrs}) +set_target_properties(dxfrw PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}") # INSTALLATION install(TARGETS dxfrw DESTINATION "${CMAKE_INSTALL_LIBDIR}") -set(HDRSUBDIR "/libdxfrw0/") +set(HDRSUBDIR "/libdxfrw${PROJECT_VERSION_MAJOR}/") install(FILES ${installdxfrw_hdrs} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${HDRSUBDIR}") -- 2.21.0 ++++++ 0003-cmake-add-one-for-dwg2dxf.patch ++++++ From 218173d4273eff2cb9ae00bfc54ded99f760fbad Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Mon, 20 May 2019 07:55:32 +0200 Subject: [PATCH 3/4] cmake: add one for dwg2dxf --- CMakeLists.txt | 2 ++ dwg2dxf/CMakeLists.txt | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 dwg2dxf/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ff736d..83468a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,8 @@ endforeach() add_library(dxfrw SHARED ${libdxfrw_srcs} ${libdxfrw_hdrs}) set_target_properties(dxfrw PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}") +add_subdirectory(dwg2dxf) + # INSTALLATION install(TARGETS dxfrw DESTINATION "${CMAKE_INSTALL_LIBDIR}") set(HDRSUBDIR "/libdxfrw${PROJECT_VERSION_MAJOR}/") diff --git a/dwg2dxf/CMakeLists.txt b/dwg2dxf/CMakeLists.txt new file mode 100644 index 0000000..fdf025f --- /dev/null +++ b/dwg2dxf/CMakeLists.txt @@ -0,0 +1,8 @@ +add_definitions(-Wall) +include_directories(../src) + +add_executable(dwg2dxf dx_iface.cpp main.cpp dx_iface.h dx_data.h) +target_link_libraries(dwg2dxf dxfrw) + +install(TARGETS dwg2dxf DESTINATION "${CMAKE_INSTALL_BINDIR}") +install(FILES dwg2dxf.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") -- 2.21.0 ++++++ 0004-cmake-generate-and-install-pkgconfig.patch ++++++ From dd4a421755f716fb44076276bead870d71ddef39 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Mon, 20 May 2019 08:25:38 +0200 Subject: [PATCH 4/4] cmake: generate and install pkgconfig librecad depends on this. --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83468a5..c04760b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,9 +81,19 @@ endforeach() add_library(dxfrw SHARED ${libdxfrw_srcs} ${libdxfrw_hdrs}) set_target_properties(dxfrw PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}") +add_custom_command(OUTPUT libdxfrw${PROJECT_VERSION_MAJOR}.pc + COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/libdxfrw.pc.in libdxfrw${PROJECT_VERSION_MAJOR}.pc + COMMAND sed ARGS -i "s|@prefix@|${CMAKE_INSTALL_PREFIX}|g; s|@exec_prefix@|${CMAKE_INSTALL_PREFIX}|g; s|@libdir@|${CMAKE_INSTALL_FULL_LIBDIR}|g; s|@includedir@|${CMAKE_INSTALL_FULL_INCLUDEDIR}|g; s|@PACKAGE_VERSION@|${PROJECT_VERSION}|g; s|@LIBRARY_AGE@|${PROJECT_VERSION_MAJOR}|" libdxfrw${PROJECT_VERSION_MAJOR}.pc + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/libdxfrw.pc.in + VERBATIM) + +add_custom_target(libdxfrw_pkgconfig ALL + DEPENDS libdxfrw${PROJECT_VERSION_MAJOR}.pc) + add_subdirectory(dwg2dxf) # INSTALLATION install(TARGETS dxfrw DESTINATION "${CMAKE_INSTALL_LIBDIR}") set(HDRSUBDIR "/libdxfrw${PROJECT_VERSION_MAJOR}/") install(FILES ${installdxfrw_hdrs} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${HDRSUBDIR}") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdxfrw${PROJECT_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -- 2.21.0 ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">git://github.com/LibreCAD/libdxfrw/</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">libdxfrw</param> <param name="versionformat">0.6.3+git.%cd</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/LibreCAD/libdxfrw/</param> <param name="changesrevision">ba4b597ebfd86a0ca903c5fdc335143f7db236e2</param></service></servicedata>
