rpms/rpmlint/F-9 .cvsignore, 1.18, 1.19 rpmlint-CHANGES.package.old, 1.1, 1.2 rpmlint.config, 1.19, 1.20 rpmlint.spec, 1.43, 1.44 sources, 1.18, 1.19 rpmlint-0.81-fedoralicensing.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1075/F-9

Modified Files:
	.cvsignore rpmlint-CHANGES.package.old rpmlint.config 
	rpmlint.spec sources 
Removed Files:
	rpmlint-0.81-fedoralicensing.patch 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	6 Dec 2007 12:13:44 -0000	1.18
+++ .cvsignore	9 Jun 2008 17:39:46 -0000	1.19
@@ -1 +1 @@
-rpmlint-0.82.tar.bz2
+rpmlint-0.83.tar.bz2


Index: rpmlint-CHANGES.package.old
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/rpmlint-CHANGES.package.old,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmlint-CHANGES.package.old	16 Aug 2007 15:37:38 -0000	1.1
+++ rpmlint-CHANGES.package.old	9 Jun 2008 17:39:46 -0000	1.2
@@ -1,3 +1,46 @@
+* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.78-2
+- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
+- Filter messages about gpg-pubkeys for now.
+
+* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.78-1
+- 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
+- /etc/profile.d/* filtering no longer needed.
+
+* Sat Sep 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.77-2
+- Filter false positives for /etc/profile.d/* file modes.
+- Ship *.pyc and *.pyo as usual.
+
+* 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.
+
+* Mon Mar 27 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
+* Sat Feb 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.75-1
+- 0.75 + -devel Epoch version check patch from CVS.
+
+* Tue Jan 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.71-3
+- Sync with upstream CVS as of 2006-01-15, includes improved versions of
+  most of the earlier patches.
+- Add dependency on binutils.
+
 * 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).


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/rpmlint.config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmlint.config	3 Mar 2008 21:39:58 -0000	1.19
+++ rpmlint.config	9 Jun 2008 17:39:46 -0000	1.20
@@ -28,8 +28,9 @@
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with Revision 0.69 (Wiki revision 110) of that page.
+    # Last synced with Revision 0.88 of that page.
     'Adobe',
+    'ADSL',
     'AFL',
     'AGPLv1',
     'AGPLv3',
@@ -51,22 +52,26 @@
     'BSD with advertising',
     'CeCILL',
     'CDDL',
+    'CPAL',
     'CPL',
     'Condor',
     'Copyright only',
     'Cryptix',
     'Crystal Stacker',
+    'DOC',
     'EPL',
     'eCos',
     'EFL 2.0',
     'EFL 2.0+',
     'EU Datagrid',
+    'Fair',
     'FTL',
     'Giftware',
     'Glide',
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
+    'GPLv1',
     'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
@@ -100,13 +105,16 @@
     'LPPL',
     'mecab-ipadic',
     'MIT',
+    'MIT with advertising',
     'MPLv1.0',
     'MPLv1.0+',
     'MPLv1.1',
     'MPLv1.1+',
     'NCSA',
+    'NetCDF',
     'NGPL',
     'NOSL',
+    'Naumen',
     'Netscape',
     'Nokia',
     'OpenLDAP',
@@ -125,21 +133,26 @@
     'PHP',
     'Public Domain',
     'Python',
+    'Qhull',
     'QPL',
+    'RiceBSD',
     'RPSL',
     'Ruby',
+    'Sendmail',
     'Sleepycat',
     'SISSL',
     'SLIB',
     'SPL',
     'TCL',
     'UCD',
+    'VOSTROM',
     'Vim',
     'VNLSL',
     'VSL',
     'W3C',
     'WTFPL',
-    'wxWindows',
+    'wxWidgets',
+    'Xerox',
     'xinetd',
     'Zend',
     'ZPLv1.0',
@@ -149,6 +162,7 @@
     'ZPLv2.1',
     'ZPLv2.1+',
     'zlib',
+    'zlib with acknowledgement',
     # Documentation licenses
     'CDL',
     'FBSDDL',
@@ -156,15 +170,20 @@
     'IEEE',
     'OFSFDL',
     'Open Publication',
+    'Public Use',
     # Content licenses
     'CC-BY',
     'CC-BY-SA',
+    'CC-BY-ND',
     'DSL',
+    'EFML',
     'Free Art',
     # Font licenses
     'Arphic',
     'Baekmuk',
     'Bitstream Vera',
+    'Liberation',
+    'Lucida',
     'mplus',
     'OFL',
     'STIX',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/rpmlint.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- rpmlint.spec	3 Mar 2008 21:39:58 -0000	1.43
+++ rpmlint.spec	9 Jun 2008 17:39:46 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.82
-Release:        3%{?dist}
+Version:        0.83
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -11,7 +11,6 @@
 Source2:        %{name}-CHANGES.package.old
 Patch0:         %{name}-0.78-distregex.patch
 Patch1:         %{name}-0.77-compile.patch
-Patch2:         %{name}-0.81-fedoralicensing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +33,6 @@
 %setup -q
 %patch0
 %patch1
-%patch2
 sed -i -e /MenuCheck/d Config.py
 install -pm 644 %{SOURCE2} CHANGES.package.old
 
@@ -70,6 +68,15 @@
 
 
 %changelog
+* Tue May 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.83-1
+- 0.83, fixes #237204, #428096, #430206, #433783, #434694, #444441.
+- Fedora licensing patch applied upstream.
+- Move pre-2007 changelog entries to CHANGES.package.old.
+- Sync Fedora license list with Revision 0.88.
+
+* Tue May 20 2008 Todd Zullinger <tmz at pobox.com> 
+- Sync Fedora license list with Revision 0.83 (Wiki rev 131).
+
 * Mon Mar  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.82-3
 - Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690).
 
@@ -111,46 +118,3 @@
 - 0.79, fixes #211417, #212491, #214605, #218250, #219068, #220061, #221116,
   #222585, and #226879.
 - Accept *.elX disttags in default config.
-
-* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.78-2
-- Accumulated bugfixes since 0.78: #209876, #209889, #210110, 210261.
-- Filter messages about gpg-pubkeys for now.
-
-* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.78-1
-- 0.78, fixes #198605, #198616, #198705, #198707, #200032, #206383.
-- /etc/profile.d/* filtering no longer needed.
-
-* Sat Sep 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.77-2
-- Filter false positives for /etc/profile.d/* file modes.
-- Ship *.pyc and *.pyo as usual.
-
-* 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.
-
-* Mon Mar 27 2006 Ville Skyttä <ville.skytta at iki.fi>
-- Don't pass -T to objdump for *.debug files (#185227).
-- lib64 library path fixes (#185228).
-
-* Wed Mar 15 2006 Ville Skyttä <ville.skytta at iki.fi>
-- Accept zlib License (#185501).
-
-* Tue Feb 28 2006 Ville Skyttä <ville.skytta at iki.fi>
-- Accept Ruby License (#183384) and SIL Open Font License (#176405).
-
-* Sat Feb 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.75-1
-- 0.75 + -devel Epoch version check patch from CVS.
-
-* Tue Jan 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.71-3
-- Sync with upstream CVS as of 2006-01-15, includes improved versions of
-  most of the earlier patches.
-- Add dependency on binutils.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Dec 2007 12:13:44 -0000	1.18
+++ sources	9 Jun 2008 17:39:46 -0000	1.19
@@ -1 +1 @@
-bd5069aed3d7da837df5b8eb182c76a6  rpmlint-0.82.tar.bz2
+674e6d64330811abcee4d2acdbbd00e2  rpmlint-0.83.tar.bz2


--- rpmlint-0.81-fedoralicensing.patch DELETED ---