rpms/rpmlint/EL-4 rpmlint-0.81-fedoralicensing.patch, NONE, 1.1 rpmlint-CHANGES.package.old, NONE, 1.1

Mon Jan 14 16:29:06 UTC 2008

Author: wolfy

Update of /cvs/pkgs/rpms/rpmlint/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18347

Added Files:
	rpmlint-0.81-fedoralicensing.patch rpmlint-CHANGES.package.old 
Log Message:
added missing files (old changelog + a patch)


rpmlint-0.81-fedoralicensing.patch:

--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~	2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py	2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
 invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
 lib_regex=re.compile('^lib.*?(\.so.*)?$')
 leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
 forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
 #                 printWarning(pkg, 'package-provides-itself')
 #                 break
 
+        def split_license(license):
+            return map(string.strip, [l for l in license_regex.split(license) if l])
+
         rpm_license = pkg[rpm.RPMTAG_LICENSE]
         if not rpm_license:
             printError(pkg, 'no-license')
         else:
             if rpm_license not in VALID_LICENSES:
-                licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
-                for l in licenses:
-                    if l != '' and not l in VALID_LICENSES:
-                        printWarning(pkg, 'invalid-license', rpm_license)
-                        break
+                for l1 in split_license(rpm_license):
+                    if l1 in VALID_LICENSES:
+                        continue
+                    for l2 in split_license(l1):
+                        if l2 not in VALID_LICENSES:
+                            printWarning(pkg, 'invalid-license', l2)
 
         url=pkg[rpm.RPMTAG_URL]
         if url and url != 'none':
@@ -808,9 +813,7 @@
 
 'invalid-license',
 '''The value of the License tag was not recognized.  Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
 
 'invalid-url',
 '''Your URL is not valid. It must begin with http, https or ftp and must no


--- NEW FILE rpmlint-CHANGES.package.old ---
* Sun Nov 20 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.71-2
- Take file based dependencies into account in dangling symlink checks
  (completes the fix for #165839).
- Skip some checks for binaries not understood by objdump (#165173).
- Improve long descriptions of some script warnings.
- Fix command output parsing in non-English locales.
- Import Enrico's latest DocFilesCheck (with some local tweaks).
- Use rm instead of %%exclude.

* Wed Nov 16 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi>
- Add DocFilesCheck from Enrico Scholz.

* Sat Sep  3 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi>
- Improve accuracy of doc, info and games path regexps.
- Improve error message when invoked on non-rpm files.
- Filter more Mandriva specific warnings.

* Sat Aug 13 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi>
- Add dangling symlink exceptions tuned for Fedora to default config
  (partially fixes #165839).

* 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-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,
  invalid LC_MESSAGES and man page dirs, and library packages containing
  something else in addition to libraries.
- Make info about non-config files in /etc more accurate.
- Patch to warn about services that default to enabled after "chkconfig add",
  not the other way around.

* Thu May 26 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.69-3
- Filter out more not-that-useful messages in the default config.

* Sat Apr 16 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.69-2
- 0.69.
- Simplify bash-completion snippet installation, remove triggers.
- Default configuration improvements: filter messages about missing packager,
  Mandriva specific package naming conventions, %%ghost files without
  %%post scriptlets, and 0664 source permissions.
- Exclude check-install.py, it doesn't currently work with rpm >= 4.2.
- Convert docs to UTF-8.
- Improve summary.

* Sun Mar 13 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.68-2
- 0.68, siteperl patch applied upstream.
- Fix "no-dependency-on" filtering in default config.
- Add LaTeX Project Public License to default config.
- Remove upstream-only %%changelog entries.

* Sun Feb 13 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.67-1
- 0.67.
- Patch to catch more site_perl directories.
- Default config improvements: filter Distribution and Vendor warnings,
  use empty string instead of None for release extension (fixes -i).

* Sat Jan 29 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.65-1
- Update to 0.65.

* Sat Jan  1 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.64-1
- Update to 0.64.
- Default config tweaks: don't mandate Epochs nor "fdr" in Release.

* Tue Oct 19 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
- Requires cpio (bug 2169).

* Sun Oct  3 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.61-0.fdr.1
- Update to 0.61.

* Mon Aug 16 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.60-0.fdr.1
- Update to 0.60.

* Mon May  3 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.59-0.fdr.1
- Update to 0.59.

* Sun Feb 22 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.57.1-0.fdr.1
- Update to 0.57.1.

* Wed Feb 11 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.56-0.fdr.1
- Update to 0.56.

* Mon Feb  2 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.55-0.fdr.3
- Correctly %%ghost %%{_sysconfdir}/rpmlint/config? (bug 1251).

* Sun Feb  1 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.55-0.fdr.2
- Add back %%ghost handling of not-installed compiled versions of *.py.

* Fri Jan 30 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.55-0.fdr.1
- Update to 0.55.
- Spec cleanups.

* Tue Dec 23 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.53-0.fdr.1
- Update to 0.53.

* Thu Oct  2 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.52-0.fdr.2
- Add list of valid shells for post'n'friends scriptlets into default config.

* Sat Sep 13 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.52-0.fdr.1
- Update to 0.52.

* Thu Sep  4 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.4
- Filter more Mdk-specific warnings in default config.

* Wed Sep  3 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.3
- Upstream tarball reappeared, use it.

* Sun Aug 24 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.2
- Filter Mdk-specific python-related stuff in the default config.

* Fri Aug 15 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.51.1-0.fdr.1
- Update to 0.51.1.
- Own %%ghost'ed *.py{c,o}, and ditto for the config file.
- Add list of valid licenses to default config.
- Set "Fedora Linux" as suggested distribution in default config.
- Clean up %%doc list.

* Fri May  9 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
- Update to 0.50, all patches now applied upstream.

* Mon May  5 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.49-0.fdr.2
- %%{buildroot} -> $RPM_BUILD_ROOT.
- Filter out mdk-specific "no-dependancy perl-base" messages in config.

* Thu May  1 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.49-0.fdr.1
- Update to 0.49.

* Sun Apr 20 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030420
- Add one more strict Epoch checking patch.
- Slightly enhanced default config.

* Fri Apr 11 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030411
- Patch to work with installed packages (including -a) and rpm 4.2.
- Remove spurious rpm-devel BuildRequirement.

* Tue Apr  8 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030408
- Patch to work with packages signed with an unknown key.
- Save .spec in UTF-8.

* Sun Mar 30 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.49-0.fdr.0.1.cvs20030330
- First Fedora release, based on upstream spec.


