rpms/rpmlint/devel rpmlint-0.77-distregex.patch, NONE, 1.1 rpmlint.config, NONE, 1.1 .cvsignore, 1.12, 1.13 rpmlint.spec, 1.23, 1.24 sources, 1.12, 1.13 rpmlint-0.76-debuginfo.patch, 1.1, NONE rpmlint-0.76-disttag.patch, 1.1, NONE rpmlint-fedora-config, 1.12, NONE

Thu Jun 29 20:29:40 UTC 2006

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28301/devel

Modified Files:
	.cvsignore rpmlint.spec sources 
Added Files:
	rpmlint-0.77-distregex.patch rpmlint.config 
Removed Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
	rpmlint-fedora-config 
Log Message:
* Thu Jun 29 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.77-1
- 0.77, fixes #194466, #195962, #196008, #196985.
- Make "disttag" configurable using the DistRegex config file option.
- Sync standard users and groups with the FC setup package.
- Disable MenuCheck by default, it's currently Mandriva specific.
- Use upstream default valid License tag list, fixes #191078.
- Use upstream default valid Group tag list (dynamically retrieved from
  the GROUPS file shipped with rpm).
- Allow /usr/libexec, fixes #195992.


rpmlint-0.77-distregex.patch:

--- NEW FILE rpmlint-0.77-distregex.patch ---
Index: TagsCheck.py
===================================================================
--- TagsCheck.py	(revision 1215)
+++ TagsCheck.py	(working copy)
@@ -380,6 +380,8 @@
 packager_regex=re.compile(Config.getOption('Packager'))
 basename_regex=re.compile('/?([^/]+)$')
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+dist_regex=Config.getOption('DistRegex')
+if dist_regex: dist_regex=re.compile(dist_regex)
 release_ext=Config.getOption('ReleaseExtension')
 extension_regex=release_ext and re.compile(release_ext + '$')
 use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1)
@@ -591,11 +593,13 @@
                     srpm=pkg[rpm.RPMTAG_SOURCERPM]
                     # only check when source name correspond to name
                     if srpm[0:-8] == '%s-%s-%s' % (name, version, release):
-                        expected=version + '-' + release
+                        expected=[version + '-' + release]
                         if epoch is not None: # regardless of use_epoch
-                            expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
-                            printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)
+                            expected[0]=str(epoch) + ':' + expected[0]
+                        if dist_regex:
+                            expected.append(dist_regex.sub('', expected[0]))
+                        if ret.group(1) not in expected:
+                            printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected[0])
 
             clt=pkg[rpm.RPMTAG_CHANGELOGTEXT]
             if clt: changelog=changelog + clt


--- NEW FILE rpmlint.config ---
# -*- python -*-

# System wide rpmlint default configuration.  Do not modify, override/add
# options in /etc/rpmlint/config and/or ~/.rpmlintrc as needed.

from Config import *

setOption("DistRegex", '\.(fc|rhe?l)\d+(?=\.|$)')
setOption("UseVersionInChangeLog", 1)
setOption("UseBzip2", 0)
setOption("UseDefaultRunlevels", 0)
setOption("UseEpoch", 0)
setOption("UseUTF8", 1)
setOption("ValidSrcPerms", (0664, 0644, ))
setOption("ValidShells", (
    "/bin/sh",
    "/bin/bash",
    "/sbin/ldconfig",
    "/usr/bin/perl",
    "/usr/bin/python",
))
setOption("DanglingSymlinkExceptions", (
    ['consolehelper$', 'usermode'],
    ['consolehelper-gtk$', 'usermode-gtk'],
))
# Standard users & groups from the setup package:
setOption("StandardUsers",
          ("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt",
           "mail", "news", "uucp", "operator", "games", "gopher", "ftp",
           "nobody"))
setOption("StandardGroups",
          ("root", "bin", "daemon", "sys", "adm", "tty", "disk", "lp", "mem",
           "kmem", "wheel", "mail", "news", "uucp", "man", "games", "gopher",
           "dip", "ftp", "lock", "nobody", "users"))

# Output filters
addFilter("source-or-patch-not-[bg]zipped")
addFilter("%mklibname")
addFilter("no-dependency-on (perl|python)-base")
addFilter("no-dependency-on locales-")
addFilter("(python|perl5)-naming-policy-not-applied")
addFilter("no-(packager-tag|signature)")
addFilter("incoherent-version-in-name")
addFilter("invalid-build-requires")
addFilter("ghost-files-without-postin")
addFilter("postin-without-ghost-file-creation")
addFilter("no-major-in-name")
addFilter("no-provides")
addFilter("executable-in-library-package")
addFilter("non-versioned-file-in-library-package")
addFilter("requires-on-release")
addFilter("jar-not-indexed")
addFilter("invalid-(lc-messages|locale-man)-dir")
addFilter("outside-libdir-files")
addFilter("-debuginfo no-documentation")
addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
addFilter("non-standard-dir-in-usr libexec")


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Apr 2006 06:21:45 -0000	1.12
+++ .cvsignore	29 Jun 2006 20:29:40 -0000	1.13
@@ -1 +1 @@
-rpmlint-0.76.tar.bz2
+rpmlint-0.77.tar.bz2


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rpmlint.spec	11 Apr 2006 06:21:45 -0000	1.23
+++ rpmlint.spec	29 Jun 2006 20:29:40 -0000	1.24
@@ -1,9 +1,5 @@
-# TODO:
-# - don't override upstream default valid groups, just add "Development/Debug"
-# - switch to upstream valid license list?
-
 Name:           rpmlint
-Version:        0.76
+Version:        0.77
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
@@ -11,9 +7,8 @@
 License:        GPL
 URL:            http://rpmlint.zarb.org/
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
-Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.76-disttag.patch
-Patch1:         %{name}-0.76-debuginfo.patch
+Source1:        %{name}.config
+Patch0:         %{name}-0.77-distregex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,9 +28,7 @@
 %prep
 %setup -q
 %patch0
-%patch1
-sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
-  FilesCheck.py I18NCheck.py
+sed -i -e /MenuCheck/d Config.py
 
 
 %build
@@ -46,17 +39,14 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
   LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
-echo "# Add local rpmlint configuration here." \
+echo "# Add local system wide rpmlint configuration here." \
   > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 # Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/rpmlint/config{c,o}
-echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
-echo '%ghost %{_datadir}/rpmlint/config?' >> %{name}-%{version}-files.list
+cat /dev/null > %{name}-%{version}-files.list
 for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
   f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
-  echo "$f" >> %{name}-%{version}-files.list
   for t in c o ; do
     pref=
     if [ ! -e "$RPM_BUILD_ROOT$f$t" ] ; then
@@ -75,17 +65,27 @@
 %files -f %{name}-%{version}-files.list
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING ChangeLog README
-%dir %{_sysconfdir}/rpmlint/
-%config(noreplace) %{_sysconfdir}/rpmlint/config
+%config(noreplace) %{_sysconfdir}/rpmlint/
 %{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
+%{_datadir}/rpmlint/*.py
 %{_datadir}/rpmlint/config
 %{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* Thu Jun 29 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.77-1
+- 0.77, fixes #194466, #195962, #196008, #196985.
+- Make "disttag" configurable using the DistRegex config file option.
+- Sync standard users and groups with the FC setup package.
+- Disable MenuCheck by default, it's currently Mandriva specific.
+- Use upstream default valid License tag list, fixes #191078.
+- Use upstream default valid Group tag list (dynamically retrieved from
+  the GROUPS file shipped with rpm).
+- Allow /usr/libexec, fixes #195992.
+
 * Tue Apr 11 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.76-1
 - 0.76.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Apr 2006 06:21:45 -0000	1.12
+++ sources	29 Jun 2006 20:29:40 -0000	1.13
@@ -1 +1 @@
-f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2
+72d3b3106212735d6bd597668f02f93c  rpmlint-0.77.tar.bz2


--- rpmlint-0.76-debuginfo.patch DELETED ---


--- rpmlint-0.76-disttag.patch DELETED ---


--- rpmlint-fedora-config DELETED ---


