[packages/zxcvbn-c] - updated to 2.6

[qboosh]

commit f03dd3d274a29d1662bc07f952814c6922789879
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 11 08:43:33 2026 +0200

    - updated to 2.6

 zxcvbn-c-install.patch | 30 ------------------------------
 zxcvbn-c.spec          | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 40 deletions(-)
---
diff --git a/zxcvbn-c.spec b/zxcvbn-c.spec
index d7f0a60..ef8ad20 100644
--- a/zxcvbn-c.spec
+++ b/zxcvbn-c.spec
@@ -1,16 +1,15 @@
 Summary:	C/C++ implementation of the zxcvbn password strength estimation
 Summary(pl.UTF-8):	Implementacja C/C++ algorytmu zxcvbn estymacji jakości haseł
 Name:		zxcvbn-c
-Version:	2.5
+Version:	2.6
 Release:	1
 License:	MIT
 Group:		Libraries
 #Source0Download: https://github.com/tsyrogit/zxcvbn-c/releases
 Source0:	https://github.com/tsyrogit/zxcvbn-c/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	cdc0f679b10b195ad3883f8adf16babc
-Patch0:		%{name}-install.patch
+# Source0-md5:	2b2ea7f39ce42959af5a5b9e0fcd1a24
 URL:		https://github.com/tsyrogit/zxcvbn-c
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,21 +44,22 @@ Statyczna biblioteka zxcvbn.
 
 %prep
 %setup -q
-%patch -P0 -p1
 
 %build
+# stick to makefile for now (v2.6), CMakeLists.txt doesn't support install
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags} -Wall -Wextra -Wdeclaration-after-statement" \
 CPPFLAGS="%{rpmcppflags}" \
 CXX="%{__cxx}" \
 CXXFLAGS="%{rpmcxxflags} -Wall -Wextra" \
-%{__make} package
+%{__make} libzxcvbn.so.0.0.0 libzxcvbn.a dict-crc.h dict-src.h
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	PREFIX=%{_prefix} \
 	LIBDIR=%{_libdir}
 
 %clean
@@ -72,14 +72,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc LICENSE.txt README.md
 %attr(755,root,root) %{_bindir}/zxcvbn-dictgen
-%attr(755,root,root) %{_libdir}/libzxcvbn.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzxcvbn.so.0
+%{_libdir}/libzxcvbn.so.*.*.*
+%ghost %{_libdir}/libzxcvbn.so.0
 %{_datadir}/zxcvbn
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libzxcvbn.so
-%{_includedir}/zxcvbn
+%{_libdir}/libzxcvbn.so
+%{_includedir}/zxcvbn.h
 
 %files static
 %defattr(644,root,root,755)
diff --git a/zxcvbn-c-install.patch b/zxcvbn-c-install.patch
deleted file mode 100644
index 7ae313d..0000000
--- a/zxcvbn-c-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Based on rpm/libzxcvbn-2.4-makefile-install.patch included in git archive
---- zxcvbn-c-2.5/makefile.orig	2022-04-07 19:19:00.000000000 +0200
-+++ zxcvbn-c-2.5/makefile	2024-09-01 20:43:07.889927559 +0200
-@@ -13,6 +13,8 @@ CPPFLAGS += -I.
- TARGET_LIB = libzxcvbn.so.0.0.0
- SONAME = libzxcvbn.so.0
- 
-+LIBDIR := $(or $(LIBDIR),$(/usr/lib))
-+
- WORDS = words-eng_wiki.txt words-female.txt words-male.txt words-passwd.txt words-surname.txt words-tv_film.txt
- 
- all: test-file test-inline test-c++inline test-c++file test-shlib test-statlib test-internals
-@@ -101,6 +103,17 @@ test: test-internals test-file test-inli
- 	./test-c++inline -t testcases.txt
- 	@echo Finished
- 
-+package: $(TARGET_LIB) libzxcvbn.a dict-crc.h dict-src.h
-+
-+install: package
-+	mkdir -p $(DESTDIR)/usr/{include,share}/zxcvbn $(DESTDIR)/usr/bin $(DESTDIR)$(LIBDIR)
-+	install -m 0644 *.h $(DESTDIR)/usr/include/zxcvbn
-+	install -m 0644 $(TARGET_LIB) libzxcvbn.a $(DESTDIR)$(LIBDIR)
-+	ln -s $(TARGET_LIB) $(DESTDIR)$(LIBDIR)/$(SONAME)
-+	ln -s $(SONAME) $(basename $(DESTDIR)$(LIBDIR)/$(SONAME))
-+	install -m 0755 dictgen $(DESTDIR)/usr/bin/zxcvbn-dictgen
-+	install -m 0644 zxcvbn.dict $(DESTDIR)/usr/share/zxcvbn
-+
- clean:
- 	rm -f test-file zxcvbn-file.o test-c++file zxcvbn-c++file.o 
- 	rm -f test-inline test-internals zxcvbn-inline.o zxcvbn-inline-pic.o test-c++inline zxcvbn-c++inline.o
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zxcvbn-c.git/commitdiff/f03dd3d274a29d1662bc07f952814c6922789879