From 3382cddf1b795a2f185a8ff2e7b2d3543209c6d2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Aug 26 2022 14:09:08 +0000 Subject: Use make_build and make_install macros --- diff --git a/zbar.spec b/zbar.spec index 55b1804..6dbf9f1 100644 --- a/zbar.spec +++ b/zbar.spec @@ -128,11 +128,11 @@ on Java Native Interface (JNI) applications using ZBar. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%make_build %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install %if %{JAVA} install -d %{buildroot}%{_jnidir} mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir} @@ -224,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ - Tighten subpackage deps with %%{_isa} - Drop manual requires on pkgconfig and rely on rpm dep extractor - Rename zbar-python3 to python3-zbar as per latest Python guidelines +- Use make_build and make_install macros * Mon Aug 01 2022 Gwyn Ciesla - 0.23.90-4 - Only build Java on supported platforms.