Accepting request 1002662 from devel:openSUSE:Factory:rpmlint
- Remove extra %make_build arguments. - Copy libraries required by _rpm.cpython to the testing root (boo#1203093). OBS-URL: https://build.opensuse.org/request/show/1002662 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint-mini?expand=0&rev=115
This commit is contained in:
commit
3ffdab30e3
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 12 07:27:17 UTC 2022 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Remove extra %make_build arguments.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 5 16:50:16 UTC 2022 - Christopher Yeleighton <giecrilj@stegny.2a.pl>
|
||||||
|
|
||||||
|
- Copy libraries required by _rpm.cpython to the testing root (boo#1203093).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 25 08:02:16 UTC 2022 - Martin Liška <mliska@suse.cz>
|
Mon Jul 25 08:02:16 UTC 2022 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -62,13 +62,13 @@ source packages can be checked.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n desktop-file-utils-0.24
|
%setup -q -n desktop-file-utils-0.24
|
||||||
[ -r COPYING ]
|
<COPYING
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
pushd src
|
cd src
|
||||||
make %{?_smp_mflags} desktop-file-validate V=1 DESKTOP_FILE_UTILS_LIBS="%{_libdir}/libglib-2.0.a -lpthread -lrt"
|
%make_build desktop-file-validate \
|
||||||
popd
|
DESKTOP_FILE_UTILS_LIBS="%{_libdir}/libglib-2.0.a -lpthread -lrt"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# Check that rpmlint works at all, with the primary flavor
|
# Check that rpmlint works at all, with the primary flavor
|
||||||
@ -100,7 +100,13 @@ for file in $(cat %{SOURCE1}); do
|
|||||||
install -D -m 644 $exp %{buildroot}/opt/testing/lib/python%{python_version}/$exp
|
install -D -m 644 $exp %{buildroot}/opt/testing/lib/python%{python_version}/$exp
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
cp -a %{python_sitearch}/{rpm,zstandard}* %{buildroot}/opt/testing/lib/python%{python_version}/site-packages
|
ldd %{python_sitearch}/rpm/*.so | while read L T R A
|
||||||
|
do cp '-aLt%{buildroot}/opt/testing/lib' "${R}" || # is it a virtual library?
|
||||||
|
! <"${R}" || # it is a real library and still could not be copied
|
||||||
|
false # this is necessary to really fail
|
||||||
|
done
|
||||||
|
cp -a %{python_sitearch}/{rpm,zstandard}* \
|
||||||
|
%{buildroot}/opt/testing/lib/python%{python_version}/site-packages
|
||||||
cp -a %{python_sitelib} %{buildroot}/opt/testing/lib/python%{python_version}
|
cp -a %{python_sitelib} %{buildroot}/opt/testing/lib/python%{python_version}
|
||||||
cp -a %{python3_sitelib}/rpmlint* %{buildroot}/opt/testing/lib/python%{python_version}
|
cp -a %{python3_sitelib}/rpmlint* %{buildroot}/opt/testing/lib/python%{python_version}
|
||||||
cp -a %{_libdir}/libpython%{python_version}*.so.* %{buildroot}/opt/testing/lib
|
cp -a %{_libdir}/libpython%{python_version}*.so.* %{buildroot}/opt/testing/lib
|
||||||
@ -125,10 +131,11 @@ install -m 755 -D %{SOURCE2} %{buildroot}/opt/testing/bin/rpmlint
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
# check rpmlint-mini with the custom flavor
|
# check rpmlint-mini with the custom flavor
|
||||||
|
%make_build check
|
||||||
sed -e 's|/opt|%{buildroot}/opt|' -e 's|exec|%my_python|' %{buildroot}/opt/testing/bin/rpmlint > myrpmlint
|
sed -e 's|/opt|%{buildroot}/opt|' -e 's|exec|%my_python|' %{buildroot}/opt/testing/bin/rpmlint > myrpmlint
|
||||||
chmod +x myrpmlint
|
chmod +x myrpmlint
|
||||||
set +e
|
set +e
|
||||||
./myrpmlint -i rpmlint
|
sh -x myrpmlint -i rpmlint
|
||||||
test $? -gt 0 -a $? -lt 60 && exit 1
|
test $? -gt 0 -a $? -lt 60 && exit 1
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user