Skip to content

Commit ee85264

Browse files
authored
Merge pull request #60 from onceforall/icamerasrc_slim_api
ww48 release
2 parents 0019b5d + 8170b0d commit ee85264

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

rpm/build_rpm.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ rpmbuild --define "_buildshell /bin/bash" \
7070
--define "_tmppath ${tempdir}/tmp" \
7171
--define "version ${rpm_version}" \
7272
--define "release ${rpm_release}" \
73+
--define "libdir ${LIBDIR}" \
7374
-bb "$(dirname $0)"/icamerasrc.spec | tee "$tempdir/rpmbuild.log"
7475

7576
# Copy rpm to source directory.

rpm/icamerasrc.spec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Version: %{version}
4747
Release: %{release}
4848
License: LGPL
4949
Group: Development/Tools
50-
Prefix: /usr/lib/gstreamer-1.0
50+
Prefix: %{libdir}/gstreamer-1.0
5151
BuildRoot: %(mktemp -ud %{_builddir}/%{name}-%{version}-%{release}-XXXXXX)
5252
%description
5353
Linux camera src.
@@ -57,20 +57,20 @@ Linux camera src.
5757

5858
%install
5959
rm -rf %{buildroot}
60-
mkdir -p %{buildroot}/usr/lib/gstreamer-1.0
61-
mkdir -p %{buildroot}/usr/lib/pkgconfig
60+
mkdir -p %{buildroot}/%{libdir}/gstreamer-1.0
61+
mkdir -p %{buildroot}/%{libdir}/pkgconfig
6262
mkdir -p %{buildroot}/usr/include/icamerasrc/interfaces
6363
mkdir -p %{buildroot}/usr/include/gstreamer-1.0/gst
6464

65-
cp -v %{_srcdir}/src/.libs/*.so* %{buildroot}/usr/lib/gstreamer-1.0
66-
cp -v %{_srcdir}/src/.libs/*.la %{buildroot}/usr/lib/gstreamer-1.0
67-
cp -v %{_srcdir}/src/interfaces/.libs/*.so* %{buildroot}/usr/lib/
68-
cp -v %{_srcdir}/src/interfaces/.libs/*.la %{buildroot}/usr/lib/
65+
cp -v %{_srcdir}/src/.libs/*.so* %{buildroot}/%{libdir}/gstreamer-1.0
66+
cp -v %{_srcdir}/src/.libs/*.la %{buildroot}/%{libdir}/gstreamer-1.0
67+
cp -v %{_srcdir}/src/interfaces/.libs/*.so* %{buildroot}/%{libdir}/
68+
cp -v %{_srcdir}/src/interfaces/.libs/*.la %{buildroot}/%{libdir}/
6969
cp -v %{_srcdir}/src/interfaces/*.h %{buildroot}/usr/include/icamerasrc/interfaces
7070
cp -v %{_srcdir}/src/interfaces/*.h %{buildroot}/usr/include/gstreamer-1.0/gst
7171
cp -v %{_srcdir}/src/gst/gstcamerasrcmeta.h %{buildroot}/usr/include/gstreamer-1.0/gst
72-
sed 's/^prefix=\/.\+$/prefix=\/usr/' %{_srcdir}/libgsticamerasrc.pc > %{buildroot}/usr/lib/pkgconfig/libgsticamerasrc.pc
72+
sed 's/^prefix=\/.\+$/prefix=\/usr/' %{_srcdir}/libgsticamerasrc.pc > %{buildroot}/%{libdir}/pkgconfig/libgsticamerasrc.pc
7373

7474
%files
75-
/usr/lib/
75+
%{libdir}/
7676
/usr/include/

0 commit comments

Comments
 (0)