- don't classify files in /dev (#146623).

CVS patchset: 7763
CVS date: 2005/02/13 20:39:50

diff --git a/CHANGES b/CHANGES
index 733a7c8..35a248a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@
        - macosx: change to --prefix=/usr rather than /opt/local.
        - use waitpid rather than SIGCHLD reaper.
        - rip out DB_PRIVATE revert if not NPTL, it's not the right thing to do.
+       - don't classify files in /dev (#146623).
 
 4.3.3 -> 4.4:
        - pentium3/pentium4 arch support (pluto@PLD).

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 48b5fe6..fe69792 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1216,6 +1216,9 @@ assert(s != NULL);
 /*@-branchstate@*/
        if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
            ftype = "Perl5 module source text";
+       /* XXX skip all files in /dev/, as they are usually %dev dummies. */
+       else if (slen >= sizeof("/dev/") && strncmp(s, "/dev/", sizeof("/dev/")-1))
+           ftype = "";
        else {
            ftype = magic_file(ms, s);
            if (ftype == NULL) {

diff --git a/rpm.spec.in b/rpm.spec.in
index 5f711a3..9e84fab 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -20,7 +20,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.24
+Release: 1
 Group: System Environment/Base
 Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz
 License: GPL
@@ -500,6 +500,9 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Sun Feb 13 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-1
+- don't classify files in /dev (#146623).
+
 * Sat Feb 12 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.24
 - zlib: uniqify certain symbols to prevent name space pollution.
 - macosx: include <sys/types.h> so that python sees the u_char typedef.