rpms/rpmlint/devel .cvsignore, 1.3, 1.4 rpmlint-fedora-config, 1.1, 1.2 rpmlint.spec, 1.6, 1.7 sources, 1.3, 1.4

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv14367

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Log Message:
Update to 0.65, improve default config.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:18:56 -0000	1.3
+++ .cvsignore	29 Jan 2005 20:37:55 -0000	1.4
@@ -1 +1 @@
-rpmlint-0.61.tar.bz2
+rpmlint-0.65.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmlint-fedora-config	8 Nov 2004 05:18:23 -0000	1.1
+++ rpmlint-fedora-config	29 Jan 2005 20:37:55 -0000	1.2
@@ -6,12 +6,12 @@
 
 setOption("Vendor", "Fedora Linux")
 setOption("Distribution", "Fedora Linux")
-setOption("ReleaseExtension", "(\d+\.)+fdr\.\d+(\..*)?")
+setOption("ReleaseExtension", None)
 setOption("ValidBuildHost", ".*")
 setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
-setOption("UseEpoch", 1)
+setOption("UseEpoch", 0)
 setOption("ValidSrcPerms", (0644, ))
 setOption("ValidGroups", (
     "Amusements/Games",
@@ -78,5 +78,5 @@
 # Output filters
 addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependancy (perl|python)-base.*")
+addFilter("E: .* no-dependency (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmlint.spec	10 Dec 2004 22:03:10 -0000	1.6
+++ rpmlint.spec	29 Jan 2005 20:37:55 -0000	1.7
@@ -1,18 +1,18 @@
 Name:           rpmlint
-Version:        0.61
-Release:        2
+Version:        0.65
+Release:        1
 Epoch:          0
 Summary:        RPM correctness checker
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.61.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.65.tar.bz2
 Source1:        %{name}-fedora-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python >= 0:1.5.2, rpm-python, make, perl
+BuildRequires:  python >= 0:1.5.2, rpm-python, make, %{__perl}
 Requires:       rpm-python, python >= 0:1.5.2, cpio
 
 %description
@@ -22,6 +22,8 @@
 
 %prep
 %setup -q
+%{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
+  FilesCheck.py I18NCheck.py
 
 
 %build
@@ -31,9 +33,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
-# Install Fedora config as the default.
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
 
 # Take care of files that may be generated later.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
@@ -56,16 +59,35 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%triggerin -- bash-completion
+if [ ! -e %{_sysconfdir}/bash_completion.d/rpmlint ] ; then
+  ln -s %{_datadir}/rpmlint/rpmlint.bash-completion \
+    %{_sysconfdir}/bash_completion.d/rpmlint
+fi
+
+%triggerun -- bash-completion
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/rpmlint
+
+
 %files -f %{name}-%{version}-files.list
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
+%{_datadir}/rpmlint/rpmlint.bash-completion
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%ghost %{_sysconfdir}/bash_completion.d/rpmlint
 
 
 %changelog
+* 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).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:18:56 -0000	1.3
+++ sources	29 Jan 2005 20:37:55 -0000	1.4
@@ -1 +1 @@
-1e43509038848f1d8256a7ab2efe527b  rpmlint-0.61.tar.bz2
+7e238f5121e2451fc1e100a4f13f26f0  rpmlint-0.65.tar.bz2