rpms/rpmlint/FC-4 rpmlint-perl-bs.patch, NONE, 1.1 rpmlint-prereq.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 rpmlint-fedora-config, 1.7, 1.8 rpmlint-initvars.patch, 1.1, 1.2 rpmlint.spec, 1.15, 1.16 sources, 1.8, 1.9 rpmlint-confmsg.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/rpmlint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10731/FC-4

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint-initvars.patch 
	rpmlint.spec sources 
Added Files:
	rpmlint-perl-bs.patch rpmlint-prereq.patch 
Removed Files:
	rpmlint-confmsg.patch 
Log Message:
* Wed Aug 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.71-1
- 0.71, confmsg patch and bits from initvars patch applied upstream.
- Filter out Mandriva-specific errors about missing locales-* deps (#165457).
- Patch to not warn about non-empty *.bs (in Perl packages).
- Patch to clarify PreReq explanation, make it a warning instead of an error.
- Patch to warn about use of BuildPreReq.


rpmlint-perl-bs.patch:

--- NEW FILE rpmlint-perl-bs.patch ---
--- FilesCheck.py	10 Aug 2005 01:46:30 -0000	1.88
+++ FilesCheck.py	10 Aug 2005 13:29:12 -0000
@@ -160,7 +160,7 @@
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)
 info_regex=re.compile('^/usr/share/info')
 install_info_regex=re.compile('^[^#]*install-info', re.MULTILINE)
-perl_temp_file=re.compile('.*perl.*(\.bs|/\.packlist|/perllocal\.pod)$')
+perl_temp_file=re.compile('.*perl.*(/\.packlist|/perllocal\.pod)$')
 scm_regex=re.compile('/CVS/[^/]+$|/.cvsignore$|/\.svn/|/(\.arch-ids|{arch})/')
 htaccess_regex=re.compile('\.htaccess$')
 games_path_regex=re.compile('/usr/(lib/)?/games')

rpmlint-prereq.patch:

--- NEW FILE rpmlint-prereq.patch ---
--- SpecCheck.py	10 Aug 2005 06:10:39 -0000	1.29
+++ SpecCheck.py	10 Aug 2005 13:14:46 -0000
@@ -44,6 +44,7 @@
 biarch_package_regex=re.compile(DEFAULT_BIARCH_PACKAGES)
 hardcoded_lib_path_exceptions_regex=re.compile(Config.getOption('HardcodedLibPathExceptions', DEFAULT_HARDCODED_LIB_PATH_EXCEPTIONS))
 prereq_regex=re.compile('^PreReq:\s*(.+?)\s*$', re.IGNORECASE)
+buildprereq_regex=re.compile('^BuildPreReq:\s*(.+?)\s*$', re.IGNORECASE)
 
 # Only check for /lib, /usr/lib, /usr/X11R6/lib
 # TODO: better handling of X libraries and modules.
@@ -185,8 +186,12 @@
 
                 res=prereq_regex.search(line)
                 if res:
-                    printError(pkg, 'prereq-use', res.group(1))
-                    
+                    printWarning(pkg, 'prereq-use', res.group(1))
+
+                res=buildprereq_regex.search(line)
+                if res:
+                    printWarning(pkg, 'buildprereq-use', res.group(1))
+
             if not buildroot:
                 printError(pkg, 'no-buildroot-tag')
 
@@ -272,8 +277,13 @@
 patch to be effective only on a given arch.''',
 
 'prereq-use',
-'''The use of PreReq is deprecated. You should use Requires(pre), Requires(post),
-Requires(preun) or Requires(postun) according to your needs.''',
+'''The use of PreReq is deprecated. In the majority of cases, a plain Requires
+is enough and the right thing to do. Sometimes Requires(pre), Requires(post),
+Requires(preun) and/or Requires(postun) can also be used instead of PreReq.''',
+
+'buildprereq-use',
+'''The use of BuildPreReq is deprecated, build dependencies are always required
+before a package can be built.  Use plain BuildRequires instead.''',
 
 )
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Jun 2005 18:02:35 -0000	1.8
+++ .cvsignore	11 Aug 2005 19:32:45 -0000	1.9
@@ -1 +1 @@
-rpmlint-0.70.tar.bz2
+rpmlint-0.71.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-fedora-config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmlint-fedora-config	20 Jun 2005 18:02:36 -0000	1.7
+++ rpmlint-fedora-config	11 Aug 2005 19:32:45 -0000	1.8
@@ -79,6 +79,7 @@
 addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
 addFilter("E: .* no-dependency-on (perl|python)-base.*")
+addFilter("E: .* no-dependency-on locales-.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
 addFilter("W: .* invalid-(distribution|vendor) .*")
 addFilter("E: .* no-(packager-tag|signature)")

rpmlint-initvars.patch:

Index: rpmlint-initvars.patch
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-initvars.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmlint-initvars.patch	11 Jul 2005 18:22:30 -0000	1.1
+++ rpmlint-initvars.patch	11 Aug 2005 19:32:45 -0000	1.2
@@ -1,19 +1,5 @@
-Index: InitScriptCheck.py
-===================================================================
-RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v
-retrieving revision 1.14
-diff -u -r1.14 InitScriptCheck.py
---- InitScriptCheck.py	15 Apr 2005 20:01:46 -0000	1.14
-+++ InitScriptCheck.py	6 Jul 2005 14:19:22 -0000
-@@ -17,7 +17,7 @@
- 
- rc_regex=re.compile('^/etc(/rc.d)?/init.d/')
- chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE)
--subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE)
-+subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE)
- chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE)
- status_regex=re.compile('^[^#]*status', re.MULTILINE)
- reload_regex=re.compile('^[^#]*reload', re.MULTILINE)
+--- InitScriptCheck.py	10 Aug 2005 01:51:34 -0000	1.15
++++ InitScriptCheck.py	10 Aug 2005 13:12:39 -0000
 @@ -86,7 +86,7 @@
                          error=1
                          if name[0] == '$':


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmlint.spec	11 Jul 2005 18:22:30 -0000	1.15
+++ rpmlint.spec	11 Aug 2005 19:32:45 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.70
-Release:        4%{?dist}
+Version:        0.71
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -9,10 +9,11 @@
 Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
 Patch0:         %{name}-svcdefault.patch
-Patch1:         %{name}-confmsg.patch
+Patch1:         %{name}-prereq.patch
 Patch2:         %{name}-disttag.patch
 Patch3:         %{name}-initvars.patch
 Patch4:         %{name}-execs.patch
+Patch5:         %{name}-perl-bs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -35,6 +36,7 @@
 %patch2
 %patch3
 %patch4
+%patch5
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 for f in AUTHORS ChangeLog ; do
@@ -86,12 +88,19 @@
 
 
 %changelog
+* Wed Aug 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.71-1
+- 0.71, confmsg patch and bits from initvars patch applied upstream.
+- Filter out Mandriva-specific errors about missing locales-* deps (#165457).
+- Patch to not warn about non-empty *.bs (in Perl packages).
+- Patch to clarify PreReq explanation, make it a warning instead of an error.
+- Patch to warn about use of BuildPreReq.
+
 * Thu Jul  7 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-4
 - Fix false "positives" from libtool archives confused as scripts,
   non-executable scripts installed in docs, FE disttags, unsuccessfully
   expanded shell variables and quotation in init scripts.
 
-* Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-2
+* Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-3
 - 0.70, use sed instead of perl during build.
 - Default configuration improvements: allow Development/Debug group (for
   debuginfo packages), filter out errors/warnings about non-indexed jars,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Jun 2005 18:02:36 -0000	1.8
+++ sources	11 Aug 2005 19:32:45 -0000	1.9
@@ -1 +1 @@
-0457f6d88c6b25fe3cb31503249a6909  rpmlint-0.70.tar.bz2
+9e7645ee79bfc75540c885f05dca0751  rpmlint-0.71.tar.bz2


--- rpmlint-confmsg.patch DELETED ---