- updated to 3.17.0

diff --git a/dxflib.spec b/dxflib.spec
index d6cd7030366d4da1259f924a0efa70a5a66d3055..806df66ec401e4aa20a9acbc0d9a9b8a4f46f21d 100644 (file)
--- a/dxflib.spec
+++ b/dxflib.spec
@@ -1,39 +1,41 @@
 Summary:       Open source C++ library mainly for parsing DXFTM files
-Summary(pl.UTF-8):     Otwarta biblioteka w C++ do obslugi plikow DXF
+Summary(pl.UTF-8):     Otwarta biblioteka w C++ do obsługi plików DXF
 Name:          dxflib
-Version:       2.2.0.0
-Release:       0.3
-License:       GPL
+Version:       3.17.0
+Release:       0.1
+License:       GPL v2+
 Group:         Libraries
-Source0:       ftp://anonymous:anonymous@ribbonsoft.com/archives/dxflib/%{name}-%{version}-1.src.tar.gz
-# Source0-md5: 0eb6bef3b3a702012eeb4e99ef1aa3f1
-Patch0:                %{name}_include_string.patch
-URL:           http://www.qcad.org/dxflib.html
+Source0:       https://qcad.org/archives/dxflib/%{name}-%{version}-src.tar.gz
+# Source0-md5: b4b3bdc7ed678952b5a81c01d1faaac2
+URL:           https://qcad.org/en/what-is-dxflib
+BuildRequires: qt5-qmake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Open source C++ library mainly for parsing DXFTM files
 
 %description -l pl.UTF-8
-Otwarta biblioteka w C++ do obslugi plikow DXF
+Otwarta biblioteka w C++ do obsługi plików DXF
 
 %prep
-%setup -q -n %{name}-%{version}-1.src
-%patch0
+%setup -q -n %{name}-%{version}-src
 
 %build
-%{__aclocal}
-%{__autoconf}
-%configure
+
+qmake-qt5 -r \
+       QMAKE_CXX="%{__cxx}" \
+       QMAKE_LINK="%{__cxx}" \
+       QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+       QMAKE_LFLAGS_RELEASE="%{rpmldflags}" \
+       QMAKE_RPATH=
 
 %{__make}
-%{__make} -C test
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-       LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
-       INCDIR=$RPM_BUILD_ROOT%{_includedir}/dxflib
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/dxflib}
+cp -p libdxflib.a $RPM_BUILD_ROOT%{_libdir}/
+cp -p src/*.h $RPM_BUILD_ROOT%{_includedir}/dxflib/
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/dxflib_include_string.patch b/dxflib_include_string.patch
deleted file mode 100644 (file)
index a52a1f5..0000000
--- a/dxflib_include_string.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dl_writer_ascii.cpp.org        2011-03-16 10:08:03.850696616 +0100
-+++ src/dl_writer_ascii.cpp    2011-03-16 10:08:32.105320969 +0100
-@@ -30,6 +30,7 @@
- #endif // _MSC_VER > 1000
- 
- #include <stdio.h>
-+#include <string.h>
- 
- #include "dl_writer_ascii.h"
- #include "dl_exception.h"