From 8170b0da7c11ab233424fe465f780fe2b8166b72 Mon Sep 17 00:00:00 2001 From: jiabinhe Date: Fri, 29 Nov 2024 11:12:13 +0800 Subject: [PATCH] ww48 release Signed-off-by: jiabinhe --- rpm/build_rpm.sh | 1 + rpm/icamerasrc.spec | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rpm/build_rpm.sh b/rpm/build_rpm.sh index 52fb460..41eec52 100755 --- a/rpm/build_rpm.sh +++ b/rpm/build_rpm.sh @@ -70,6 +70,7 @@ rpmbuild --define "_buildshell /bin/bash" \ --define "_tmppath ${tempdir}/tmp" \ --define "version ${rpm_version}" \ --define "release ${rpm_release}" \ + --define "libdir ${LIBDIR}" \ -bb "$(dirname $0)"/icamerasrc.spec | tee "$tempdir/rpmbuild.log" # Copy rpm to source directory. diff --git a/rpm/icamerasrc.spec b/rpm/icamerasrc.spec index 1031f0f..933bd0b 100644 --- a/rpm/icamerasrc.spec +++ b/rpm/icamerasrc.spec @@ -47,7 +47,7 @@ Version: %{version} Release: %{release} License: LGPL Group: Development/Tools -Prefix: /usr/lib/gstreamer-1.0 +Prefix: %{libdir}/gstreamer-1.0 BuildRoot: %(mktemp -ud %{_builddir}/%{name}-%{version}-%{release}-XXXXXX) %description Linux camera src. @@ -57,20 +57,20 @@ Linux camera src. %install rm -rf %{buildroot} -mkdir -p %{buildroot}/usr/lib/gstreamer-1.0 -mkdir -p %{buildroot}/usr/lib/pkgconfig +mkdir -p %{buildroot}/%{libdir}/gstreamer-1.0 +mkdir -p %{buildroot}/%{libdir}/pkgconfig mkdir -p %{buildroot}/usr/include/icamerasrc/interfaces mkdir -p %{buildroot}/usr/include/gstreamer-1.0/gst -cp -v %{_srcdir}/src/.libs/*.so* %{buildroot}/usr/lib/gstreamer-1.0 -cp -v %{_srcdir}/src/.libs/*.la %{buildroot}/usr/lib/gstreamer-1.0 -cp -v %{_srcdir}/src/interfaces/.libs/*.so* %{buildroot}/usr/lib/ -cp -v %{_srcdir}/src/interfaces/.libs/*.la %{buildroot}/usr/lib/ +cp -v %{_srcdir}/src/.libs/*.so* %{buildroot}/%{libdir}/gstreamer-1.0 +cp -v %{_srcdir}/src/.libs/*.la %{buildroot}/%{libdir}/gstreamer-1.0 +cp -v %{_srcdir}/src/interfaces/.libs/*.so* %{buildroot}/%{libdir}/ +cp -v %{_srcdir}/src/interfaces/.libs/*.la %{buildroot}/%{libdir}/ cp -v %{_srcdir}/src/interfaces/*.h %{buildroot}/usr/include/icamerasrc/interfaces cp -v %{_srcdir}/src/interfaces/*.h %{buildroot}/usr/include/gstreamer-1.0/gst cp -v %{_srcdir}/src/gst/gstcamerasrcmeta.h %{buildroot}/usr/include/gstreamer-1.0/gst -sed 's/^prefix=\/.\+$/prefix=\/usr/' %{_srcdir}/libgsticamerasrc.pc > %{buildroot}/usr/lib/pkgconfig/libgsticamerasrc.pc +sed 's/^prefix=\/.\+$/prefix=\/usr/' %{_srcdir}/libgsticamerasrc.pc > %{buildroot}/%{libdir}/pkgconfig/libgsticamerasrc.pc %files -/usr/lib/ +%{libdir}/ /usr/include/