Hello community,
here is the log from the commit of package checkinstall for openSUSE:Factory
checked in at Wed Dec 16 15:55:37 CET 2009.
--------
--- checkinstall/checkinstall.changes 2009-08-26 13:07:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/checkinstall/checkinstall.changes 2009-12-14 14:24:31.000000000 +0100
@@ -1,0 +2,30 @@
+Mon Dec 14 14:20:08 CET 2009 - pth@suse.de
+
+- Fix typo in checkinstall.in
+
+-------------------------------------------------------------------
+Mon Dec 14 02:28:41 UTC 2009 - pth@novell.com
+
+- Fix definition of Glibc minor version in installwatch/create_localedef.
+- Fix patch for scandir/scandir64 declaration.
+- Prototypes for scandir and scandir64 changed with glibc 2.10
+ so modify patch to supply both old and new one depending on
+ glibc version.
+
+-------------------------------------------------------------------
+Sun Dec 13 20:40:45 UTC 2009 - pth@novell.com
+
+- Compress tarball and patch with bzip2 to be able to build
+ checkinstall on distributions that don't have xz.
+
+-------------------------------------------------------------------
+Mon Dec 7 19:45:23 CET 2009 - pth@suse.de
+
+- Update to CVS from June to get the support of *at() function (bnc#432497).
+- Adapt patches as needed.
+- Pass rpmbuild the buildroot to use to override default (bnc#561317).
+- Translations now use UTF-8 encoding where not already doing so.
+- Change occurances of `` ikn checkinstall to $().
+- Compress with xz instead of lzma.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
checkinstall-1.6.1.tar.bz2
checkinstall-1.6.1-translations.patch
checkinstall-add_fchmodat.patch
checkinstall-codecleanup.patch
checkinstall-installwatch_use_mktemp.patch
checkinstall-libdir64.patch
checkinstall-readlink.patch
checkinstall-test_with_DESTDIR.patch
New:
----
checkinstall-20090609.tar.bz2
checkinstall-translations.patch.bz2
installwatch-glibc_minor.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ checkinstall.spec ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:43.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:43.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package checkinstall (Version 1.6.1)
+# spec file for package checkinstall (Version 20090609)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,31 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# norootforbuild
Name: checkinstall
Summary: "make install" Installation Tracker
-Version: 1.6.1
-Release: 105
-License: GPL v2 or later
+Version: 20090609
+Release: 1
+License: GPLv2+
Group: Development/Tools/Building
Url: http://asic-linux.com.mx/~izto/checkinstall/
Source: checkinstall-%{version}.tar.bz2
Source1: checkinstall.in
Source2: checkinstallrc-dist.in
-Patch: checkinstall-glibc_bug.patch
+Patch0: checkinstall-glibc_bug.patch
Patch2: checkinstall-destdir.patch
Patch3: checkinstall-makefile_cleanup.patch
-Patch4: checkinstall-codecleanup.patch
Patch6: checkinstall-no_fortify_source.patch
-Patch7: checkinstall-libdir64.patch
-Patch13: checkinstall-readlink.patch
-Patch14: checkinstall-1.6.1-translations.patch
+Patch14: checkinstall-translations.patch.bz2
Patch15: checkinstall-install_paths.patch
-Patch16: checkinstall-test_with_DESTDIR.patch
-Patch17: checkinstall-installwatch_use_mktemp.patch
-Patch18: checkinstall-add_fchmodat.patch
Patch19: checkinstall-scandir.patch
+Patch10: installwatch-glibc_minor.patch
Provides: installwatch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,29 +55,24 @@
%prep
%setup -q
-%patch
+%patch0
%patch2
%patch3
-%patch4
%patch6
-%patch7
-%patch13
%patch14
%patch15
-%patch16
-%patch17
-%patch18
+#%patch16
%patch19
+%patch10
cp -t . %{S:1} %{S:2}
rm -f checkinstall checkinstallrc-dist
rename -no -nb locale/*.po
%build
make CFLAGS="%{optflags}"
-
-%check
-cd installwatch-*
-make CFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} test
+#%check
+#cd installwatch
+#make CFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} test
%install
make CFLAGS="%{optflags}" DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%_lib install
@@ -97,6 +88,6 @@
/usr/sbin/makepak
%docdir /usr/share/doc/packages/checkinstall
/usr/share/locale/es/LC_MESSAGES/checkinstall.mo
-%doc doc-pak/*
+%doc
%changelog
++++++ checkinstall-1.6.1.tar.bz2 -> checkinstall-20090609.tar.bz2 ++++++
++++ 14783 lines of diff (skipped)
++++++ checkinstall-destdir.patch ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:43.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:43.000000000 +0100
@@ -1,16 +1,18 @@
---- Makefile
-+++ Makefile
+Index: Makefile
+===================================================================
+--- Makefile.orig 2009-06-06 22:41:12.000000000 +0200
++++ Makefile 2009-12-07 15:00:06.998174340 +0100
@@ -1,6 +1,7 @@
- # $Id: Makefile,v 1.6.1.3 2006/11/01 07:45:28 izto Exp $
+ # $Id: Makefile,v 1.6.2.1 2008/11/09 07:48:18 izto Exp $
# Where to install.
+DESTDIR=
PREFIX=/usr/local
BINDIR=$(PREFIX)/sbin
LCDIR=$(PREFIX)/lib/checkinstall/locale
-@@ -25,20 +26,20 @@
+@@ -25,20 +26,20 @@ install: all
export
- make -C installwatch-0.7.0beta5 install
+ $(MAKE) -C installwatch install
- mkdir -p $(BINDIR)
- install checkinstall makepak $(BINDIR)
@@ -37,7 +39,7 @@
else \
echo; \
echo; \
-@@ -47,7 +48,7 @@
+@@ -47,7 +48,7 @@ install: all
echo An existing checkinstallrc file has been found. ;\
echo The one from this distribution can be found at: ; \
echo; \
@@ -46,8 +48,10 @@
echo; \
echo; \
echo ======================================================== ;\
---- installwatch-0.7.0beta5/Makefile
-+++ installwatch-0.7.0beta5/Makefile
+Index: installwatch/Makefile
+===================================================================
+--- installwatch/Makefile.orig 2009-06-06 22:41:12.000000000 +0200
++++ installwatch/Makefile 2009-12-07 15:02:49.622561338 +0100
@@ -5,6 +5,7 @@
# Make sure the directory you specify exists.
@@ -56,7 +60,7 @@
# End of configurable part
-@@ -25,19 +26,19 @@
+@@ -25,19 +26,19 @@ localdecls.h: create-localdecls
./create-localdecls
install: all
@@ -69,7 +73,7 @@
+ if [ -r $(DESTDIR)$(LIBDIR)/installwatch.so ]; then \
+ rm -f $(DESTDIR)$(LIBDIR)/installwatch.so; \
fi
-- install -s installwatch.so $(LIBDIR)
+- install installwatch.so $(LIBDIR)
+ install -s installwatch.so $(DESTDIR)$(LIBDIR)
- sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch
@@ -85,3 +89,11 @@
clean:
rm -f *~ *.bak *.o installwatch.so core localdecls.h libctest test-installwatch
+@@ -47,6 +48,6 @@ tarball: clean
+
+ test: install
+ gcc -Wall -DVERSION=\"$(VERSION)\" -o test-installwatch test-installwatch.c -ldl
+- $(PREFIX)/bin/installwatch ./test-installwatch
++ $(DESTDIR)$(PREFIX)/bin/installwatch ./test-installwatch
+
+
++++++ checkinstall-glibc_bug.patch ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:43.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:43.000000000 +0100
@@ -1,6 +1,8 @@
---- installwatch-0.7.0beta5/installwatch.c
-+++ installwatch-0.7.0beta5/installwatch.c
-@@ -2279,12 +2279,12 @@
+Index: installwatch/installwatch.c
+===================================================================
+--- installwatch/installwatch.c.orig 2009-12-07 14:53:21.000000000 +0100
++++ installwatch/installwatch.c 2009-12-07 14:56:43.830174950 +0100
+@@ -2526,12 +2526,12 @@ int fchown(int fd, uid_t owner, gid_t gr
return result;
}
@@ -14,15 +16,15 @@
if (!libc_handle)
initialize();
-@@ -2308,6 +2308,7 @@
+@@ -2555,6 +2555,7 @@ FILE *fopen(const char *pathname, const
#endif
if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+') {
+ REFCOUNT;
backup(instw.truepath);
instw_apply(&instw);
- log("%d\tfopen\t%s\t#%s\n",(int)result,
-@@ -2332,6 +2333,7 @@
+ logg("%" PRIdPTR "\tfopen\t%s\t#%s\n",(intptr_t)result,
+@@ -2579,6 +2580,7 @@ FILE *fopen(const char *pathname, const
return result;
}
@@ -30,7 +32,7 @@
int ftruncate(int fd, TRUNCATE_T length) {
int result;
-@@ -3220,13 +3222,12 @@
+@@ -3552,13 +3554,12 @@ int ftruncate64(int fd, __off64_t length
return result;
}
@@ -45,7 +47,7 @@
if (!libc_handle)
initialize();
-@@ -3249,6 +3250,7 @@
+@@ -3581,6 +3582,7 @@ FILE *fopen64(const char *pathname, cons
#endif
if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+') {
@@ -53,7 +55,7 @@
backup(instw.truepath);
instw_apply(&instw);
}
-@@ -3271,6 +3273,7 @@
+@@ -3603,6 +3605,7 @@ FILE *fopen64(const char *pathname, cons
return result;
}
@@ -61,8 +63,10 @@
int open64(const char *pathname, int flags, ...) {
/* Eventually, there is a third parameter: it's mode_t mode */
---- installwatch-0.7.0beta5/test-installwatch.c
-+++ installwatch-0.7.0beta5/test-installwatch.c
+Index: installwatch/test-installwatch.c
+===================================================================
+--- installwatch/test-installwatch.c.orig 2009-12-07 14:53:21.000000000 +0100
++++ installwatch/test-installwatch.c 2009-12-07 14:56:43.830174950 +0100
@@ -17,6 +17,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -72,7 +76,7 @@
#include
#include
#include
-@@ -287,7 +289,7 @@
+@@ -287,7 +289,7 @@ int main(int argc, char **argv) {
puts("Testing installwatch " VERSION);
puts("Using " TESTFILE " and " TESTFILE2 " as a test files\n");
passed = failed = 0;
@@ -81,7 +85,7 @@
do_test("chown", test_chown, 3);
do_test("chroot", test_chroot, 1);
do_test("creat", test_creat, 2);
-@@ -296,10 +298,12 @@
+@@ -296,10 +298,12 @@ int main(int argc, char **argv) {
#endif
do_test("fchmod", test_fchmod, 3);
do_test("fchown", test_fchown, 3);
++++++ checkinstall.in ++++++
++++ 1512 lines (skipped)
++++ between checkinstall/checkinstall.in
++++ and /mounts/work_src_done/STABLE/checkinstall/checkinstall.in
++++++ checkinstall-install_paths.patch ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:43.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:43.000000000 +0100
@@ -1,5 +1,7 @@
---- Makefile
-+++ Makefile
+Index: Makefile
+===================================================================
+--- Makefile.orig 2009-12-07 15:00:06.000000000 +0100
++++ Makefile 2009-12-07 17:13:30.609857562 +0100
@@ -4,8 +4,8 @@
DESTDIR=
PREFIX=/usr/local
@@ -11,16 +13,16 @@
all:
for file in locale/checkinstall-*.po ; do \
-@@ -22,7 +22,7 @@
+@@ -22,7 +22,7 @@ all:
done
- make -C installwatch-0.7.0beta5
+ $(MAKE) -C installwatch
-install: all
+install: all checkinstall checkinstallrc-dist
export
- make -C installwatch-0.7.0beta5 install
+ $(MAKE) -C installwatch install
-@@ -54,9 +54,16 @@
+@@ -54,9 +54,16 @@ install: all
echo ======================================================== ;\
echo; \
fi
@@ -37,10 +39,12 @@
rm -f $${file} ; \
done
+ rm -f checkinstall checkinstallrc-dist
- make -C installwatch-0.7.0beta5 clean
---- NLS_SUPPORT
-+++ NLS_SUPPORT
-@@ -39,11 +39,11 @@
+ $(MAKE) -C installwatch clean
+Index: NLS_SUPPORT
+===================================================================
+--- NLS_SUPPORT.orig 2009-06-06 22:41:12.000000000 +0200
++++ NLS_SUPPORT 2009-12-07 17:06:44.049844026 +0100
+@@ -39,11 +39,11 @@ checkinstall-es.po
3) Now create the locale directory for your language. Remember to use the same
ISO codes you use in your LC_ALL environment variable:
@@ -54,9 +58,11 @@
checkinstall-es.po
(The above goes all in one line)
---- README
-+++ README
-@@ -343,7 +343,7 @@
+Index: README
+===================================================================
+--- README.orig 2009-06-06 22:41:12.000000000 +0200
++++ README 2009-12-07 17:06:44.114851291 +0100
+@@ -343,7 +343,7 @@ CHANGE in CheckInstall 1.4.0:
The variable declaration section in the checkinstall script has been removed,
you should now edit the checkinstallrc file, normally installed under
@@ -65,47 +71,11 @@
In the checkinstallrc file you will find some variables wich modify
---- RELNOTES
-+++ RELNOTES
-@@ -271,7 +271,7 @@
-
- * The variable definition section inside the checkinstall script is gone.
- Now you should edit the checkinstallrc file, normally installed under
-- /usr/local/lib/checkinstall
-+ /etc
-
- * Added an option ("--exclude") to tell checkinstall wich directories to ignore
- while searchig for modified files.
---- doc-pak/NLS_SUPPORT
-+++ doc-pak/NLS_SUPPORT
-@@ -39,11 +39,11 @@
- 3) Now create the locale directory for your language. Remember to use the same
- ISO codes you use in your LC_ALL environment variable:
-
--mkdir -p /usr/local/lib/checkinstall/locale/es_MX/LC_MESSAGES
-+mkdir -p /usr/share/locale/es_MX/LC_MESSAGES
-
- 4) Next, you should generate the .mo binary message file. Run msgfmt:
-
--msgfmt -o /usr/local/lib/checkinstall/locale/es_MX/LC_MESSAGES/checkinstall.mo \
-+msgfmt -o /usr/share/locale/es_MX/LC_MESSAGES/checkinstall.mo \
- checkinstall-es.po
-
- (The above goes all in one line)
---- doc-pak/README
-+++ doc-pak/README
-@@ -343,7 +343,7 @@
-
- The variable declaration section in the checkinstall script has been removed,
- you should now edit the checkinstallrc file, normally installed under
-- /usr/local/lib/checkinstall.
-+ /etc.
-
-
- In the checkinstallrc file you will find some variables wich modify
---- doc-pak/RELNOTES
-+++ doc-pak/RELNOTES
-@@ -271,7 +271,7 @@
+Index: RELNOTES
+===================================================================
+--- RELNOTES.orig 2009-06-06 22:41:12.000000000 +0200
++++ RELNOTES 2009-12-07 17:06:44.149911880 +0100
+@@ -271,7 +271,7 @@ linked binaries and .deb packaging forma
* The variable definition section inside the checkinstall script is gone.
Now you should edit the checkinstallrc file, normally installed under
++++++ checkinstall-makefile_cleanup.patch ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:43.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:43.000000000 +0100
@@ -1,12 +1,14 @@
---- installwatch-0.7.0beta5/Makefile
-+++ installwatch-0.7.0beta5/Makefile
-@@ -14,13 +14,18 @@
+Index: installwatch/Makefile
+===================================================================
+--- installwatch/Makefile.orig 2009-12-07 15:02:49.000000000 +0100
++++ installwatch/Makefile 2009-12-07 15:07:05.837675962 +0100
+@@ -14,13 +14,18 @@ VERSION=0.7.0beta7
BINDIR=$(PREFIX)/bin
LIBDIR=$(PREFIX)/lib
-+LIBS = -ldl
-+DEFINES = -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\"
-+CFLAGS = -Wall
++LIBS = -ldl
++DEFINES = -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\"
++CFLAGS = -Wall
+ALL_CFLAGS = $(CFLAGS) $(DEFINES)
+
all: installwatch.so
@@ -18,15 +20,14 @@
- gcc -Wall -c -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\" installwatch.c
+ gcc $(ALL_CFLAGS) -c installwatch.c
- localdecls.h:
+ localdecls.h: create-localdecls
./create-localdecls
-@@ -47,7 +52,7 @@
+@@ -47,7 +52,7 @@ tarball: clean
tar -czvC .. -f ../installwatch-$(VERSION).tar.gz installwatch-$(VERSION)
test: install
- gcc -Wall -DVERSION=\"$(VERSION)\" -o test-installwatch test-installwatch.c -ldl
-- $(PREFIX)/bin/installwatch ./test-installwatch
+ gcc $(ALL_CFLAGS) -o test-installwatch test-installwatch.c $(LIBS)
-+ $(DESTDIR)$(PREFIX)/bin/installwatch ./test-installwatch
+ $(DESTDIR)$(PREFIX)/bin/installwatch ./test-installwatch
++++++ checkinstall-no_fortify_source.patch ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:43.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:43.000000000 +0100
@@ -1,11 +1,13 @@
---- installwatch-0.7.0beta5/Makefile
-+++ installwatch-0.7.0beta5/Makefile
-@@ -15,7 +15,7 @@
+Index: installwatch/Makefile
+===================================================================
+--- installwatch/Makefile.orig 2009-12-07 15:07:05.000000000 +0100
++++ installwatch/Makefile 2009-12-07 16:20:35.557745354 +0100
+@@ -15,7 +15,7 @@ BINDIR=$(PREFIX)/bin
LIBDIR=$(PREFIX)/lib
- LIBS = -ldl
--DEFINES = -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\"
-+DEFINES = -U_FORTIFY_SOURCE -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\"
- CFLAGS = -Wall
+ LIBS = -ldl
+-DEFINES = -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\"
++DEFINES = -U_FORTIFY_SOURCE -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT -DVERSION=\"$(VERSION)\"
+ CFLAGS = -Wall
ALL_CFLAGS = $(CFLAGS) $(DEFINES)
++++++ checkinstallrc-dist.in ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:44.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:44.000000000 +0100
@@ -49,8 +49,7 @@
# R : RPM
# D : Debian
-INSTYPE="R"
-CK_REDHAT=1
+INSTYPE=""
# Storage directory for newly created packages
# By default they will be stored at the default
@@ -85,7 +84,7 @@
DEL_DESC=1
# Automatically strip all ELF binaries?
-STRIP_ELF=0
+STRIP_ELF=1
# Automatically strip all ELF shared libraries?
# Note: this setting will automatically be set to "0" if STRIP_ELF=0
++++++ checkinstall-scandir.patch ++++++
--- /var/tmp/diff_new_pack.1yQsbR/_old 2009-12-16 15:54:44.000000000 +0100
+++ /var/tmp/diff_new_pack.1yQsbR/_new 2009-12-16 15:54:44.000000000 +0100
@@ -1,20 +1,52 @@
---- installwatch-0.7.0beta5/installwatch.c
-+++ installwatch-0.7.0beta5/installwatch.c
-@@ -2870,7 +2870,7 @@
+Index: installwatch/installwatch.c
+===================================================================
+--- installwatch/installwatch.c.orig
++++ installwatch/installwatch.c
+@@ -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 ***,
+ int (*)(const struct dirent *),
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
+ int (*)(const void *,const void *));
++#else
++ int (*)(const struct dirent**,const struct dirent **));
++#endif
+ 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 *,
+ static struct dirent64 *(*true_readdir64)(DIR *dir);
+ static int (*true_scandir64)( const char *,struct dirent64 ***,
+ int (*)(const struct dirent64 *),
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
+ int (*)(const void *,const void *));
++#else
++ int (*)(const struct dirent64 **,const struct dirent64 **));
++#endif
+ 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);
+@@ -3081,7 +3089,11 @@ int rmdir(const char *pathname) {
int scandir( const char *dir,struct dirent ***namelist,
int (*select)(const struct dirent *),
-- int (*compar)(const void *,const void *) ) {
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
+ int (*compar)(const void *,const void *) ) {
++#else
+ int (*compar)(const struct dirent **,const struct dirent **) ) {
++#endif
int result;
if (!libc_handle)
-@@ -3403,7 +3403,7 @@
+@@ -3694,7 +3706,11 @@ struct dirent64 *readdir64(DIR *dir) {
int scandir64( const char *dir,struct dirent64 ***namelist,
int (*select)(const struct dirent64 *),
-- int (*compar)(const void *,const void *) ) {
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 10
+ int (*compar)(const void *,const void *) ) {
++#else
+ int (*compar)(const struct dirent64 **,const struct dirent64 **) ) {
++#endif
int result;
if (!libc_handle)
++++++ checkinstall-translations.patch.bz2 ++++++
++++ 3170 lines (skipped)
++++++ installwatch-glibc_minor.patch ++++++
Index: installwatch/create-localdecls
===================================================================
--- installwatch/create-localdecls.orig
+++ installwatch/create-localdecls
@@ -64,37 +64,8 @@ if test "$VERSION" = 'libc.so.6' ; then
case "$OsLibcMajor" in
2)
# 2 is the glibc version
- case "$OsLibcMinor" in
- 0)
- echo '#define GLIBC_MINOR 0' >> $OUTFILE
- SUBVERSION='glibc-2.0' ;;
- 1)
- echo '#define GLIBC_MINOR 1' >> $OUTFILE
- SUBVERSION='glibc-2.1' ;;
- 2)
- echo '#define GLIBC_MINOR 2' >> $OUTFILE
- SUBVERSION='glibc-2.2' ;;
- 3)
- echo '#define GLIBC_MINOR 3' >> $OUTFILE
- SUBVERSION='glibc-2.3' ;;
- 4)
- echo '#define GLIBC_MINOR 4' >> $OUTFILE
- SUBVERSION='glibc-2.4' ;;
- 5)
- echo '#define GLIBC_MINOR 5' >> $OUTFILE
- SUBVERSION='glibc-2.5' ;;
- 6)
- echo '#define GLIBC_MINOR 6' >> $OUTFILE
- SUBVERSION='glibc-2.6' ;;
- 7)
- echo '#define GLIBC_MINOR 7' >> $OUTFILE
- SUBVERSION='glibc-2.7' ;;
- *)
- echo 'Treated as glibc >= 2.1 (finger crossed)'
- echo '#define GLIBC_MINOR 1' >> $OUTFILE
- SUBVERSION='glibc-2.1' ;;
- esac
- ;;
+ echo '#define GLIBC_MINOR __GLIBC_MINOR__' >> $OUTFILE
+ SUBVERSION="glibc-2.$OsLibcMajor" ;;
esac
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org