rpms/rpmlint/FC-5 rpmlint-0.77-compile.patch, NONE, 1.1 rpmlint-0.78-distregex.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 rpmlint.spec, 1.24, 1.25 sources, 1.13, 1.14 rpmlint-0.77-distregex.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore rpmlint.spec sources 
Added Files:
	rpmlint-0.77-compile.patch rpmlint-0.78-distregex.patch 
Removed Files:
	rpmlint-0.77-distregex.patch 
Log Message:
* 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.


rpmlint-0.77-compile.patch:

--- NEW FILE rpmlint-0.77-compile.patch ---
--- compile.py~	2006-04-10 17:32:27.000000000 +0300
+++ compile.py	2006-09-16 16:48:16.000000000 +0300
@@ -12,6 +12,7 @@
 import sys
 
 for f in sys.argv[2:]:
+    py_compile.compile(f, f + 'c', sys.argv[1] + f)
     py_compile.compile(f, f + 'o', sys.argv[1] + f)
 
 # compile.py ends here
--- Makefile~	2006-06-29 00:19:16.000000000 +0300
+++ Makefile	2006-09-16 16:50:17.000000000 +0300
@@ -36,7 +36,7 @@
 
 install:
 	-mkdir -p $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(ETCDIR)/$(PACKAGE) $(DESTDIR)$(ETCDIR)/bash_completion.d $(DESTDIR)$(MANDIR)/man1
-	cp -p *.py *.pyo $(DESTDIR)$(LIBDIR)
+	cp -p *.py *.pyc *.pyo $(DESTDIR)$(LIBDIR)
 	rm -f $(DESTDIR)$(LIBDIR)/compile.py*
 	if [ -z "$(POLICY)" ]; then \
 	  sed -e 's/@VERSION@/$(VERSION)/' < rpmlint.py > $(DESTDIR)$(LIBDIR)/rpmlint.py ; \

rpmlint-0.78-distregex.patch:

--- NEW FILE rpmlint-0.78-distregex.patch ---
--- TagsCheck.py~	2006-09-23 12:08:23.000000000 +0300
+++ TagsCheck.py	2006-09-24 00:19:26.000000000 +0300
@@ -384,6 +384,8 @@
 basename_regex=re.compile('/?([^/]+)$')
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
 changelog_text_version_regex=re.compile('^\s*-\s*((\d+:)?[\w\.]+-[\w\.]+)')
+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)
@@ -598,11 +600,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])
 
             if clt: changelog=changelog + clt
             if use_utf8 and not Pkg.is_utf8_str(' '.join(changelog)):


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	29 Jun 2006 20:29:39 -0000	1.13
+++ .cvsignore	23 Sep 2006 21:37:34 -0000	1.14
@@ -1 +1 @@
-rpmlint-0.77.tar.bz2
+rpmlint-0.78.tar.bz2


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rpmlint.spec	29 Jun 2006 20:29:39 -0000	1.24
+++ rpmlint.spec	23 Sep 2006 21:37:34 -0000	1.25
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.77
+Version:        0.78
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
@@ -8,17 +8,19 @@
 URL:            http://rpmlint.zarb.org/
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
-Patch0:         %{name}-0.77-distregex.patch
+Patch0:         %{name}-0.78-distregex.patch
+Patch1:         %{name}-0.77-compile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python >= 1.5.2
+BuildRequires:  python >= 2.0
 BuildRequires:  rpm-python
 BuildRequires:  sed >= 3.95
 Requires:       rpm-python
-Requires:       python >= 1.5.2
+Requires:       python >= 2.0
 Requires:       cpio
 Requires:       binutils
+Requires:       desktop-file-utils
 
 %description
 rpmlint is a tool for checking common errors in RPM packages.  Binary
@@ -28,6 +30,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 sed -i -e /MenuCheck/d Config.py
 
 
@@ -37,45 +40,39 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+touch rpmlint.pyc rpmlint.pyo # just for the %%exclude to work everywhere
 make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
   LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
 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.
-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||"`
-  for t in c o ; do
-    pref=
-    if [ ! -e "$RPM_BUILD_ROOT$f$t" ] ; then
-      touch "$RPM_BUILD_ROOT$f$t"
-      pref='%ghost '
-    fi
-    echo "$pref$f$t" >> %{name}-%{version}-files.list
-  done
-done
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f %{name}-%{version}-files.list
+%files
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING ChangeLog README
 %config(noreplace) %{_sysconfdir}/rpmlint/
 %{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
-%dir %{_datadir}/rpmlint/
-%{_datadir}/rpmlint/*.py
-%{_datadir}/rpmlint/config
+%{_datadir}/rpmlint/
+%exclude %{_datadir}/rpmlint/rpmlint.py[co]
 %{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	29 Jun 2006 20:29:39 -0000	1.13
+++ sources	23 Sep 2006 21:37:34 -0000	1.14
@@ -1 +1 @@
-72d3b3106212735d6bd597668f02f93c  rpmlint-0.77.tar.bz2
+73fd414976c4654c3007a55a762c7eed  rpmlint-0.78.tar.bz2


--- rpmlint-0.77-distregex.patch DELETED ---