[packages/cpdb-libs/DEVEL-2] - updated to 2.0b7

[qboosh]

commit 937eaacc00f8c8d28eb2c5f4bbceee3eeb87123f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 14 17:02:55 2025 +0200

    - updated to 2.0b7

 cpdb-libs-link.patch | 29 ++++++++++------------------
 cpdb-libs.spec       | 53 +++++++++++++++++++++++++++-------------------------
 2 files changed, 38 insertions(+), 44 deletions(-)
---
diff --git a/cpdb-libs.spec b/cpdb-libs.spec
index 70e7137..3f762c6 100644
--- a/cpdb-libs.spec
+++ b/cpdb-libs.spec
@@ -5,18 +5,21 @@
 Summary:	Frontend/Backend Communication Libraries for the Common Print Dialog Backends
 Summary(pl.UTF-8):	Biblioteki komunikacji frontendu/backendu dla CPDB (wspólnych okien dialogowych drukowania)
 Name:		cpdb-libs
-Version:	1.2.0
-Release:	1
+Version:	2.0
+%define	subver	b7
+%define	rel	1
+Release:	0.%{subver}.%{rel}
 License:	MIT
 Group:		Libraries
 #Source0Download: https://github.com/OpenPrinting/cpdb-libs/releases
-Source0:	https://github.com/OpenPrinting/cpdb-libs/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	2df7396b3c6ce05a0c001324d82396de
+Source0:	https://github.com/OpenPrinting/cpdb-libs/archive/%{version}%{subver}/%{name}-%{version}%{subver}.tar.gz
+# Source0-md5:	bd8a6af99d2e38387e9da6719ca8eca3
 Patch0:		%{name}-link.patch
 URL:		https://github.com/OpenPrinting/cpdb-libs
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
 BuildRequires:	cups-devel
+BuildRequires:	gettext-tools >= 0.21
 BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	libtool >= 2:2
 BuildRequires:	pkgconfig
@@ -69,12 +72,16 @@ Static CPDB libraries.
 Statyczne biblioteki CPDB.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{subver}
 %patch -P0 -p1
 
+# allow gettextize
+%{__sed} -i -e 's,po/Makefile\.in,,' configure.ac
+
 %build
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
@@ -89,10 +96,7 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/print-backends,%{_datadir}/print-backends}
 	DESTDIR=$RPM_BUILD_ROOT
 
 # obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcpdb-*.la
-
-install -d $RPM_BUILD_ROOT%{_examplesdir}
-cp -pr demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcpdb*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,28 +107,27 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.md README.md
-%attr(755,root,root) %{_libdir}/libcpdb-libs-common.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcpdb-libs-common.so.1
-%attr(755,root,root) %{_libdir}/libcpdb-libs-frontend.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcpdb-libs-frontend.so.1
+%attr(755,root,root) %{_bindir}/cpdb-pickle-print
+%attr(755,root,root) %{_bindir}/cpdb-text-frontend
+%attr(755,root,root) %{_libdir}/libcpdb.so.*.*.*
+%ghost %{_libdir}/libcpdb.so.2
+%attr(755,root,root) %{_libdir}/libcpdb-frontend.so.*.*.*
+%ghost %{_libdir}/libcpdb-frontend.so.2
 %dir %{_libdir}/print-backends
 %dir %{_datadir}/print-backends
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcpdb-libs-common.so
-%attr(755,root,root) %{_libdir}/libcpdb-libs-frontend.so
-%{_includedir}/cpd-interface-headers
-%{_includedir}/cpdb-libs-backend.h
-%{_includedir}/cpdb-libs-frontend.h
-%{_pkgconfigdir}/cpdb-libs-backend.pc
-%{_pkgconfigdir}/cpdb-libs-common.pc
-%{_pkgconfigdir}/cpdb-libs-frontend.pc
-%{_examplesdir}/%{name}-%{version}
+%{_libdir}/libcpdb.so
+%{_libdir}/libcpdb-frontend.so
+%{_includedir}/cpdb
+%{_pkgconfigdir}/cpdb.pc
+%{_pkgconfigdir}/cpdb-backend.pc
+%{_pkgconfigdir}/cpdb-frontend.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libcpdb-libs-common.a
-%{_libdir}/libcpdb-libs-frontend.a
+%{_libdir}/libcpdb.a
+%{_libdir}/libcpdb-frontend.a
 %endif
diff --git a/cpdb-libs-link.patch b/cpdb-libs-link.patch
index 1f26f48..ee87194 100644
--- a/cpdb-libs-link.patch
+++ b/cpdb-libs-link.patch
@@ -1,19 +1,10 @@
---- cpdb-libs-1.2.0/lib/Makefile.am.orig	2018-08-19 12:32:05.000000000 +0200
-+++ cpdb-libs-1.2.0/lib/Makefile.am	2023-03-22 19:14:32.959784611 +0100
-@@ -2,7 +2,7 @@ EXTRA_DIST = interface
- 
- BUILT_SOURCES = backend_interface.h frontend_interface.h
- 
--lib_LTLIBRARIES	= libcpdb-libs-frontend.la libcpdb-libs-common.la
-+lib_LTLIBRARIES	= libcpdb-libs-common.la libcpdb-libs-frontend.la
- 
- libcpdb_libs_common_la_SOURCES = backend_interface.c frontend_interface.c common_helper.c
- libcpdb_libs_common_la_CPPFLAGS  = $(GLIB_CFLAGS)
-@@ -24,6 +24,7 @@ libcpdb_libs_frontend_la_LIBADD  = -lcup
- libcpdb_libs_frontend_la_LIBADD += $(GLIB_LIBS)
- libcpdb_libs_frontend_la_LIBADD += $(GIO_LIBS)
- libcpdb_libs_frontend_la_LIBADD += $(GIOUNIX_LIBS)
-+libcpdb_libs_frontend_la_LIBADD += libcpdb-libs-common.la
- 
- libcpdb_libs_frontend_la_LDFLAGS = -no-undefined -version-info 1
- 
+--- cpdb-libs-2.0b7/cpdb/Makefile.am.orig	2025-02-20 00:11:24.000000000 +0100
++++ cpdb-libs-2.0b7/cpdb/Makefile.am	2025-09-14 16:41:15.844096498 +0200
+@@ -29,6 +29,7 @@ libcpdb_frontend_la_CPPFLAGS += $(GIOUNI
+ libcpdb_frontend_la_CPPFLAGS += -I..
+ 
+ libcpdb_frontend_la_LIBADD  = -lpthread -lm -lcrypt
++libcpdb_frontend_la_LIBADD  = libcpdb.la
+ libcpdb_frontend_la_LIBADD += $(GLIB_LIBS)
+ libcpdb_frontend_la_LIBADD += $(GIO_LIBS)
+ libcpdb_frontend_la_LIBADD += $(GIOUNIX_LIBS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cpdb-libs.git/commitdiff/937eaacc00f8c8d28eb2c5f4bbceee3eeb87123f