Accepting request 19020 from Base:System
Copy from Base:System/rpmlint-mini based on submit request 19020 from user lnussel OBS-URL: https://build.opensuse.org/request/show/19020 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint-mini?expand=0&rev=25
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
9cc0367390
commit
4209b47a2a
@ -1,62 +1,66 @@
|
||||
--- Config.py 2006-07-10 23:11:14.000000000 +0200
|
||||
+++ Config.py 2007-06-05 01:10:16.000000000 +0200
|
||||
@@ -72,7 +72,7 @@
|
||||
Index: Config.py
|
||||
===================================================================
|
||||
--- Config.py.orig
|
||||
+++ Config.py
|
||||
@@ -75,7 +75,7 @@ def resetChecks():
|
||||
|
||||
# handle the list of directories to look for checks
|
||||
|
||||
-_dirs=["/usr/share/rpmlint"]
|
||||
+_dirs=["/opt/testing/share/rpmlint"]
|
||||
-_dirs = ["/usr/share/rpmlint"]
|
||||
+_dirs = ["/opt/testing/share/rpmlint"]
|
||||
|
||||
def addCheckDir(dir):
|
||||
global _dirs
|
||||
--- rpmlint.py 2007-03-15 20:49:31.000000000 +0100
|
||||
+++ rpmlint.py 2007-06-05 01:11:19.000000000 +0200
|
||||
@@ -180,7 +180,7 @@
|
||||
Index: rpmlint.py
|
||||
===================================================================
|
||||
--- rpmlint.py.orig
|
||||
+++ rpmlint.py
|
||||
@@ -226,7 +226,7 @@ except getopt.error, e:
|
||||
sys.exit(1)
|
||||
|
||||
# process options
|
||||
-checkdir='/usr/share/rpmlint'
|
||||
-checkdir = '/usr/share/rpmlint'
|
||||
+checkdir='/opt/testing/share/rpmlint'
|
||||
verbose=0
|
||||
extract_dir=None
|
||||
prof=0
|
||||
@@ -189,7 +189,8 @@
|
||||
info_error=0
|
||||
|
||||
checks = []
|
||||
verbose = 0
|
||||
extract_dir = None
|
||||
@@ -237,7 +237,7 @@ info_error = 0
|
||||
# load global config files
|
||||
-for f in ('/usr/share/rpmlint/config','/etc/rpmlint/config','/etc/rpmlint/factory.config'):
|
||||
+for f in ('/opt/testing/share/rpmlint/config',
|
||||
+ '/etc/rpmlint/config', '/etc/rpmlint/factory.config'):
|
||||
configs = glob.glob('/etc/rpmlint/*config')
|
||||
configs.sort()
|
||||
-configs.insert(0, '/usr/share/rpmlint/config')
|
||||
+configs.insert(0, '/opt/testing/share/rpmlint/config')
|
||||
for f in configs:
|
||||
try:
|
||||
execfile(f)
|
||||
except IOError:
|
||||
@@ -234,12 +235,19 @@
|
||||
@@ -279,12 +279,16 @@ for o in opt:
|
||||
print 'unknown option', o
|
||||
|
||||
# load user config file
|
||||
+userlist = [os.path.expanduser(conf_file)]
|
||||
try:
|
||||
-try:
|
||||
- execfile(os.path.expanduser(conf_file))
|
||||
-except IOError:
|
||||
+ userlist += [rc for rc in os.listdir("/usr/src/packages/SOURCES")
|
||||
+ if rc.endswith("rpmlintrc")]
|
||||
+except:
|
||||
pass
|
||||
- pass
|
||||
-except Exception,E:
|
||||
- sys.stderr.write('Error loading %s, skipping: %s\n' % (conf_file, E ))
|
||||
- sys.stderr.write('(none): W: error loading %s, skipping: %s\n' % (conf_file, E))
|
||||
+userlist = glob.glob("/usr/src/packages/SOURCES/*rpmlintrc")
|
||||
+userlist.insert(0, os.path.expanduser(conf_file))
|
||||
+
|
||||
+for f in userlist:
|
||||
+ try:
|
||||
+ execfile(os.path.join('/usr/src/packages/SOURCES', f))
|
||||
+ execfile(f)
|
||||
+ except IOError:
|
||||
+ pass
|
||||
+ except Exception,E:
|
||||
+ sys.stderr.write('Error loading %s, skipping: %s\n' % (conf_file, E ))
|
||||
+ sys.stderr.write('(none): W: error loading %s, skipping: %s\n' % (conf_file, E))
|
||||
|
||||
if not extract_dir:
|
||||
extract_dir=Config.getOption('ExtractDir', '/tmp')
|
||||
--- MenuXDGCheck.py
|
||||
extract_dir = Config.getOption('ExtractDir', tempfile.gettempdir())
|
||||
Index: MenuXDGCheck.py
|
||||
===================================================================
|
||||
--- MenuXDGCheck.py.orig
|
||||
+++ MenuXDGCheck.py
|
||||
@@ -21,7 +21,7 @@
|
||||
@@ -22,7 +22,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac
|
||||
|
||||
def check_file(self, pkg, filename):
|
||||
f = pkg.dirName() + filename
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 24 12:00:44 UTC 2009 - lnussel@suse.de
|
||||
|
||||
- fix build with rpmlint 0.87
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 23 15:01:16 CET 2009 - lnussel@suse.de
|
||||
|
||||
|
||||
@ -16,13 +16,16 @@
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
# icecream 0
|
||||
|
||||
|
||||
Name: rpmlint-mini
|
||||
BuildRequires: glib2-devel pkg-config python-xml rpm-python rpmlint
|
||||
#FIXME: need to make this work for e.g. CheckIconSizes.py
|
||||
#BuildRequires: python-magic
|
||||
Summary: Rpm correctness checker
|
||||
Version: 1.0
|
||||
Release: 215
|
||||
Release: 216
|
||||
Url: http://rpmlint.zarb.org/
|
||||
License: GPL v2 or later
|
||||
Group: System/Packages
|
||||
@ -101,7 +104,7 @@ chmod +x %my_requires
|
||||
LD_LIBRARY_PATH=$RPM_BUILD_ROOT/opt/testing/%_lib
|
||||
PYTHONPATH=$RPM_BUILD_ROOT/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 $* || exit 1
|
||||
$RPM_BUILD_ROOT/opt/testing/bin/python -tt -u -O $RPM_BUILD_ROOT/opt/testing/share/rpmlint/rpmlint.pyo --help || exit 1
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -111,49 +114,3 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/opt/testing
|
||||
|
||||
%changelog
|
||||
* Fri Jan 23 2009 lnussel@suse.de
|
||||
- include StringIO.pyo, needed by xml module used by the dbus policy
|
||||
check to print useful errors
|
||||
* Thu Dec 11 2008 lnussel@suse.de
|
||||
- add python-xml parts needed for PolicyKit checks
|
||||
* Sat Sep 27 2008 adrian@suse.de
|
||||
- fix dependencies of python again (bnc#430381)
|
||||
- add self check to avoid breakage in future
|
||||
* Mon Sep 08 2008 ro@suse.de
|
||||
- next try to get a working rpmlint again
|
||||
* Mon Sep 08 2008 dmueller@suse.de
|
||||
- fix build again
|
||||
* Thu Aug 07 2008 dmueller@suse.de
|
||||
- fix build for python 2.6
|
||||
* Thu Jul 24 2008 dmueller@suse.de
|
||||
- support even OBS style of building
|
||||
* Mon Jun 30 2008 schwab@suse.de
|
||||
- Fix syntax error.
|
||||
* Fri Jun 27 2008 dmueller@suse.de
|
||||
- ignore warnings in the test package
|
||||
* Mon Mar 10 2008 dmueller@suse.de
|
||||
- update desktop-file-validate to 0.14
|
||||
* for changelog, see desktop-file-utils package
|
||||
* Wed Feb 13 2008 dmueller@suse.de
|
||||
- update to (also) build rpmlint 0.82
|
||||
* Thu Nov 22 2007 dmueller@suse.de
|
||||
- add missing utf8 module (#343642)
|
||||
* Mon Oct 29 2007 dmueller@suse.de
|
||||
- update to (also) build rpmlint 0.81
|
||||
- update desktop-file-validate to 0.14
|
||||
* Thu Jun 21 2007 dmueller@suse.de
|
||||
- refresh patches
|
||||
* Thu Jun 07 2007 dmueller@suse.de
|
||||
- update desktop-file-validate to 0.13
|
||||
- fix build for lib64 archs
|
||||
* Wed Jun 06 2007 dmueller@suse.de
|
||||
- add static copy of desktop-file-validate to fix
|
||||
the rpmlint check for desktop files
|
||||
* Tue Jun 05 2007 dmueller@suse.de
|
||||
- remove source files to reduce size
|
||||
- read $RPM_SOURCE_DIR/%%{name}-%%{version}-rpmlintrc as well
|
||||
* Thu May 24 2007 dmueller@suse.de
|
||||
- read $RPM_SOURCE_DIR/rpmlintrc as well to allow
|
||||
package specific overrides
|
||||
* Tue May 15 2007 dmueller@suse.de
|
||||
- Initial package
|
||||
|
||||
Loading…
Reference in New Issue
Block a user