Merge pull request #60 from onceforall/icamerasrc_slim_api

ww48 release
intel · Nov 29, 2024 · ee85264 · ee85264
2 parents 0019b5d + 8170b0d
commit ee85264
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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/