- rebuild against rpmlint 1.10 update

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint-mini?expand=0&rev=64
This commit is contained in:
Dirk Mueller 2017-09-28 12:33:03 +00:00 committed by Git OBS Bridge
parent 06fbc93fce
commit 5931a34a2b
3 changed files with 62 additions and 62 deletions

View File

@ -13,6 +13,7 @@ collections.pyo
commandsmodule.so
commands.pyo
commands.so
contextlib.pyo
ConfigParser.pyo
copy.pyo
copy_regmodule.so

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 28 12:32:54 UTC 2017 - dmueller@suse.com
- rebuild against rpmlint 1.10
-------------------------------------------------------------------
Fri May 26 07:10:46 UTC 2017 - matwey.kornilov@gmail.com

View File

@ -14,31 +14,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# icecream 0
Name: rpmlint-mini
BuildRequires: glib2-devel
BuildRequires: glib2-devel-static
BuildRequires: pkg-config
BuildRequires: python-magic
BuildRequires: python-xml
BuildRequires: rpm-python
BuildRequires: rpmlint
#!BuildIgnore: rpmlint-mini
# need to fetch the file from there
BuildRequires: checkbashisms
BuildRequires: dash
BuildRequires: libtool
BuildRequires: polkit-default-privs
Requires: cpio
Version: 1.10
Release: 0
Summary: Rpm correctness checker
License: GPL-2.0+
Group: System/Packages
Version: 1.8
Release: 0
Url: http://rpmlint.zarb.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: desktop-file-utils-0.23.tar.xz
Source100: rpmlint-deps.txt
Source101: rpmlint.wrapper
@ -48,6 +32,20 @@ Source104: appdata_checker.config
Source1000: rpmlint-mini.rpmlintrc
# adjusts python deps for Leap 42.3
Patch0: rpmlint-deps.patch
# need to fetch the file from there
BuildRequires: checkbashisms
BuildRequires: dash
BuildRequires: glib2-devel
BuildRequires: glib2-devel-static
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: polkit-default-privs
BuildRequires: python-magic
BuildRequires: python-xml
BuildRequires: rpm-python
BuildRequires: rpmlint
#!BuildIgnore: rpmlint-mini
Requires: cpio
%description
Rpmlint is a tool to check common errors on rpm packages. Binary and
@ -57,68 +55,68 @@ source packages can be checked.
%setup -q -n desktop-file-utils-0.23
[[ -r COPYING ]]
%if 0%{?sle_version}
patch -d %{_sourcedir} -p0 < %{P:0}
patch -d %{_sourcedir} < %{PATCH0}
%endif
%build
%configure
pushd src
make desktop-file-validate V=1 DESKTOP_FILE_UTILS_LIBS="%{_libdir}/libglib-2.0.a -lpthread -lrt"
make %{?_smp_mflags} desktop-file-validate V=1 DESKTOP_FILE_UTILS_LIBS="%{_libdir}/libglib-2.0.a -lpthread -lrt"
popd
%install
# test if the rpmlint works at all
set +e
/usr/bin/rpmlint rpmlint
%{_bindir}/rpmlint rpmlint
test $? -gt 0 -a $? -lt 60 && exit 1
set -e
# okay, lets put it together
mkdir -p $RPM_BUILD_ROOT/opt/testing/share/rpmlint
install -m 755 -D src/desktop-file-validate $RPM_BUILD_ROOT/opt/testing/bin/desktop-file-validate
cp -a /usr/bin/dash /usr/bin/checkbashisms $RPM_BUILD_ROOT/opt/testing/bin
mkdir -p $RPM_BUILD_ROOT/opt/testing/%{_lib}
cp -a %_libdir/libedit.so.0* $RPM_BUILD_ROOT/opt/testing/%{_lib}
cp -a /usr/share/rpmlint/*.py $RPM_BUILD_ROOT/opt/testing/share/rpmlint
mkdir -p %{buildroot}/opt/testing/share/rpmlint
install -m 755 -D src/desktop-file-validate %{buildroot}/opt/testing/bin/desktop-file-validate
cp -a %{_bindir}/dash %{_bindir}/checkbashisms %{buildroot}/opt/testing/bin
mkdir -p %{buildroot}/opt/testing/%{_lib}
cp -a %{_libdir}/libedit.so.0* %{buildroot}/opt/testing/%{_lib}
cp -a %{_datadir}/rpmlint/*.py %{buildroot}/opt/testing/share/rpmlint
# install config files
install -d -m 755 $RPM_BUILD_ROOT/opt/testing/share/rpmlint/mini
for i in /etc/rpmlint/{pie,licenses}.config "%{SOURCE103}" "%{SOURCE104}"; do
cp $i $RPM_BUILD_ROOT/opt/testing/share/rpmlint/mini
install -d -m 755 %{buildroot}/opt/testing/share/rpmlint/mini
for i in %{_sysconfdir}/rpmlint/{pie,licenses}.config "%{SOURCE103}" "%{SOURCE104}"; do
cp $i %{buildroot}/opt/testing/share/rpmlint/mini
done
install -m 644 -D /usr/share/rpmlint/config $RPM_BUILD_ROOT/opt/testing/share/rpmlint/config
install -m 644 "%{SOURCE102}" $RPM_BUILD_ROOT/opt/testing/share/rpmlint
install -m 644 -D %{_datadir}/rpmlint/config %{buildroot}/opt/testing/share/rpmlint/config
install -m 644 "%{SOURCE102}" %{buildroot}/opt/testing/share/rpmlint
# extra data
install -m 755 -d $RPM_BUILD_ROOT/opt/testing/share/rpmlint/data
install -m 644 /etc/polkit-default-privs.standard $RPM_BUILD_ROOT/opt/testing/share/rpmlint/data
install -m 644 -D /usr/include/python%{py_ver}/pyconfig.h $RPM_BUILD_ROOT/opt/testing/include/python%{py_ver}/pyconfig.h
install -m 755 -d %{buildroot}/opt/testing/share/rpmlint/data
install -m 644 %{_sysconfdir}/polkit-default-privs.standard %{buildroot}/opt/testing/share/rpmlint/data
install -m 644 -D %{_includedir}/python%{py_ver}/pyconfig.h %{buildroot}/opt/testing/include/python%{py_ver}/pyconfig.h
#
cd %{py_libdir}
for f in $(<%{SOURCE100}); do
find -path "*/$f" -exec install -D {} $RPM_BUILD_ROOT/opt/testing/%{_lib}/python%{py_ver}/{} \;
find -path "*/$f" -exec install -D {} %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/{} \;
done
cd /usr/lib/python%{py_ver}
cd %{_prefix}/lib/python%{py_ver}
for f in $(<%{SOURCE100}); do
find -path "*/$f" -exec install -D {} $RPM_BUILD_ROOT/opt/testing/%{_lib}/python%{py_ver}/{} \;
find -path "*/$f" -exec install -D {} %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/{} \;
done
install -m 644 /usr/lib/python%{py_ver}/site-packages/magic.py $RPM_BUILD_ROOT/opt/testing/%{_lib}/python%{py_ver}/site-packages/magic.py
install -D /usr/bin/python $RPM_BUILD_ROOT/opt/testing/bin/python
cp -a %_libdir/libmagic.so.* $RPM_BUILD_ROOT/opt/testing/%{_lib}
cp -a %_datadir/misc/magic* $RPM_BUILD_ROOT/opt/testing/share
cp -a %_libdir/libpython%{py_ver}.so.* $RPM_BUILD_ROOT/opt/testing/%{_lib}
cp -a %_bindir/rpmlint $RPM_BUILD_ROOT/opt/testing/share/rpmlint/rpmlint.py
pushd $RPM_BUILD_ROOT/opt/testing/share/rpmlint
PYTHONOPTIMIZE=1 python %py_libdir/py_compile.py *.py
install -m 644 %{_prefix}/lib/python%{py_ver}/site-packages/magic.py %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/site-packages/magic.py
install -D %{_bindir}/python %{buildroot}/opt/testing/bin/python
cp -a %{_libdir}/libmagic.so.* %{buildroot}/opt/testing/%{_lib}
cp -a %{_datadir}/misc/magic* %{buildroot}/opt/testing/share
cp -a %{_libdir}/libpython%{py_ver}.so.* %{buildroot}/opt/testing/%{_lib}
cp -a %{_bindir}/rpmlint %{buildroot}/opt/testing/share/rpmlint/rpmlint.py
pushd %{buildroot}/opt/testing/share/rpmlint
PYTHONOPTIMIZE=1 python %{py_libdir}/py_compile.py *.py
rm *.py
popd
pushd $RPM_BUILD_ROOT/opt/testing/%{_lib}/python%{py_ver}/site-packages/
PYTHONOPTIMIZE=1 find -name \*.py -exec python %py_libdir/py_compile.py {} \;
pushd %{buildroot}/opt/testing/%{_lib}/python%{py_ver}/site-packages/
PYTHONOPTIMIZE=1 find -name \*.py -exec python %{py_libdir}/py_compile.py {} \;
find -name \*.py -delete
popd
rm -rf $RPM_BUILD_ROOT/{usr,etc}
rm -f $RPM_BUILD_ROOT/opt/testing/bin/rpmlint
install -m 755 -D %{SOURCE101} $RPM_BUILD_ROOT/opt/testing/bin/rpmlint
rm -rf %{buildroot}/{usr,etc}
rm -f %{buildroot}/opt/testing/bin/rpmlint
install -m 755 -D %{SOURCE101} %{buildroot}/opt/testing/bin/rpmlint
# hackatlon
%define my_requires %{_builddir}/%{?buildsubdir}/%{name}-requires
cat << EOF > %my_requires
cat << EOF > %{my_requires}
cat - > file.list
%{__find_requires} < file.list > requires.list
%{__find_provides} < file.list > provides.list
@ -129,22 +127,18 @@ done < provides.list
cat requires.list
rm -f requires.list provides.list file.list
EOF
chmod +x %my_requires
chmod +x %{my_requires}
%define _use_internal_dependency_generator 0
%define __find_requires %my_requires
%define __find_provides %nil
%define __find_requires %{my_requires}
%define __find_provides %{nil}
# final run check to detect python dep changes
LD_LIBRARY_PATH=$RPM_BUILD_ROOT/opt/testing/%_lib
PYTHONPATH=$RPM_BUILD_ROOT/opt/testing/share/rpmlint
LD_LIBRARY_PATH=%{buildroot}/opt/testing/%{_lib}
PYTHONPATH=%{buildroot}/opt/testing/share/rpmlint
export PYTHONPATH LD_LIBRARY_PATH
$RPM_BUILD_ROOT/opt/testing/bin/python -tt -u -O $RPM_BUILD_ROOT/opt/testing/share/rpmlint/rpmlint.pyo --help || exit 1
%{buildroot}/opt/testing/bin/python -tt -u -O %{buildroot}/opt/testing/share/rpmlint/rpmlint.pyo --help || exit 1
echo ".. ok"
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,0755)
/opt/testing
%doc COPYING