Hello community, here is the log from the commit of package checkinstall for openSUSE:Factory checked in at Sat Dec 26 11:48:55 CET 2009. -------- --- checkinstall/checkinstall.changes 2009-12-14 14:24:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/checkinstall/checkinstall.changes 2009-12-16 03:42:10.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Dec 16 02:41:40 UTC 2009 - pth@novell.com + +- Fix typo in scandir patch. + +------------------------------------------------------------------- +Tue Dec 15 09:57:38 UTC 2009 - pth@novell.com + +- Don't use -t option for cp s older versions don't understand it. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ checkinstall.spec ++++++ --- /var/tmp/diff_new_pack.bxX04B/_old 2009-12-26 11:48:14.000000000 +0100 +++ /var/tmp/diff_new_pack.bxX04B/_new 2009-12-26 11:48:14.000000000 +0100 @@ -21,7 +21,7 @@ Name: checkinstall Summary: "make install" Installation Tracker Version: 20090609 -Release: 1 +Release: 2 License: GPLv2+ Group: Development/Tools/Building Url: http://asic-linux.com.mx/~izto/checkinstall/ @@ -64,7 +64,7 @@ #%patch16 %patch19 %patch10 -cp -t . %{S:1} %{S:2} +cp %{S:1} %{S:2} ./ rm -f checkinstall checkinstallrc-dist rename -no -nb locale/*.po ++++++ checkinstall-scandir.patch ++++++ --- /var/tmp/diff_new_pack.bxX04B/_old 2009-12-26 11:48:14.000000000 +0100 +++ /var/tmp/diff_new_pack.bxX04B/_new 2009-12-26 11:48:14.000000000 +0100 @@ -2,6 +2,15 @@ =================================================================== --- installwatch/installwatch.c.orig +++ installwatch/installwatch.c +@@ -88,7 +88,7 @@ static int (*true_xmknod)(int ver,const + static int (*true_open)(const char *, int, ...); + static DIR *(*true_opendir)(const char *); + static struct dirent *(*true_readdir)(DIR *dir); +-#if (GLIBC_MINOR <= 4) ++#if (__GLIBC_MINOR__ < 4) || (__GLIBC_MINOR__ == 4 && defined(__i386)) + static int (*true_readlink)(const char*,char *,size_t); + #else + static ssize_t (*true_readlink)(const char*,char *,size_t); @@ -100,7 +100,11 @@ static int (*true_xstat)(int,const char static int (*true_lxstat)(int,const char *,struct stat *); static int (*true_scandir)( const char *,struct dirent ***, @@ -14,7 +23,16 @@ static int (*true_symlink)(const char *, const char *); static int (*true_truncate)(const char *, TRUNCATE_T); static int (*true_unlink)(const char *); -@@ -120,7 +124,11 @@ static int (*true_open64)(const char *, +@@ -111,7 +115,7 @@ static int (*true_setxattr)(const char * + size_t, int); + static int (*true_removexattr)(const char *,const char *); + +-#if(GLIBC_MINOR >= 1) ++#if(__GLIBC_MINOR__ >= 1) + + static int (*true_creat64)(const char *, __mode_t); + static FILE *(*true_fopen64)(const char *,const char *); +@@ -120,14 +124,18 @@ static int (*true_open64)(const char *, static struct dirent64 *(*true_readdir64)(DIR *dir); static int (*true_scandir64)( const char *,struct dirent64 ***, int (*)(const struct dirent64 *), @@ -26,6 +44,77 @@ static int (*true_xstat64)(int,const char *, struct stat64 *); static int (*true_lxstat64)(int,const char *, struct stat64 *); static int (*true_truncate64)(const char *, __off64_t); + + #endif + +-#if (GLIBC_MINOR >= 4) ++#if (__GLIBC_MINOR__ >= 4) + static int (*true_openat)(int, const char *, int, ...); + static int (*true_fchmodat)(int, const char *, mode_t, int); + static int (*true_fchownat)(int, const char *, uid_t, gid_t, int); +@@ -160,7 +168,7 @@ static inline int true_lstat(const char + return true_lxstat(_STAT_VER,pathname,info); + } + +-#if (GLIBC_MINOR >= 4) ++#if (__GLIBC_MINOR__ >= 4) + static inline int true_fstatat(int dirfd, const char *pathname, struct stat *info, int flags) { + return true_fxstatat(_STAT_VER, dirfd, pathname, info, flags); + } +@@ -267,7 +275,7 @@ int parse_suffix(char *,char *,const cha + + #if DEBUG + static int __instw_printdirent(struct dirent*); +-#if(GLIBC_MINOR >= 1) ++#if(__GLIBC_MINOR__ >= 1) + static int __instw_printdirent64(struct dirent64*); + #endif + #endif +@@ -285,7 +293,7 @@ static int instw_delete(instw_t *); + static int instw_setmetatransl(instw_t *); + + static int instw_setpath(instw_t *,const char *); +-#if (GLIBC_MINOR >= 4) ++#if (__GLIBC_MINOR__ >= 4) + static int instw_setpathrel(instw_t *, int, const char *); + #endif + static int instw_getstatus(instw_t *,int *); +@@ -374,7 +382,7 @@ static void initialize(void) { + + + +-#if(GLIBC_MINOR >= 1) ++#if(__GLIBC_MINOR__ >= 1) + true_creat64 = dlsym(libc_handle, "creat64"); + true_fopen64 = dlsym(libc_handle, "fopen64"); + true_ftruncate64 = dlsym(libc_handle, "ftruncate64"); +@@ -387,7 +395,7 @@ static void initialize(void) { + true_removexattr = dlsym(libc_handle, "removexattr"); + #endif + +-#if (GLIBC_MINOR >= 4) ++#if (__GLIBC_MINOR__ >= 4) + + true_openat = dlsym(libc_handle, "openat"); + true_fchmodat = dlsym(libc_handle, "fchmodat"); +@@ -1669,7 +1677,7 @@ static int instw_setpath(instw_t *instw, + * returns = / 0 ok. path set + * -1 failed. cf errno / + */ +-#if (GLIBC_MINOR >= 4) ++#if (__GLIBC_MINOR__ >= 4) + static int instw_setpathrel(instw_t *instw, int dirfd, const char *relpath) { + + /* This constant should be large enough to make a string that holds +@@ -2940,7 +2948,7 @@ struct dirent *readdir(DIR *dir) { + return result; + } + +-#if (GLIBC_MINOR <= 4) ++#if (__GLIBC_MINOR__ < 4) || (__GLIBC_MINOR__ == 4 && defined(__i386)) + int readlink(const char *path,char *buf,size_t bufsiz) { + int result; + #else @@ -3081,7 +3089,11 @@ int rmdir(const char *pathname) { int scandir( const char *dir,struct dirent ***namelist, @@ -38,6 +127,15 @@ int result; if (!libc_handle) +@@ -3496,7 +3508,7 @@ int removexattr (const char *pathname, c + return result; + } + +-#if(GLIBC_MINOR >= 1) ++#if(__GLIBC_MINOR__ >= 1) + + int creat64(const char *pathname, __mode_t mode) { + /* Is it a system call? */ @@ -3694,7 +3706,11 @@ struct dirent64 *readdir64(DIR *dir) { int scandir64( const char *dir,struct dirent64 ***namelist, @@ -50,3 +148,27 @@ int result; if (!libc_handle) +@@ -3837,7 +3853,7 @@ int truncate64(const char *path, __off64 + return result; + } + +-#endif /* GLIBC_MINOR >= 1 */ ++#endif /* __GLIBC_MINOR__ >= 1 */ + + + /*********************************************** +@@ -3857,7 +3873,7 @@ int truncate64(const char *path, __off64 + * Thanks to Gilbert Ashley for his work on this! + */ + +-#if (GLIBC_MINOR >= 4) ++#if (__GLIBC_MINOR__ >= 4) + + int openat (int dirfd, const char *path, int flags, ...) { + mode_t mode = 0; +@@ -4523,4 +4539,4 @@ int unlinkat (int dirfd, const char *pat + } + + +-#endif /* GLIBC_MINOR >= 4 */ ++#endif /* __GLIBC_MINOR__ >= 4 */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org