- updated to 0.12

- updated python patch
- removed obsolete missing patch

diff --git a/libredwg-missing.patch b/libredwg-missing.patch
deleted file mode 100644 (file)
index 3c7089e..0000000
--- a/libredwg-missing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libredwg-0.11.1/bindings/perl/MANIFEST.orig        1970-01-01 01:00:00.000000000 +0100
-+++ libredwg-0.11.1/bindings/perl/MANIFEST     2020-12-08 19:47:31.306068620 +0100
-@@ -0,0 +1,5 @@
-+LibreDWG.c
-+LibreDWG.pm
-+MANIFEST
-+Makefile.PL
-+t/0_basic.t
---- libredwg-0.11.1/bindings/perl/t/0_basic.t.orig     1970-01-01 01:00:00.000000000 +0100
-+++ libredwg-0.11.1/bindings/perl/t/0_basic.t  2020-12-08 19:48:52.275629970 +0100
-@@ -0,0 +1,2 @@
-+use Test::More tests => 1;
-+use_ok 'LibreDWG';

diff --git a/libredwg-python.patch b/libredwg-python.patch
index 70ade2dcdb745305366573f5786713b07993502b..5935758539d1e556747a57146539af1211d0bb81 100644 (file)
--- a/libredwg-python.patch
+++ b/libredwg-python.patch
@@ -1,11 +1,11 @@
---- libredwg-0.11.1/bindings/python/Makefile.am.orig   2020-01-16 23:20:42.000000000 +0100
-+++ libredwg-0.11.1/bindings/python/Makefile.am        2020-12-08 21:25:20.224273962 +0100
+--- libredwg-0.12/bindings/python/Makefile.am.orig     2021-01-06 19:18:21.747727679 +0100
++++ libredwg-0.12/bindings/python/Makefile.am  2021-01-06 19:20:34.227009977 +0100
 @@ -46,7 +46,7 @@
  ## more magic: SWIG_PYTHON_CPPFLAGS resolves to null and python includes
  ## are not passed to gcc via -I
  _LibreDWG_la_CPPFLAGS = -I$(top_srcdir)/include $(AX_SWIG_PYTHON_CPPFLAGS)
--_LibreDWG_la_LDFLAGS = -module
-+_LibreDWG_la_LDFLAGS = -module -avoid-version -shared
- _LibreDWG_la_LIBADD = ../../src/libredwg.la
+-_LibreDWG_la_LDFLAGS = -module -no-undefined $(PYTHON_EXTRA_LDFLAGS)
++_LibreDWG_la_LDFLAGS = -module -avoid-version -shared -no-undefined $(PYTHON_EXTRA_LDFLAGS)
+ _LibreDWG_la_LIBADD = ../../src/libredwg.la $(PYTHON_LIBS) $(PYTHON_EXTRA_LIBS)
  
  ## not elegant, but works

diff --git a/libredwg.spec b/libredwg.spec
index 0427957174d0a7f2d8b00b22c7ea5a783eebe71f..307ad60c6b85dd88e5115e3074f0c799331ed25e 100644 (file)
--- a/libredwg.spec
+++ b/libredwg.spec
@@ -1,15 +1,14 @@
 Summary:       LibreDWG - free implementation of the DWG file format
 Summary(pl.UTF-8):     LibreDWG - wolnodostępna implementacja formatu plików DWG
 Name:          libredwg
-Version:       0.11.1
+Version:       0.12
 Release:       1
 License:       GPL v3+
 Group:         Libraries
 Source0:       https://ftp.gnu.org/gnu/libredwg/%{name}-%{version}.tar.xz
-# Source0-md5: 599d15f36e37acbdee4d751f5c965e40
-Patch0:                %{name}-missing.patch
-Patch1:                %{name}-info.patch
-Patch2:                %{name}-python.patch
+# Source0-md5: 5b102e8684333622819cc74dc8a76118
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-python.patch
 URL:           http://www.gnu.org/software/libredwg/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.14
@@ -98,7 +97,6 @@ Interfejs Pythona do biblioteki LibreDWG.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # no git-version-gen in release tarball
 %{__sed} -i -e 's/m4_esyscmd.*git-version-gen.*/[%{version}],/' configure.ac
@@ -127,6 +125,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_LibreDWG.la
 %py_postclean
 
+# just example, nothing really useful
+install -d $RPM_BUILD_ROOT%{_examplesdir}/python-libredwg-%{version}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/load_dwg.py $RPM_BUILD_ROOT%{_examplesdir}/python-libredwg-%{version}
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/dwgadd.example
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -141,10 +145,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README TODO examples/dwgadd.example
 %attr(755,root,root) %{_bindir}/dwg2SVG
 %attr(755,root,root) %{_bindir}/dwg2dxf
 %attr(755,root,root) %{_bindir}/dwg2ps
+%attr(755,root,root) %{_bindir}/dwgadd
 %attr(755,root,root) %{_bindir}/dwgbmp
 %attr(755,root,root) %{_bindir}/dwgfilter
 %attr(755,root,root) %{_bindir}/dwggrep
@@ -159,6 +164,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dwg2SVG.1*
 %{_mandir}/man1/dwg2dxf.1*
 %{_mandir}/man1/dwg2ps.1*
+%{_mandir}/man1/dwgadd.1*
 %{_mandir}/man1/dwgbmp.1*
 %{_mandir}/man1/dwgfilter.1*
 %{_mandir}/man1/dwggrep.1*
@@ -168,6 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dwgwrite.1*
 %{_mandir}/man1/dxf2dwg.1*
 %{_mandir}/man1/dxfwrite.1*
+%{_mandir}/man5/dwgadd.5*
 
 %files devel
 %defattr(644,root,root,755)
@@ -192,3 +199,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_LibreDWG.so
 %{py_sitescriptdir}/LibreDWG.py[co]
+%{_examplesdir}/python-libredwg-%{version}