[packages/dime] - old 1999 tarball updated to 2019 one tagged with same version (but new soname, enhanced API); rele

qboosh qboosh at pld-linux.org
Sun Sep 29 19:09:54 CEST 2024 

commit 77d24cc5dedc820cf2f21d244666b0ab0f19818d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 29 19:12:33 2024 +0200

    - old 1999 tarball updated to 2019 one tagged with same version (but new soname, enhanced API); release 6

 dime-c++.patch    | 64 -------------------------------------------------------
 dime-doc.patch    | 17 ---------------
 dime-pc.patch     | 16 ++++++++++++++
 dime-shared.patch | 42 ------------------------------------
 dime.spec         | 61 ++++++++++++++++++++++++++++++----------------------
 5 files changed, 51 insertions(+), 149 deletions(-)
---
diff --git a/dime.spec b/dime.spec
index b444961..4ff0760 100644
--- a/dime.spec
+++ b/dime.spec
@@ -1,20 +1,21 @@
+#
+# Conditional build:
+%bcond_without	apidocs		# HTML documentation
+%bcond_without	static_libs	# static library
+
 Summary:	DIME - DXF Import, manipulation and Export library
 Summary(pl.UTF-8):	DIME - biblioteka do manipulacji plikami w formacie DXF
 Name:		dime
 Version:	0.9.1
-Release:	5
-License:	GPL v2
+Release:	6
+License:	BSD
 Group:		Libraries
-# original source (no lonver available): ftp://ftp.sim.no/pub/dime/
-# now available at https://github.com/coin3d/dime, last tagged version is 0.9.1
-Source0:	%{name}-%{version}-src.tar.bz2
-# Source0-md5:	142af240cd35508d606917a38164c759
-Source1:	%{name}-%{version}-doc.tar.bz2
-# Source1-md5:	994706320ce7d222a1597913ba0cbee0
-Patch0:		%{name}-c++.patch
-Patch1:		%{name}-shared.patch
-Patch2:		%{name}-doc.patch
+#Source0Download: https://github.com/coin3d/dime/releases
+Source0:	https://github.com/coin3d/dime/releases/download/dime-%{version}/%{name}-%{version}-src.tar.gz
+# Source0-md5:	90ead20f77a8c1caf6a8c98cc21c61c6
+Patch0:		%{name}-pc.patch
 URL:		https://github.com/coin3d/dime
+%{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	rpm-build >= 4.6
@@ -68,6 +69,7 @@ Summary:	Header files for DIME
 Summary(pl.UTF-8):	Pliki nagłówkowe DIME
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libstdc++-devel
 
 %description devel
 Header files for DIME.
@@ -101,44 +103,51 @@ API documentation for DIME library.
 Dokumentacja API biblioteki DIME.
 
 %prep
-%setup -q -b1
+%setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
+# no +x in tarball
+chmod 755 configure cfg/doxy4win.pl
 
 %build
-%{__make} -C build libdime.la \
-	CC="%{__cxx}" \
-	OPT="%{rpmcxxflags} %{rpmcppflags}" \
-	LDFLAGS="%{rpmldflags}" \
-	LIBDIR=%{_libdir}
+%configure \
+	--enable-html \
+	%{?with_static_libs:--enable-static}
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
 
-cp -pr include/* $RPM_BUILD_ROOT%{_includedir}
-libtool --mode=install install build/libdime.la $RPM_BUILD_ROOT%{_libdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libdime.la
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/dime
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO
+%doc AUTHORS COPYING FAQ README TODO
 %attr(755,root,root) %{_libdir}/libdime.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdime.so.0
+%attr(755,root,root) %ghost %{_libdir}/libdime.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdime.so
-%{_libdir}/libdime.la
 %{_includedir}/dime
+%{_pkgconfigdir}/dime.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libdime.a
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc docs/html/*
+%doc html/*.{css,html,js,png}
+%endif
diff --git a/dime-c++.patch b/dime-c++.patch
deleted file mode 100644
index 651f5d7..0000000
--- a/dime-c++.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- dime-0.9.1/include/dime/classes/Class.h.orig	1999-02-25 17:13:24.000000000 +0100
-+++ dime-0.9.1/include/dime/classes/Class.h	2011-11-15 20:51:01.204433613 +0100
-@@ -44,6 +44,7 @@
- class dimeInput;
- class dimeMemHandler;
- class dimeOutput;
-+class dimeModel;
- 
- class dimeClass : public dimeRecordHolder
- {
---- dime-0.9.1/include/dime/entities/Entity.h.orig	1999-02-25 17:13:24.000000000 +0100
-+++ dime-0.9.1/include/dime/entities/Entity.h	2011-11-15 20:52:01.871102310 +0100
-@@ -42,6 +42,7 @@
- #include <dime/RecordHolder.h>
- 
- class dimeLayer;
-+class dimeModel;
- 
- class dimeEntity : public dimeRecordHolder
- {
---- dime-0.9.1/include/dime/entities/Vertex.h.orig	1999-02-25 17:13:24.000000000 +0100
-+++ dime-0.9.1/include/dime/entities/Vertex.h	2011-11-15 20:52:28.654436541 +0100
-@@ -39,6 +39,8 @@
- #include <dime/entities/Entity.h>
- #include <dime/util/Linear.h>
- 
-+class dimePolyline;
-+
- class dimeVertex : public dimeEntity
- {
-   friend class dimePolyline;
---- dime-0.9.1/include/dime/entities/Insert.h.orig	1999-02-25 17:13:24.000000000 +0100
-+++ dime-0.9.1/include/dime/entities/Insert.h	2011-11-15 20:53:17.721104851 +0100
-@@ -39,6 +39,8 @@
- #include <dime/entities/Entity.h>
- #include <dime/util/Linear.h>
- 
-+class dimeBlock;
-+
- class dimeInsert : public dimeEntity
- {
-   friend class dimeEntitiesSection;
---- dime-0.9.1/include/dime/objects/Object.h.orig	1999-02-25 17:13:24.000000000 +0100
-+++ dime-0.9.1/include/dime/objects/Object.h	2011-11-15 20:51:25.181101082 +0100
-@@ -41,6 +41,8 @@
- #include <dime/util/Linear.h>
- #include <dime/RecordHolder.h>
- 
-+class dimeModel;
-+
- class dimeObject : public dimeRecordHolder
- {
-   friend class dimeObjectesSection;
---- dime-0.9.1/include/dime/Output.h.orig	1999-02-25 17:13:23.000000000 +0100
-+++ dime-0.9.1/include/dime/Output.h	2011-11-15 20:49:54.631098052 +0100
-@@ -38,6 +38,8 @@
- #include <dime/Basic.h>
- #include <stdio.h>
- 
-+class dimeModel;
-+
- class dimeOutput
- {
- public:
diff --git a/dime-doc.patch b/dime-doc.patch
deleted file mode 100644
index 81888e3..0000000
--- a/dime-doc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- dime-0.9.1/docs/latex/refman.tex.orig	1999-02-25 17:13:42.000000000 +0100
-+++ dime-0.9.1/docs/latex/refman.tex	2011-11-15 21:08:20.837801758 +0100
-@@ -1,12 +1,12 @@
- \documentclass[a4paper]{book}
- \usepackage{a4wide}
- \usepackage{makeidx}
--\usepackage{fancyheadings}
-+\usepackage{fancyhdr}
- \usepackage{epsf}
- \usepackage{doxygen}
- \makeindex
- \setcounter{tocdepth}{1}
--\setlength{\footrulewidth}{0.4pt}
-+\renewcommand{\footrulewidth}{0.4pt}
- \begin{document}
- \title{DIME Reference Manual}
- \author{generated by Doxygen}
diff --git a/dime-pc.patch b/dime-pc.patch
new file mode 100644
index 0000000..3290849
--- /dev/null
+++ b/dime-pc.patch
@@ -0,0 +1,16 @@
+--- dime/dime.pc.in.orig	2019-12-26 00:35:11.000000000 +0100
++++ dime/dime.pc.in	2024-09-29 16:43:39.625169350 +0200
+@@ -10,11 +10,8 @@ Description: library for reading, constr
+ Version: @VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} @DIME_EXTRA_LDFLAGS@ @DIME_EXTRA_LIBS@
+-Cflags: -I${includedir} @DIME_EXTRA_CFLAGS@ @DIME_EXTRA_CPPFLAGS@
++Libs: -L${libdir} @DIME_EXTRA_LIBS@
++Cflags: -I${includedir}
+ 
+ dime_host="@host@"
+ compiler=@DIME_COMPILER@
+-compiler_is_gcc=@ac_compiler_gnu@
+-frameworkdir=@frameworkdir@
+-msvcrt=@DIME_MSVC_LIBC@
diff --git a/dime-shared.patch b/dime-shared.patch
deleted file mode 100644
index 28291b7..0000000
--- a/dime-shared.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- dime-0.9.1/build/makefile.orig	1999-02-17 16:05:33.000000000 +0100
-+++ dime-0.9.1/build/makefile	2011-11-15 20:57:49.877780630 +0100
-@@ -8,7 +8,7 @@
- #****************************************************************
- 
-           CC = g++
--          LD = ar cqs
-+          LD = $(CC)
- 
-      INCLUDE = -I../include
-          OPT = -O2
-@@ -17,7 +17,9 @@
-         WARN =
-       CFLAGS = $(OPT) $(DEBUG) $(DEFINES) $(WARN) $(INCLUDE) -c
- 
--     COMPILE = $(CC) $(CFLAGS) $^ -o $@
-+     COMPILE = libtool --mode=compile --tag=CXX $(CC) $(CFLAGS) $^ -o $(@:.o=.lo)
-+      LIBDIR = /usr/lib
-+        LINK = libtool --mode=link --tag=CXX $(LD) $(LDFLAGS) -rpath $(LIBDIR) -o
- 
-      TARGETS = libdime.a
- 
-@@ -79,6 +81,8 @@
-   objs/UCSTable.o \
-   objs/LayerTable.o
- 
-+LTOBJECTS=$(OBJECTS:%.o=%.lo)
-+
- #***************************************************************************
- 
- all:: $(TARGETS)
-@@ -89,8 +93,8 @@
- objs:
- 	@mkdir $@
- 
--libdime.a: objs $(OBJECTS)
--	$(LD) $@ $(OBJECTS)
-+libdime.la: objs $(OBJECTS)
-+	$(LINK) $@ $(LTOBJECTS)
- 
- #***************************************************************************
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dime.git/commitdiff/77d24cc5dedc820cf2f21d244666b0ab0f19818d

More information about the pld-cvs-commit mailing list