From 5ed4e19ffd6d6f6eca19105154a7176f326b3970 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Fri, 31 May 2024 13:45:57 +0300
Subject: [PATCH] Clean up spec

---
 SPECS/zxing-cpp.spec | 74 +++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 49 deletions(-)

diff --git a/SPECS/zxing-cpp.spec b/SPECS/zxing-cpp.spec
index 88a5144..32707c4 100644
--- a/SPECS/zxing-cpp.spec
+++ b/SPECS/zxing-cpp.spec
@@ -1,17 +1,14 @@
-%define major	3
-%define libname %{name}-libs
-%define devname %{name}-devel
-
 %bcond_with examples
 
 Name:		zxing-cpp
 Version:	2.2.1
-Release:	2%{?dist}.inferit
+Release:	3%{?dist}.inferit
 Summary:	C++ port of the ZXing ("Zebra Crossing") barcode scanning library
-Group:		System/Libraries
+
 License:	LGPLv2+
 Url:		https://github.com/nu-book/zxing-cpp
 Source0:	https://github.com/nu-book/zxing-cpp/archive/v%{version}/%{name}-%{version}.tar.gz
+
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	libstdc++-static
@@ -35,8 +32,6 @@ Same as ZXing, following barcode are supported:
   ITF, RSS-14, RSS-Expanded
 * 2D: QR Code, Data Matrix, Aztec (beta), PDF 417 (beta)
 
-#----------------------------------------------------------------------------
-
 %if %{with examples}
 %package tools
 Summary:	Utilities provided by ZXing library
@@ -50,54 +45,16 @@ Same as ZXing, following barcode are supported:
 * 1D industrial: Code 39, Code 93, Code 128, Codabar,
   ITF, RSS-14, RSS-Expanded
 * 2D: QR Code, Data Matrix, Aztec (beta), PDF 417 (beta)
-
-%files tools
-%doc README.md
-%{_bindir}/ZXingReader
-%{_bindir}/ZXingWriter
 %endif
 
-#----------------------------------------------------------------------------
-
-%package -n %{libname}
-Summary:	Main library for %{name}
-Group:		System/Libraries
-
-%description -n %{libname}
-This project is a C++ port of ZXing Library.
-
-Same as ZXing, following barcode are supported:
-* 1D product: UPC-A UPC-E EAN-8 EAN-13
-* 1D industrial: Code 39, Code 93, Code 128, Codabar,
-  ITF, RSS-14, RSS-Expanded
-* 2D: QR Code, Data Matrix, Aztec (beta), PDF 417 (beta)
-
-%files -n %{libname}
-%license LICENSE
-%doc README.md
-%{_libdir}/libZXing.so.%{major}
-%{_libdir}/libZXing.so.%{version}
-
-#----------------------------------------------------------------------------
-
-%package -n %{devname}
+%package devel
 Summary:	Development files for %{name}
-Group:		Development/C++
-Requires:	%{libname} >= %{version}-%{release}
-Provides:	%{name}-devel = %{version}-%{release}
+Requires:	%{name} >= %{version}-%{release}
 Provides:	zxingcore-devel = %{version}-%{release}
 
-%description -n %{devname}
+%description devel
 This package contains the development files for %{name}.
 
-%files -n %{devname}
-%{_includedir}/ZXing/
-%{_libdir}/libZXing.so
-%{_libdir}/cmake/ZXing/
-%{_libdir}/pkgconfig/zxing.pc
-
-#----------------------------------------------------------------------------
-
 %prep
 %autosetup -p1
 
@@ -114,9 +71,28 @@ This package contains the development files for %{name}.
 %install
 %cmake_install
 
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/libZXing.so.*
+
+%if %{with examples}
+%files tools
+%doc README.md
+%{_bindir}/ZXingReader
+%{_bindir}/ZXingWriter
+%endif
 
+%files devel
+%{_includedir}/ZXing/
+%{_libdir}/libZXing.so
+%{_libdir}/cmake/ZXing/
+%{_libdir}/pkgconfig/zxing.pc
 
 %changelog
+* Fri May 31 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.2.1-3.inferit
+- Clean up spec
+
 * Thu May 30 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> 2.2.1-2.inferit
 - Rebuilt for MSVSphere 9.4