From 1d27d2f2d2acfa674167adb5d3928d0eaa0c08c0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 26 Aug 2022 16:06:53 +0200 Subject: [PATCH] Misc packaging cleanup --- zbar.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/zbar.spec b/zbar.spec index 6dbf9f1..1041c3d 100644 --- a/zbar.spec +++ b/zbar.spec @@ -42,7 +42,7 @@ intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code. %package devel -Summary: Bar code library extra development files +Summary: Bar code reader library extra development files Requires: %{name}-libs%{_isa} = %{version}-%{release} %description devel @@ -63,7 +63,7 @@ Obsoletes: %{name}-gi < %{version}-%{release} %description gtk This package contains a bar code scanning widget for use with GUI -applications based on GTK+-2.0. +applications based on GTK 3. %package gtk-devel Summary: Bar code reader GTK widget extra development files @@ -72,7 +72,7 @@ Requires: %{name}-gtk%{_isa} = %{version}-%{release} %description gtk-devel This package contains header files and additional libraries used for -developing GUI applications based on GTK+-2.0 that include a bar code +developing GUI applications based on GTK 3 that include a bar code scanning widget. %package qt @@ -90,7 +90,7 @@ Requires: %{name}-qt%{_isa} = %{version}-%{release} %description qt-devel This package contains header files and additional libraries used for -developing GUI applications based on Qt4 that include a bar code +developing GUI applications based on Qt5 that include a bar code scanning widget. %package -n python3-zbar @@ -115,7 +115,6 @@ This package contains header files and additional libraries used for on Java Native Interface (JNI) applications using ZBar. %endif - %prep %setup -q %patch0 -p1 @@ -131,7 +130,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build %install -rm -rf $RPM_BUILD_ROOT %make_install %if %{JAVA} install -d %{buildroot}%{_jnidir} @@ -169,7 +167,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %files devel %doc HACKING.md TODO.md - %{_libdir}/libzbar.so %{_libdir}/pkgconfig/zbar.pc %dir %{_includedir}/zbar @@ -218,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %changelog * Fri Aug 26 2022 Kalev Lember - 0.23.90-5 +- Misc packaging cleanup - Sort BuildRequires and Requires and split them out one per line - Move GObject Introspection bindings to -gtk and -gtk-devel subpackages - Split libzbar out to zbar-libs subpackage