diff options
author | Chanho Park <chanho61.park@samsung.com> | 2014-08-20 13:32:27 +0900 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-08-20 13:42:28 +0900 |
commit | 0df11a70c77eac1cd2c1534e55befe7c4316f995 (patch) | |
tree | 658523caaf78b462e9eb4a044d2a038b975f4462 | |
parent | 1be8d9a8d0522d67bad78572c6f218d4f5ac9f82 (diff) | |
download | rpmlint-mini-0df11a70c77eac1cd2c1534e55befe7c4316f995.tar.gz rpmlint-mini-0df11a70c77eac1cd2c1534e55befe7c4316f995.tar.bz2 rpmlint-mini-0df11a70c77eac1cd2c1534e55befe7c4316f995.zip |
update rpmlint-1.5 versionHEADtizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasetizen_3.0.m14.3_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.053809submit/tizen_mobile/20141120.050301submit/tizen_mobile/20141120.000000submit/tizen_base/20151223.111112submit/tizen/20141104.115609submit/tizen/20141104.115426submit/tizen/20140828.102307accepted/tizen/mobile/20141120.014959accepted/tizen/ivi/20140904.073531accepted/tizen/common/20141104.235422accepted/tizen/common/20141104.144802accepted/tizen/common/20140829.173213accepted/tizen/base/20151223.052338tizen_3.0_ivitizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.m14.3_ivitizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commontizenaccepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_commonaccepted/tizen_3.0_iviaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_common
This patch updates rpmlint-1.5 version from openSUSE contributions.
This updates will be required since we upgrade the python 2.7.8 version.
Change-Id: I2f42be85e17856156dbcc90bdbe8ea3ae08fcc83
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
-rw-r--r-- | packaging/desktop-file-utils-0.20.tar.xz | bin | 124388 -> 0 bytes | |||
-rw-r--r-- | packaging/desktop-file-utils-0.22.tar.xz | bin | 0 -> 131028 bytes | |||
-rw-r--r-- | packaging/polkit-default-privs.config (renamed from polkit-default-privs.config) | 0 | ||||
-rw-r--r-- | packaging/rpmlint-deps.txt | 64 | ||||
-rw-r--r-- | packaging/rpmlint-mini.changes | 3 | ||||
-rw-r--r-- | packaging/rpmlint-mini.spec | 22 | ||||
-rw-r--r-- | rpmlint-deps.txt | 243 | ||||
-rw-r--r-- | rpmlint-mini.config | 19 | ||||
-rw-r--r-- | rpmlint.wrapper | 11 |
9 files changed, 80 insertions, 282 deletions
diff --git a/packaging/desktop-file-utils-0.20.tar.xz b/packaging/desktop-file-utils-0.20.tar.xz Binary files differdeleted file mode 100644 index 8024519..0000000 --- a/packaging/desktop-file-utils-0.20.tar.xz +++ /dev/null diff --git a/packaging/desktop-file-utils-0.22.tar.xz b/packaging/desktop-file-utils-0.22.tar.xz Binary files differnew file mode 100644 index 0000000..d73b047 --- /dev/null +++ b/packaging/desktop-file-utils-0.22.tar.xz diff --git a/polkit-default-privs.config b/packaging/polkit-default-privs.config index 26b8e48..26b8e48 100644 --- a/polkit-default-privs.config +++ b/packaging/polkit-default-privs.config diff --git a/packaging/rpmlint-deps.txt b/packaging/rpmlint-deps.txt index d7d700d..daaee9e 100644 --- a/packaging/rpmlint-deps.txt +++ b/packaging/rpmlint-deps.txt @@ -13,6 +13,7 @@ collections.pyo commandsmodule.so commands.pyo commands.so +ConfigParser.pyo copy.pyo copy_regmodule.so copy_reg.pyo @@ -47,6 +48,7 @@ encodings/typesmodule.so encodings/types.pyo encodings/types.so encodings/utf_8.pyo +encodings/zlib_codec.pyo fcntl.so fnmatchmodule.so fnmatch.pyo @@ -78,6 +80,8 @@ lib-dynload/_ctypes.so lib-dynload/operator.so lib-dynload/pyexpat.so lib-dynload/rpmmodule.so +lib-dynload/rpm.pyo +lib-dynload/rpm.so lib-dynload/_sha256.so lib-dynload/_sha512.so lib-dynload/_sha.so @@ -152,6 +156,8 @@ re.pyo re.so rfc822.pyo rpmmodule.so +rpm.pyo +rpm.so select.so shutil.pyo sitecustomizemodule.so @@ -159,16 +165,73 @@ sitecustomize.pyo sitecustomize.so sitemodule.so site-packages +site-packages/construct/__init__.py +site-packages/construct/adapters.py +site-packages/construct/core.py +site-packages/construct/debug.py +site-packages/construct/formats/__init__.py +site-packages/construct/formats/data/__init__.py +site-packages/construct/formats/data/cap.py +site-packages/construct/formats/data/snoop.py +site-packages/construct/formats/executable/__init__.py +site-packages/construct/formats/executable/elf32.py +site-packages/construct/formats/executable/pe32.py +site-packages/construct/formats/filesystem/__init__.py +site-packages/construct/formats/filesystem/ext2.py +site-packages/construct/formats/filesystem/fat16.py +site-packages/construct/formats/filesystem/mbr.py +site-packages/construct/formats/graphics/__init__.py +site-packages/construct/formats/graphics/bmp.py +site-packages/construct/formats/graphics/emf.py +site-packages/construct/formats/graphics/gif.py +site-packages/construct/formats/graphics/png.py +site-packages/construct/formats/graphics/wmf.py +site-packages/construct/lib/__init__.py +site-packages/construct/lib/binary.py +site-packages/construct/lib/bitstream.py +site-packages/construct/lib/container.py +site-packages/construct/lib/expr.py +site-packages/construct/lib/hex.py +site-packages/construct/lib/py3compat.py +site-packages/construct/macros.py +site-packages/construct/protocols/__init__.py +site-packages/construct/protocols/application/__init__.py +site-packages/construct/protocols/application/dns.py +site-packages/construct/protocols/ipstack.py +site-packages/construct/protocols/layer2/__init__.py +site-packages/construct/protocols/layer2/arp.py +site-packages/construct/protocols/layer2/ethernet.py +site-packages/construct/protocols/layer2/mtp2.py +site-packages/construct/protocols/layer3/__init__.py +site-packages/construct/protocols/layer3/dhcpv4.py +site-packages/construct/protocols/layer3/dhcpv6.py +site-packages/construct/protocols/layer3/icmpv4.py +site-packages/construct/protocols/layer3/igmpv2.py +site-packages/construct/protocols/layer3/ipv4.py +site-packages/construct/protocols/layer3/ipv6.py +site-packages/construct/protocols/layer3/mtp3.py +site-packages/construct/protocols/layer4/__init__.py +site-packages/construct/protocols/layer4/isup.py +site-packages/construct/protocols/layer4/tcp.py +site-packages/construct/protocols/layer4/udp.py +site-packages/construct/version.py +site-packages/pybeam/__init__.py +site-packages/pybeam/beam_construct.py +site-packages/pybeam/beam_file.py +site-packages/pybeam/eetf_construct.py +site-packages/pybeam/erlang_types.py site-packages/rpm/__init__module.so site-packages/rpm/__init__.pyo site-packages/rpm/__init__.py site-packages/rpm/__init__.so site-packages/rpm/_rpmmodule.so +site-packages/rpm/_rpm.so site-packages/rpm/transaction.pyo site-packages/rpm/transaction.py site-packages/sitecustomizemodule.so site-packages/sitecustomize.pyo site-packages/sitecustomize.so +site-packages/six.py site.pyo site.so socket.pyo @@ -200,6 +263,7 @@ struct.so _strptime.pyo subprocess.pyo sysconfig.pyo +_sysconfigdata.pyo tempfile.pyo textwrapmodule.so textwrap.pyo diff --git a/packaging/rpmlint-mini.changes b/packaging/rpmlint-mini.changes index d543d46..215d3bb 100644 --- a/packaging/rpmlint-mini.changes +++ b/packaging/rpmlint-mini.changes @@ -1,3 +1,6 @@ +* Wed Aug 20 2014 Chanho Park <chanho61.park@samsung.com> submit/tizen_common/20140814.021031-1-gf038ca0 +- update rpmlint-1.5 version + * Wed May 29 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130509.184106@eb8f778 - Version is 1.4 diff --git a/packaging/rpmlint-mini.spec b/packaging/rpmlint-mini.spec index 46fbf0c..1db08d5 100644 --- a/packaging/rpmlint-mini.spec +++ b/packaging/rpmlint-mini.spec @@ -15,14 +15,15 @@ Requires: cpio Summary: Rpm correctness checker License: GPL-2.0+ Group: System/Packages -Version: 1.4 +Version: 1.5 Release: 0 Url: http://rpmlint.zarb.org/ Source: %{name}-%{version}.tar.bz2 -Source99: desktop-file-utils-0.20.tar.xz +Source99: desktop-file-utils-0.22.tar.xz Source100: rpmlint-deps.txt Source101: rpmlint.wrapper Source102: rpmlint-mini.config +Source103: polkit-default-privs.config Source1000: rpmlint-mini.rpmlintrc Source1001: rpmlint-mini.manifest @@ -33,17 +34,17 @@ source packages can be checked. %prep %setup -q -b 99 cp %{SOURCE1001} . -cd ../desktop-file-utils-0.20 +cd ../desktop-file-utils-0.22 %build -cd ../desktop-file-utils-0.20 +cd ../desktop-file-utils-0.22 %configure pushd src make desktop-file-validate V=1 DESKTOP_FILE_UTILS_LIBS="%{_libdir}/libglib-2.0.a -lpthread -lrt" popd %install -cd ../desktop-file-utils-0.20 +cd ../desktop-file-utils-0.22 pwd # test if the rpmlint works at all set +e @@ -56,7 +57,7 @@ install -m 755 -D src/desktop-file-validate $RPM_BUILD_ROOT/opt/testing/bin/desk cp -a /usr/share/rpmlint/*.py $RPM_BUILD_ROOT/opt/testing/share/rpmlint # install config files install -d -m 755 $RPM_BUILD_ROOT/opt/testing/share/rpmlint/mini -for i in /etc/rpmlint/{licenses,rpmgroups,pie}.config; do +for i in /etc/rpmlint/{licenses,rpmgroups,pie}.config "%{SOURCE103}"; do cp $i $RPM_BUILD_ROOT/opt/testing/share/rpmlint/mini done install -m 644 -D /usr/share/rpmlint/config $RPM_BUILD_ROOT/opt/testing/share/rpmlint/config @@ -68,7 +69,10 @@ install -m 644 -D /usr/include/python%{py_ver}/pyconfig.h $RPM_BUILD_ROOT/opt/te # cd %{py_libdir} for f in $(<%{SOURCE100}); do - echo $f + find -path "*/$f" -exec install -D {} $RPM_BUILD_ROOT/opt/testing/%{_lib}/python%{py_ver}/{} \; +done +cd /usr/lib/python%{py_ver} +for f in $(<%{SOURCE100}); do find -path "*/$f" -exec install -D {} $RPM_BUILD_ROOT/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 @@ -81,8 +85,8 @@ 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 python %py_libdir/py_compile.py *.py -rm *.py +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 diff --git a/rpmlint-deps.txt b/rpmlint-deps.txt deleted file mode 100644 index d4a9463..0000000 --- a/rpmlint-deps.txt +++ /dev/null @@ -1,243 +0,0 @@ -_abcoll.pyo -abc.pyo -base64.pyo -binasciimodule.so -binascii.pyo -binascii.so -bisect.pyo -calendar.pyo -codecsmodule.so -codecs.pyo -codecs.so -collections.pyo -commandsmodule.so -commands.pyo -commands.so -copy.pyo -copy_regmodule.so -copy_reg.pyo -copy_reg.so -ctypes/__init__.pyo -ctypes/_endian.pyo -ctypes/util.pyo -ctypes/wintypes.pyo -cStringIOmodule.so -cStringIO.pyo -cStringIO.so -datetime.so -encodings/aliasesmodule.so -encodings/aliases.pyo -encodings/aliases.so -encodings/asciimodule.so -encodings/ascii.pyo -encodings/ascii.so -encodings/codecsmodule.so -encodings/codecs.pyo -encodings/codecs.so -encodings/encodingsmodule.so -encodings/encodings.pyo -encodings/encodings.so -encodings/__init__module.so -encodings/__init__.pyo -encodings/__init__.so -encodings/iso8859_1.pyo -encodings/latin_1.pyo -encodings/string_escape.pyo -encodings/typesmodule.so -encodings/types.pyo -encodings/types.so -encodings/utf_8.pyo -fcntl.so -fnmatchmodule.so -fnmatch.pyo -fnmatch.so -functools.pyo -__future__.pyo -genericpath.pyo -getoptmodule.so -getopt.pyo -getopt.so -globmodule.so -glob.pyo -glob.so -hashlib.pyo -heapq.pyo -httplib.pyo -io.pyo -keyword.pyo -lib-dynload/array.so -lib-dynload/binascii.so -lib-dynload/_bisect.so -lib-dynload/_collections.so -lib-dynload/cStringIO.so -lib-dynload/_functools.so -lib-dynload/_io.so -lib-dynload/_locale.so -lib-dynload/_md5.so -lib-dynload/_ctypes.so -lib-dynload/operator.so -lib-dynload/pyexpat.so -lib-dynload/rpmmodule.so -lib-dynload/rpm.pyo -lib-dynload/rpm.so -lib-dynload/_sha256.so -lib-dynload/_sha512.so -lib-dynload/_sha.so -lib-dynload/sitecustomizemodule.so -lib-dynload/sitecustomize.pyo -lib-dynload/sitecustomize.so -lib-dynload/_socket.so -lib-dynload/strop.so -lib-dynload/_struct.so -lib-dynload/time.so -lib-dynload/zlib.so -lib-dynload/itertools.so -lib-dynload/_weakref.so -linecachemodule.so -linecache.pyo -linecache.so -_localemodule.so -localemodule.so -_locale.pyo -locale.pyo -_locale.so -locale.so -Makefile -math.so -md5.pyo -mimetools.pyo -operatormodule.so -operator.pyo -operator.so -osmodule.so -os.pyo -os.so -pickle.pyo -plat-linux2/binasciimodule.so -plat-linux2/binascii.pyo -plat-linux2/binascii.so -plat-linux2/cStringIOmodule.so -plat-linux2/cStringIO.pyo -plat-linux2/cStringIO.so -plat-linux2/_localemodule.so -plat-linux2/_locale.pyo -plat-linux2/_locale.so -plat-linux2/operatormodule.so -plat-linux2/operator.pyo -plat-linux2/operator.so -plat-linux2/rpmmodule.so -plat-linux2/rpm.pyo -plat-linux2/rpm.so -plat-linux2/sitecustomizemodule.so -plat-linux2/sitecustomize.pyo -plat-linux2/sitecustomize.so -plat-linux2/stropmodule.so -plat-linux2/strop.pyo -plat-linux2/strop.so -plat-linux2/_structmodule.so -plat-linux2/_struct.pyo -plat-linux2/_struct.so -plat-linux2/timemodule.so -plat-linux2/time.pyo -plat-linux2/time.so -plat-linux2/zlibmodule.so -plat-linux2/zlib.pyo -plat-linux2/zlib.so -posixpathmodule.so -posixpath.pyo -posixpath.so -pyconfig.h -random.pyo -_random.so -remodule.so -re.pyo -re.so -rfc822.pyo -rpmmodule.so -rpm.pyo -rpm.so -select.so -shutil.pyo -sitecustomizemodule.so -sitecustomize.pyo -sitecustomize.so -sitemodule.so -site-packages -site-packages/rpm/__init__module.so -site-packages/rpm/__init__.pyo -site-packages/rpm/__init__.so -site-packages/rpm/_rpmmodule.so -site-packages/rpm/_rpm.so -site-packages/rpm/transaction.pyo -site-packages/sitecustomizemodule.so -site-packages/sitecustomize.pyo -site-packages/sitecustomize.so -site.pyo -site.so -socket.pyo -sre_compilemodule.so -sre_compile.pyo -sre_compile.so -sre_constantsmodule.so -sre_constants.pyo -sre_constants.so -sre_parsemodule.so -sre_parse.pyo -sre_parse.so -statmodule.so -stat.pyo -stat.so -StringIO.pyo -stringmodule.so -string.pyo -string.so -stropmodule.so -strop.pyo -strop.so -_structmodule.so -structmodule.so -_struct.pyo -struct.pyo -_struct.so -struct.so -_strptime.pyo -subprocess.pyo -sysconfig.pyo -tempfile.pyo -textwrapmodule.so -textwrap.pyo -textwrap.so -timemodule.so -time.pyo -time.so -traceback.pyo -typesmodule.so -types.pyo -types.so -urllib2.pyo -urllib.pyo -urlparse.pyo -UserDictmodule.so -UserDict.pyo -UserDict.so -warningsmodule.so -warnings.pyo -warnings.so -weakref.pyo -_weakrefset.pyo -xml/dom/domreg.pyo -xml/dom/expatbuilder.pyo -xml/dom/__init__.pyo -xml/dom/minicompat.pyo -xml/dom/minidom.pyo -xml/dom/NodeFilter.pyo -xml/dom/xmlbuilder.pyo -xml/__init__.pyo -xml/parsers/expat.pyo -xml/parsers/__init__.pyo -zipfilemodule.so -zipfile.pyo -zipfile.so -zlibmodule.so -zlib.pyo -zlib.so diff --git a/rpmlint-mini.config b/rpmlint-mini.config deleted file mode 100644 index c3c746c..0000000 --- a/rpmlint-mini.config +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/python - -import os, glob, Pkg - -configs = [ '/opt/testing/share/rpmlint/config' ] -if os.environ.get("RPMLINT_MINI_CONFIG", None): - configs += os.environ.get("RPMLINT_MINI_CONFIG", '').split(' ') -else: - configs += glob.glob("/home/abuild/rpmbuild/SOURCES/*rpmlintrc") - configs += glob.glob("/usr/src/packages/SOURCES/*rpmlintrc") -configs += glob.glob('/opt/testing/share/rpmlint/mini/*.config') - -for f in configs: - try: - execfile(f) - except IOError: - pass - except Exception, E: - Pkg.warn('(none): W: error loading %s, skipping: %s' % (f, E)) diff --git a/rpmlint.wrapper b/rpmlint.wrapper deleted file mode 100644 index 23705b1..0000000 --- a/rpmlint.wrapper +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -if test -d /opt/testing/lib64; then - LD_LIBRARY_PATH=/opt/testing/lib64 -else - LD_LIBRARY_PATH=/opt/testing/lib -fi -PATH="/opt/testing/bin:$PATH" -rpmlintdir="/opt/testing/share/rpmlint" -PYTHONPATH="$rpmlintdir" -export PYTHONPATH LD_LIBRARY_PATH -exec /opt/testing/bin/python -tt -u -O "$rpmlintdir"/rpmlint.pyo -C "$rpmlintdir" -f "$rpmlintdir"/rpmlint-mini.config "$@" |