[packages/vdkxdb] - updated to 2.5.0

Wed Jul 24 18:15:35 CEST 2024

commit c60d9765185bb331be2bed608eeb672366d04e99
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 24 17:50:09 2024 +0200

    - updated to 2.5.0

 vdkxdb-ac_FLAGS.patch  | 15 ++++++-------
 vdkxdb-xbase_ver.patch | 12 +++++-----
 vdkxdb.spec            | 59 +++++++++++++++++++++++++++++++++++---------------
 3 files changed, 55 insertions(+), 31 deletions(-)
---

diff --git a/vdkxdb.spec b/vdkxdb.spec
index 0fbcaa5..80d7419 100644
--- a/vdkxdb.spec
+++ b/vdkxdb.spec
@@ -1,22 +1,27 @@
 #
 # Conditional build:
-%bcond_without  static_libs # don't build static libraries
+%bcond_without  static_libs	# static library
 #
 Summary:	VDKXdb - a set of data-aware widgets to build database applications using VDK
 Summary(pl.UTF-8):	VDKXdb - zestaw widżetów do budowy aplikacji bazodanowych przy użyciu VDK
 Name:		vdkxdb
-Version:	2.4.0
-Release:	0.1
-License:	LGPL v2
+Version:	2.5.0
+Release:	1
+License:	LGPL v2+
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/vdklib/%{name}-%{version}.tar.gz
-# Source0-md5:	e603e6f3b78bd6e17572025e02130ae7
+Source0:	https://downloads.sourceforge.net/vdklib/%{name}-%{version}.tar.gz
+# Source0-md5:	2158d4379a57a355d75c54febd383b75
 Patch0:		%{name}-xbase_ver.patch
 Patch1:		%{name}-ac_FLAGS.patch
-URL:		http://vdklib.sourceforge.net/
-BuildRequires:	autoconf
+Patch2:		%{name}-link.patch
+URL:		https://vdklib.sourceforge.net/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	vdk-devel >= 2.0
+BuildRequires:	xbase-devel >= 2.1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,10 +56,23 @@ Static vdkxdb library.
 %description static -l pl.UTF-8
 Statyczna biblioteka vdkxdb.
 
+%package apidocs
+Summary:	API documentation for vdkxdb library
+Summary(pl.UTF-8):	Dokumentacja API biblioteki vdkxdb
+Group:		Documentation
+BuildArch:	noarch
+
+%description apidocs
+API documentation for vdkxdb library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki vdkxdb.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -63,7 +81,7 @@ Statyczna biblioteka vdkxdb.
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
+	--enable-static%{!?with_static_libs:=no}
 %{__make}
 %{__make} docs
 
@@ -73,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -82,19 +103,23 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libvdkxdb-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvdkxdb-2.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/doxy/html/*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/vdkxdb2
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/vdkxdb-config-2
+%attr(755,root,root) %{_libdir}/libvdkxdb-2.so
+%{_includedir}/vdkxdb-2
+%{_pkgconfigdir}/vdkxdb-2.x.pc
+%{_mandir}/man1/vdkxdb-config-2.1*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libvdkxdb-2.a
 %endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/doxy/html/*.{css,html,js,png}
diff --git a/vdkxdb-ac_FLAGS.patch b/vdkxdb-ac_FLAGS.patch
index 4303c3b..1264af8 100644
--- a/vdkxdb-ac_FLAGS.patch
+++ b/vdkxdb-ac_FLAGS.patch
@@ -1,15 +1,14 @@
-diff -Nurb b.vdkxdb-2.4.0/configure.in n.vdkxdb-2.4.0/configure.in
---- b.vdkxdb-2.4.0/configure.in	2005-10-13 21:10:59.330954000 +0200
-+++ n.vdkxdb-2.4.0/configure.in	2005-10-13 21:16:54.027032856 +0200
+--- vdkxdb-2.5.0/configure.ac.orig	2024-07-24 06:20:45.916590334 +0200
++++ vdkxdb-2.5.0/configure.ac	2024-07-24 06:21:05.128245580 +0200
 @@ -1,7 +1,5 @@
- AC_INIT(include/vdkxdb2/vdkxdb.h)
+ AC_INIT(include/vdkxdb/vdkxdb.h)
  
 -cflags_set=${CFLAGS+set}
 -
- REQUIRED_VDK_VERSION=2.4.0
+ REQUIRED_VDK_VERSION=2.5.0
+ REQUIRED_VDK_VERSION_MAJOR=2
  REQUIRED_XBASE_VERSION=2.1.1
- VDKXDB_VERSION_MAJOR=2
-@@ -79,7 +77,6 @@
+@@ -87,7 +85,6 @@ AC_SUBST(PERL)
  
  
  AC_ARG_ENABLE(debug,     [ --enable-debug=[no/minimum/yes]  enable debug information [default=no]],,enable_debug=no)
@@ -17,7 +16,7 @@ diff -Nurb b.vdkxdb-2.4.0/configure.in n.vdkxdb-2.4.0/configure.in
  AC_ARG_ENABLE(doc-html,  [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes)
  AC_ARG_ENABLE(doc-latex, [ --enable-doc-latex[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_latex=no)
  AC_ARG_ENABLE(doc-man,   [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no)
-@@ -87,21 +84,15 @@
+@@ -95,21 +92,15 @@ AC_ARG_ENABLE(doc-man,   [ --enable-doc-
  if test "x$enable_debug" = "xminimum"; then
    VDKXDBDEBUG=1
    AC_SUBST(VDKXDBDEBUG)
diff --git a/vdkxdb-xbase_ver.patch b/vdkxdb-xbase_ver.patch
index 0506f93..7638345 100644
--- a/vdkxdb-xbase_ver.patch
+++ b/vdkxdb-xbase_ver.patch
@@ -1,11 +1,11 @@
---- vdkxdb-2.4.0/configure.in~	2005-10-13 21:02:40.228829912 +0200
-+++ vdkxdb-2.4.0/configure.in	2005-10-13 21:03:22.294434968 +0200
-@@ -3,7 +3,7 @@
- cflags_set=${CFLAGS+set}
+--- vdkxdb-2.5.0/configure.ac.orig	2009-11-19 10:37:01.000000000 +0100
++++ vdkxdb-2.5.0/configure.ac	2024-07-23 05:16:19.220590777 +0200
+@@ -4,7 +4,7 @@ cflags_set=${CFLAGS+set}
  
- REQUIRED_VDK_VERSION=2.4.0
+ REQUIRED_VDK_VERSION=2.5.0
+ REQUIRED_VDK_VERSION_MAJOR=2
 -REQUIRED_XBASE_VERSION=2.0.0
 +REQUIRED_XBASE_VERSION=2.1.1
  VDKXDB_VERSION_MAJOR=2
- VDKXDB_VERSION_MINOR=4
+ VDKXDB_VERSION_MINOR=5
  VDKXDB_VERSION_MICRO=0
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vdkxdb.git/commitdiff/c60d9765185bb331be2bed608eeb672366d04e99

