rpms/rpmlint/FC-4 rpmlint-0.76-debuginfo.patch, NONE, 1.1 rpmlint-0.76-disttag.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 rpmlint-fedora-config, 1.9, 1.10 rpmlint.spec, 1.17, 1.18 sources, 1.10, 1.11 rpmlint-0.71-disttag.patch, 1.1, NONE rpmlint-0.71-doc-exec.patch, 1.1, NONE rpmlint-0.71-la-exec.patch, 1.1, NONE rpmlint-0.71-prereq.patch, 1.1, NONE rpmlint-0.75-develdep.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-serv22911/FC-4

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
Removed Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
	rpmlint-0.75-develdep.patch 
Log Message:
* 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).


rpmlint-0.76-debuginfo.patch:

--- NEW FILE rpmlint-0.76-debuginfo.patch ---
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1144)
+++ FilesCheck.py	(working copy)
@@ -158,7 +158,7 @@
 includefile_regex=re.compile('\.(c|h|a|cmi)$')
 buildconfigfile_regex=re.compile('(\.pc|/bin/.+-config)$')
 sofile_regex=re.compile('/lib(64)?/[^/]+\.so$')
-devel_regex=re.compile('-(devel|source)$')
+devel_regex=re.compile('-(debug(info)?|devel|source)$')
 lib_regex=re.compile('lib(64)?/lib[^/]*\.so\..*')
 ldconfig_regex=re.compile('^[^#]*ldconfig', re.MULTILINE)
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)

rpmlint-0.76-disttag.patch:

--- NEW FILE rpmlint-0.76-disttag.patch ---
--- TagsCheck.py~	2006-04-05 19:21:45.000000000 +0300
+++ TagsCheck.py	2006-04-08 23:04:04.000000000 +0300
@@ -342,2 +342,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension')
@@ -556,3 +557,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Feb 2006 13:17:19 -0000	1.10
+++ .cvsignore	11 Apr 2006 06:21:38 -0000	1.11
@@ -1 +1 @@
-rpmlint-0.75.tar.bz2
+rpmlint-0.76.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-fedora-config,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmlint-fedora-config	18 Feb 2006 13:17:19 -0000	1.9
+++ rpmlint-fedora-config	11 Apr 2006 06:21:38 -0000	1.10
@@ -4,9 +4,6 @@
 
 from Config import *
 
-setOption("ReleaseExtension", '')
-setOption("ValidBuildHost", ".*")
-setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseDefaultRunlevels", 0)
@@ -65,8 +62,11 @@
     "Public Domain",
     "Python Software Foundation License",
     "QPL",
+    "Ruby License",
     "Sun Public License",
+    "SIL Open Font License",
     "W3C Software License",
+    "zlib License",
     "Zope Public License",
 ))
 setOption("ValidShells", (
@@ -82,22 +82,23 @@
 ))
 
 # Output filters
-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)")
-addFilter("E: .* incoherent-version-in-name.*")
-addFilter("E: .* invalid-build-requires .*")
-addFilter("W: .* ghost-files-without-postin")
-addFilter("W: .* postin-without-ghost-file-creation .*")
-addFilter("W: .* no-major-in-name .*")
-addFilter("W: .* no-provides .*")
-addFilter("E: .* executable-in-library-package .*")
-addFilter("E: .* non-versioned-file-in-library-package .*")
-addFilter("E: .* requires-on-release .*")
-addFilter("W: .* jar-not-indexed .*")
-addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
-addFilter("E: .* outside-libdir-files .*")
+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/')


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmlint.spec	18 Feb 2006 13:17:19 -0000	1.17
+++ rpmlint.spec	11 Apr 2006 06:21:38 -0000	1.18
@@ -1,19 +1,19 @@
+# TODO:
+# - don't override upstream default valid groups, just add "Development/Debug"
+# - switch to upstream valid license list?
+
 Name:           rpmlint
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
+URL:            http://rpmlint.zarb.org/
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.75-develdep.patch
-Patch2:         %{name}-0.71-prereq.patch
-Patch3:         %{name}-0.71-la-exec.patch
-Patch4:         %{name}-0.71-doc-exec.patch
+Patch0:         %{name}-0.76-disttag.patch
+Patch1:         %{name}-0.76-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,14 +34,8 @@
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 
 
 %build
@@ -50,15 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
-install -Dpm 644 rpmlint.bash-completion \
-  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
+  LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
+echo "# Add local 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%{_sysconfdir}/rpmlint/config{c,o}
+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
 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
@@ -82,13 +77,28 @@
 %doc AUTHORS COPYING ChangeLog README
 %dir %{_sysconfdir}/rpmlint/
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/rpmlint/config
+%{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	18 Feb 2006 13:17:19 -0000	1.10
+++ sources	11 Apr 2006 06:21:38 -0000	1.11
@@ -1 +1 @@
-22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2
+f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2


--- rpmlint-0.71-disttag.patch DELETED ---


--- rpmlint-0.71-doc-exec.patch DELETED ---


--- rpmlint-0.71-la-exec.patch DELETED ---


--- rpmlint-0.71-prereq.patch DELETED ---


--- rpmlint-0.75-develdep.patch DELETED ---