Hello community,
here is the log from the commit of package checkinstall
checked in at Thu Mar 29 16:20:49 CEST 2007.
--------
--- checkinstall/checkinstall.changes 2007-02-12 00:55:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/checkinstall/checkinstall.changes 2007-03-29 15:06:01.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Mar 29 15:05:09 CEST 2007 - pth@suse.de
+
+- Update to 1.6.1:
+ - Fixed the famous getcwd() bug
+ - Added translations for Indonesianj, Italian, Norwegian, German,
+ Chinese, Japanese
+- Fix installation paths
+- Substitute paths in checkinstallrc-dist and checkinstll as
+ configured for building.
+- Make test work when DESTDIR is used.
+
+-------------------------------------------------------------------
Old:
----
checkinstall-1.6.0.diff
checkinstall-1.6.0-reloadsyms.patch
checkinstall-1.6.0.tar.bz2
checkinstall-avoid_buildroot_symlink.patch
checkinstall-no_double_slash.patch
checkinstall-no_leading_komma_in_spec.patch
checkinstall-singleline-version.patch
New:
----
checkinstall-1.6.1-reloadsyms.patch
checkinstall-1.6.1.tar.bz2
checkinstall-1.6.1-translations.patch
checkinstall-glibc_bug.patch
checkinstall.in
checkinstall-install_paths.patch
checkinstallrc-dist.in
checkinstall-test_with_DESTDIR.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ checkinstall.spec ++++++
--- /var/tmp/diff_new_pack.Xn1563/_old 2007-03-29 16:18:48.000000000 +0200
+++ /var/tmp/diff_new_pack.Xn1563/_new 2007-03-29 16:18:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package checkinstall (Version 1.6.0)
+# spec file for package checkinstall (Version 1.6.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,24 +12,25 @@
Name: checkinstall
Summary: "make install" Installation Tracker
-Version: 1.6.0
-Release: 39
+Version: 1.6.1
+Release: 1
License: GNU General Public License (GPL)
Group: Development/Tools/Building
URL: http://asic-linux.com.mx/~izto/checkinstall/
Source: checkinstall-%{version}.tar.bz2
-Patch: checkinstall-%{version}.diff
+Source1: checkinstall.in
+Source2: checkinstallrc-dist.in
+Patch: checkinstall-glibc_bug.patch
Patch1: checkinstall-%{version}-reloadsyms.patch
Patch2: checkinstall-destdir.patch
Patch3: checkinstall-makefile_cleanup.patch
Patch4: checkinstall-codecleanup.patch
Patch6: checkinstall-no_fortify_source.patch
Patch7: checkinstall-libdir64.patch
-Patch8: checkinstall-no_leading_komma_in_spec.patch
-Patch9: checkinstall-no_double_slash.patch
-Patch11: checkinstall-avoid_buildroot_symlink.patch
-Patch12: checkinstall-singleline-version.patch
Patch13: checkinstall-readlink.patch
+Patch14: checkinstall-1.6.1-translations.patch
+Patch15: checkinstall-install_paths.patch
+Patch16: checkinstall-test_with_DESTDIR.patch
Provides: installwatch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -55,47 +56,27 @@
%patch4
%patch6
%patch7
-%patch8
-%patch9
-%patch11
-%patch12
%patch13
-for file in $(grep -rl usr/local/lib/checkinstall --exclude='*,v' .)
-do
- sed 's|usr/local/lib/checkinstall|etc|g' $file >$file.new
- mv $file.new $file
-done
-for file in $(grep --exclude='*,v' -rl usr/local .)
-do
- sed 's|usr/local|usr|g' $file >$file.new
- mv $file.new $file
-done
-for file in `grep -rl etc/locale .`
-do
- sed 's,etc/locale,usr/share/locale,g' $file >$file.new
- mv $file.new $file
-done
+%patch14
+%patch15
+%patch16
+cp -t . %{S:1} %{S:2}
+rm -f checkinstall checkinstallrc-dist
+rename -no -nb locale/*.po
%build
make CFLAGS="%{optflags}"
cd installwatch-*
-make CFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} test
-export LC_ALL=en_US
-make CFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} test
-#LIBDIR=$PWD
-#INSTALLWATCHFILE=$PWD/log LD_PRELOAD=./installwatch.so ./test-installwatch
+make CFLAGS="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} test
%install
-# to trigger possible bug in glibc in case it shows up again:
-export LC_ALL=en_US
make CFLAGS="%{optflags}" DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%_lib install
-rm -f %{buildroot}/etc/checkinstallrc # won't get reinstalled otherwise
-installwatch -o log make CFLAGS="%{optflags}" DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%_lib install
-find | grep -e COPYING -e INSTALL -e VERSION | xargs rm -v
chmod 555 %{buildroot}%{_sbindir}/checkinstall
chown root:root %{buildroot}%{_sbindir}/checkinstall
+%{find_lang} %{name}
-%files
+%files -f %{name}.lang
+%defattr(-,root,root)
%config /etc/checkinstallrc
/etc/checkinstallrc-dist
/usr/bin/installwatch
@@ -106,7 +87,16 @@
/usr/share/locale/es/LC_MESSAGES/checkinstall.mo
%doc doc-pak/*
-%changelog -n checkinstall
+%changelog
+* Thu Mar 29 2007 - pth@suse.de
+- Update to 1.6.1:
+ - Fixed the famous getcwd() bug
+ - Added translations for Indonesianj, Italian, Norwegian, German,
+ Chinese, Japanese
+- Fix installation paths
+- Substitute paths in checkinstallrc-dist and checkinstll as
+ configured for building.
+- Make test work when DESTDIR is used.
* Mon Feb 12 2007 - ro@suse.de
- build as root for now
* Thu Apr 06 2006 - ro@suse.de
++++++ checkinstall-1.6.0-reloadsyms.patch -> checkinstall-1.6.1-reloadsyms.patch ++++++
--- checkinstall/checkinstall-1.6.0-reloadsyms.patch 2006-02-11 01:24:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/checkinstall/checkinstall-1.6.1-reloadsyms.patch 2007-03-27 14:37:57.000000000 +0200
@@ -1,5 +1,5 @@
---- installwatch-0.7.0beta4/installwatch.c
-+++ installwatch-0.7.0beta4/installwatch.c
+--- installwatch-0.7.0beta5/installwatch.c
++++ installwatch-0.7.0beta5/installwatch.c
@@ -274,7 +274,14 @@
static void *libc_handle=NULL;
++++++ checkinstall-1.6.0.tar.bz2 -> checkinstall-1.6.1.tar.bz2 ++++++
++++ 15633 lines of diff (skipped)
++++++ checkinstall-1.6.1-translations.patch ++++++
++++ 1019 lines (skipped)
++++++ checkinstall-codecleanup.patch ++++++
--- /var/tmp/diff_new_pack.Xn1563/_old 2007-03-29 16:18:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Xn1563/_new 2007-03-29 16:18:49.000000000 +0200
@@ -1,6 +1,6 @@
---- installwatch-0.7.0beta4/installwatch.c
-+++ installwatch-0.7.0beta4/installwatch.c
-@@ -251,7 +251,7 @@
+--- installwatch-0.7.0beta5/installwatch.c
++++ installwatch-0.7.0beta5/installwatch.c
+@@ -253,7 +253,7 @@
;
*/
@@ -9,7 +9,7 @@
#ifdef __GNUC__
/* Tell gcc that this function behaves like printf()
* for parameters 1 and 2 */
-@@ -412,7 +412,7 @@
+@@ -418,7 +418,7 @@
}
*/
@@ -18,7 +18,7 @@
char *logname;
va_list ap;
int rcod;
-@@ -865,8 +865,8 @@
+@@ -871,8 +871,8 @@
"\td_type : %d\n"
"\td_name : \"%.*s\"\n",
entry,
@@ -29,7 +29,7 @@
entry->d_reclen,
(int)entry->d_type,
(int)entry->d_reclen,(char*)(entry->d_name)
-@@ -1378,7 +1378,7 @@
+@@ -1384,7 +1384,7 @@
*/
static int instw_setpath(instw_t *instw,const char *path) {
size_t relen;
@@ -38,7 +38,7 @@
size_t melen;
#if DEBUG
-@@ -2130,7 +2130,7 @@
+@@ -2136,7 +2136,7 @@
instw_apply(&instw);
result = true_chmod(instw.translpath, mode);
@@ -47,7 +47,7 @@
instw.reslvpath,mode,error(result));
instw_delete(&instw);
-@@ -2169,7 +2169,7 @@
+@@ -2175,7 +2175,7 @@
instw_apply(&instw);
result=true_chown(instw.translpath,owner,group);
@@ -56,7 +56,7 @@
instw.reslvpath,owner,group,error(result));
instw_delete(&instw);
-@@ -2196,7 +2196,7 @@
+@@ -2202,7 +2202,7 @@
* From now on, another log file will be written if
* INSTW_LOGFILE is set
*/
@@ -65,7 +65,7 @@
return result;
}
-@@ -2232,7 +2232,7 @@
+@@ -2238,7 +2238,7 @@
instw_apply(&instw);
result = true_open(instw.translpath,O_CREAT|O_WRONLY|O_TRUNC,mode);
@@ -74,7 +74,7 @@
instw_delete(&instw);
-@@ -2252,7 +2252,7 @@
+@@ -2258,7 +2258,7 @@
#endif
result = true_fchmod(filedes, mode);
@@ -83,7 +83,7 @@
return result;
}
-@@ -2269,13 +2269,13 @@
+@@ -2275,13 +2275,13 @@
#endif
result = true_fchown(fd, owner, group);
@@ -99,7 +99,7 @@
instw_t instw;
int status=0;
-@@ -2305,7 +2305,7 @@
+@@ -2311,7 +2311,7 @@
REFCOUNT;
backup(instw.truepath);
instw_apply(&instw);
@@ -108,7 +108,7 @@
instw.reslvpath,error(result));
}
-@@ -2320,7 +2320,7 @@
+@@ -2326,7 +2326,7 @@
}
if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+')
@@ -117,7 +117,7 @@
instw.reslvpath,error(result));
instw_delete(&instw);
-@@ -2342,7 +2342,7 @@
+@@ -2348,7 +2348,7 @@
#endif
result = true_ftruncate(fd, length);
@@ -126,7 +126,7 @@
return result;
}
-@@ -2429,7 +2429,7 @@
+@@ -2448,7 +2448,7 @@
instw_apply(&instw);
result=true_lchown(instw.translpath,owner,group);
@@ -135,7 +135,7 @@
instw.reslvpath,owner,group,error(result));
instw_delete(&instw);
-@@ -2473,7 +2473,7 @@
+@@ -2492,7 +2492,7 @@
instw_apply(&instw_n);
result=true_link(instw_o.translpath,instw_n.translpath);
@@ -144,7 +144,7 @@
instw_o.reslvpath,instw_n.reslvpath,error(result));
instw_delete(&instw_o);
-@@ -2512,7 +2512,7 @@
+@@ -2531,7 +2531,7 @@
instw_apply(&instw);
result=true_mkdir(instw.translpath,mode);
@@ -153,7 +153,7 @@
instw_delete(&instw);
-@@ -2550,7 +2550,7 @@
+@@ -2569,7 +2569,7 @@
backup(instw.truepath);
result=true_xmknod(version,instw.translpath,mode,dev);
@@ -162,7 +162,7 @@
instw_delete(&instw);
-@@ -2605,7 +2605,7 @@
+@@ -2624,7 +2624,7 @@
result=true_open(instw.path,flags,mode);
if(flags & (O_WRONLY | O_RDWR))
@@ -171,7 +171,7 @@
instw_delete(&instw);
-@@ -2765,7 +2765,7 @@
+@@ -2784,7 +2784,7 @@
instw_apply(&newinstw);
result=true_rename(oldinstw.translpath,newinstw.translpath);
@@ -180,7 +180,7 @@
oldinstw.reslvpath,newinstw.reslvpath,error(result));
instw_delete(&oldinstw);
-@@ -2801,7 +2801,7 @@
+@@ -2820,7 +2820,7 @@
instw_apply(&instw);
result=true_rmdir(instw.translpath);
@@ -189,7 +189,7 @@
instw_delete(&instw);
-@@ -2950,7 +2950,7 @@
+@@ -2969,7 +2969,7 @@
instw_apply(&instw_slink);
result=true_symlink(pathname,instw_slink.translpath);
@@ -198,7 +198,7 @@
result,instw.path,instw_slink.reslvpath,error(result));
-@@ -2991,7 +2991,7 @@
+@@ -3010,7 +3010,7 @@
instw_apply(&instw);
result=true_truncate(instw.translpath,length);
@@ -207,7 +207,7 @@
instw.reslvpath,(int)length,error(result));
instw_delete(&instw);
-@@ -3030,7 +3030,7 @@
+@@ -3049,7 +3049,7 @@
instw_apply(&instw);
result=true_unlink(instw.translpath);
@@ -216,7 +216,7 @@
instw_delete(&instw);
-@@ -3066,7 +3066,7 @@
+@@ -3085,7 +3085,7 @@
instw_apply(&instw);
result=true_utime(instw.translpath,newtimes);
@@ -225,7 +225,25 @@
instw_delete(&instw);
-@@ -3107,7 +3107,7 @@
+@@ -3121,7 +3121,7 @@
+ instw_apply(&instw);
+
+ result=true_utimes(instw.translpath,newtimes);
+- log("%d\tutimes\t%s\t#%s\n",result,instw.reslvpath,error(result));
++ logg("%d\tutimes\t%s\t#%s\n",result,instw.reslvpath,error(result));
+
+ instw_delete(&instw);
+
+@@ -3157,7 +3157,7 @@
+ instw_apply(&instw);
+
+ result=true_access(instw.translpath,type);
+- log("%d\taccess\t%s\t#%s\n",result,instw.reslvpath,error(result));
++ logg("%d\taccess\t%s\t#%s\n",result,instw.reslvpath,error(result));
+
+ instw_delete(&instw);
+
+@@ -3198,7 +3198,7 @@
instw_apply(&instw);
result=true_open64(instw.translpath,O_CREAT | O_WRONLY | O_TRUNC, mode);
@@ -234,7 +252,7 @@
instw_delete(&instw);
-@@ -3127,7 +3127,7 @@
+@@ -3218,7 +3218,7 @@
#endif
result = true_ftruncate64(fd, length);
@@ -243,7 +261,7 @@
return result;
}
-@@ -3175,7 +3175,7 @@
+@@ -3266,7 +3266,7 @@
}
if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+')
@@ -252,7 +270,7 @@
instw.reslvpath,error(result));
instw_delete(&instw);
-@@ -3235,7 +3235,7 @@
+@@ -3326,7 +3326,7 @@
}
if(flags & (O_WRONLY | O_RDWR))
@@ -261,7 +279,7 @@
instw.reslvpath,error(result));
instw_delete(&instw);
-@@ -3406,7 +3406,7 @@
+@@ -3497,7 +3497,7 @@
result=true_truncate64(instw.translpath,length);
@@ -270,8 +288,8 @@
instw.reslvpath,(int)length,error(result));
instw_delete(&instw);
---- installwatch-0.7.0beta4/test-installwatch.c
-+++ installwatch-0.7.0beta4/test-installwatch.c
+--- installwatch-0.7.0beta5/test-installwatch.c
++++ installwatch-0.7.0beta5/test-installwatch.c
@@ -21,6 +21,7 @@
#include
++++++ checkinstall-destdir.patch ++++++
--- /var/tmp/diff_new_pack.Xn1563/_old 2007-03-29 16:18:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Xn1563/_new 2007-03-29 16:18:49.000000000 +0200
@@ -1,65 +1,79 @@
--- Makefile
+++ Makefile
-@@ -1,15 +1,27 @@
- # $Id: Makefile,v 1.6.0.6 2004/12/01 21:36:17 izto Exp $
-+
-+DESTDIR =
-+PREFIX = /usr/local
-+
- all:
- make -C installwatch-0.7.0beta4
+@@ -1,6 +1,7 @@
+ # $Id: Makefile,v 1.6.1.3 2006/11/01 07:45:28 izto Exp $
+
+ # Where to install.
++DESTDIR=
+ PREFIX=/usr/local
+ BINDIR=$(PREFIX)/sbin
+ LCDIR=$(PREFIX)/lib/checkinstall/locale
+@@ -25,20 +26,20 @@
+ export
+ make -C installwatch-0.7.0beta5 install
- install: all
-- cp checkinstall makepak /usr/local/sbin
-+ mkdir -p $(DESTDIR)/etc
-+ mkdir -p $(DESTDIR)/$(PREFIX)/sbin
-+ mkdir -p $(DESTDIR)/$(PREFIX)/share/locale
-+ cp checkinstall makepak $(DESTDIR)/$(PREFIX)/sbin
- make -C installwatch-0.7.0beta4 install
-- mkdir -p /usr/local/lib/checkinstall/locale
-- mkdir -p /usr/local/lib/checkinstall/locale/es/LC_MESSAGES
-- cp locale/checkinstall-es.mo /usr/local/lib/checkinstall/locale/es/LC_MESSAGES/checkinstall.mo
-- cp checkinstallrc-dist /usr/local/lib/checkinstall
-- if ! [ -f /usr/local/lib/checkinstall/checkinstallrc ]; then cp /usr/local/lib/checkinstall/checkinstallrc-dist /usr/local/lib/checkinstall/checkinstallrc; else echo; echo -e "\n=============================================================================\n\nAn existing checkinstallrc file has been found.\nThe one from this distribution can be found at:\n\n\t/usr/local/lib/checkinstall/checkinstallrc-dist\n\n=============================================================================\n\n";echo ;fi
-+ mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/es/LC_MESSAGES
-+ cp locale/checkinstall-es.mo $(DESTDIR)/$(PREFIX)/share/locale/es/LC_MESSAGES/checkinstall.mo
-+ cp checkinstallrc-dist $(DESTDIR)/etc
-+ if ! [ -f $(DESTDIR)/etc/checkinstallrc ]; then \
-+ cp $(DESTDIR)/etc/checkinstallrc-dist $(DESTDIR)/etc/checkinstallrc; \
-+ else \
-+ echo; \
-+ echo -e "\n=============================================================================\n\nAn existing checkinstallrc file has been found.\nThe one from this distribution can be found at:\n\n\t$(DESTDIR)/etc/checkinstallrc-dist\n\n=============================================================================\n\n"; \
-+ echo ; \
-+ fi
+- mkdir -p $(BINDIR)
+- install checkinstall makepak $(BINDIR)
++ mkdir -p $(DESTDIR)$(BINDIR)
++ install checkinstall makepak $(DESTDIR)$(BINDIR)
+ for file in locale/*.mo ; do \
+ LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \
+ -e 's|\.mo||'` && \
+- mkdir -p $(LCDIR)/$${LANG}/LC_MESSAGES && \
+- cp $$file $(LCDIR)/$${LANG}/LC_MESSAGES/checkinstall.mo || \
++ mkdir -p $(DESTDIR)$(LCDIR)/$${LANG}/LC_MESSAGES && \
++ install $$file $(DESTDIR)$(LCDIR)/$${LANG}/LC_MESSAGES/checkinstall.mo || \
+ exit 1 ; \
+ done
- clean:
- make -C installwatch-0.7.0beta4 clean
---- installwatch-0.7.0beta4/Makefile
-+++ installwatch-0.7.0beta4/Makefile
+- mkdir -p $(CONFDIR)
+- install -m644 checkinstallrc-dist $(CONFDIR)
+- if ! [ -f $(CONFDIR)/checkinstallrc ]; then \
+- cp $(CONFDIR)/checkinstallrc-dist $(CONFDIR)/checkinstallrc; \
++ mkdir -p $(DESTDIR)$(CONFDIR)
++ install -m644 checkinstallrc-dist $(DESTDIR)$(CONFDIR)
++ if ! [ -f $(DESTDIR)$(CONFDIR)/checkinstallrc ]; then \
++ install $(DESTDIR)$(CONFDIR)/checkinstallrc-dist $(DESTDIR)$(CONFDIR)/checkinstallrc; \
+ else \
+ echo; \
+ echo; \
+@@ -47,7 +48,7 @@
+ echo An existing checkinstallrc file has been found. ;\
+ echo The one from this distribution can be found at: ; \
+ echo; \
+- echo -e \\t$(CONFDIR)/checkinstallrc-dist ; \
++ echo -e \\t$(DESTDIR)$(CONFDIR)/checkinstallrc-dist ; \
+ echo; \
+ echo; \
+ echo ======================================================== ;\
+--- installwatch-0.7.0beta5/Makefile
++++ installwatch-0.7.0beta5/Makefile
@@ -5,6 +5,7 @@
# Make sure the directory you specify exists.
PREFIX=/usr/local
-+DESTDIR =
++DESTDIR=
# End of configurable part
-@@ -25,14 +26,20 @@
+@@ -25,19 +26,19 @@
./create-localdecls
install: all
-- if [ -r $(LIBDIR)/installwatch.so ]; then rm -f $(LIBDIR)/installwatch.so; LD_PRELOAD="" cp installwatch.so $(LIBDIR); else cp installwatch.so $(LIBDIR); fi
--
-- sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch
-- chmod 755 $(BINDIR)/installwatch
+- mkdir -p $(LIBDIR)
+- mkdir -p $(BINDIR)
+- if [ -r $(LIBDIR)/installwatch.so ]; then \
+- rm -f $(LIBDIR)/installwatch.so; \
+ mkdir -p $(DESTDIR)$(LIBDIR)
-+ mkdir -p $(DESTDIR)$(BINDIR)
++ mkdir -p $(DESTDIR)$(BINDIR)
+ if [ -r $(DESTDIR)$(LIBDIR)/installwatch.so ]; then \
+ rm -f $(DESTDIR)$(LIBDIR)/installwatch.so; \
-+ LD_PRELOAD="" cp installwatch.so $(DESTDIR)$(LIBDIR); \
-+ else \
-+ cp installwatch.so $(DESTDIR)$(LIBDIR); \
-+ fi
+ fi
+- install -s installwatch.so $(LIBDIR)
++ install -s installwatch.so $(DESTDIR)$(LIBDIR)
+
+- sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch
+- chmod 755 $(BINDIR)/installwatch
+ sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(DESTDIR)$(BINDIR)/installwatch
+ chmod 755 $(DESTDIR)$(BINDIR)/installwatch
++++++ checkinstall-glibc_bug.patch ++++++
--- installwatch-0.7.0beta5/installwatch.c
+++ installwatch-0.7.0beta5/installwatch.c
@@ -2279,12 +2279,12 @@
return result;
}
+#if !defined(__s390_glibc_bug_) && !defined(__powerpc_glibc_bug_)
FILE *fopen(const char *pathname, const char *mode) {
FILE *result;
instw_t instw;
int status=0;
- REFCOUNT;
if (!libc_handle)
initialize();
@@ -2308,6 +2308,7 @@
#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 @@
return result;
}
+#endif
int ftruncate(int fd, TRUNCATE_T length) {
int result;
@@ -3220,13 +3222,12 @@
return result;
}
+#if !defined(__s390_glibc_bug_) && !defined(__powerpc_glibc_bug_)
FILE *fopen64(const char *pathname, const char *mode) {
FILE *result;
instw_t instw;
int status;
- REFCOUNT;
-
if (!libc_handle)
initialize();
@@ -3249,6 +3250,7 @@
#endif
if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+') {
+ REFCOUNT;
backup(instw.truepath);
instw_apply(&instw);
}
@@ -3271,6 +3273,7 @@
return result;
}
+#endif
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
@@ -17,6 +17,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#define _LARGEFILE64_SOURCE
+
#include
#include
#include
@@ -287,7 +289,7 @@
puts("Testing installwatch " VERSION);
puts("Using " TESTFILE " and " TESTFILE2 " as a test files\n");
passed = failed = 0;
- do_test("chmod", test_chmod, 4);
+ do_test("chmod", test_chmod, 3);
do_test("chown", test_chown, 3);
do_test("chroot", test_chroot, 1);
do_test("creat", test_creat, 2);
@@ -296,10 +298,12 @@
#endif
do_test("fchmod", test_fchmod, 3);
do_test("fchown", test_fchown, 3);
+#if !defined(__s390_glibc_bug_) && !defined(__powerpc_glibc_bug_)
do_test("fopen",test_fopen,2);
#if(GLIBC_MINOR >= 1)
do_test("fopen64",test_fopen64,2);
#endif
+#endif
do_test("ftruncate", test_ftruncate, 3);
#if(GLIBC_MINOR >= 1)
do_test("ftruncate64", test_ftruncate64, 3);
++++++ checkinstall-install_paths.patch ++++++
--- Makefile
+++ Makefile
@@ -4,8 +4,8 @@
DESTDIR=
PREFIX=/usr/local
BINDIR=$(PREFIX)/sbin
-LCDIR=$(PREFIX)/lib/checkinstall/locale
-CONFDIR=$(PREFIX)/lib/checkinstall
+LCDIR=$(PREFIX)/share/locale
+CONFDIR=/etc
all:
for file in locale/checkinstall-*.po ; do \
@@ -22,7 +22,7 @@
done
make -C installwatch-0.7.0beta5
-install: all
+install: all checkinstall checkinstallrc-dist
export
make -C installwatch-0.7.0beta5 install
@@ -54,9 +54,16 @@
echo ======================================================== ;\
echo; \
fi
-
+
+checkinstall: checkinstall.in
+ sed -e 's%@TEXTDOMAINDIR@%$(LCDIR)%g' -e 's%@CONFDIR@%$(CONFDIR)%g' $< > $@
+
+checkinstallrc-dist: checkinstallrc-dist.in
+ sed -e 's%@PREFIX@%$(PREFIX)%g' $< >$@
+
clean:
for file in locale/checkinstall-*.mo ; do \
rm -f $${file} ; \
done
+ rm -f checkinstall checkinstallrc-dist
make -C installwatch-0.7.0beta5 clean
--- NLS_SUPPORT
+++ 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)
--- README
+++ 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
--- 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 @@
* 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.
++++++ checkinstall-libdir64.patch ++++++
--- /var/tmp/diff_new_pack.Xn1563/_old 2007-03-29 16:18:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Xn1563/_new 2007-03-29 16:18:49.000000000 +0200
@@ -1,6 +1,6 @@
---- installwatch-0.7.0beta4/Makefile
-+++ installwatch-0.7.0beta4/Makefile
-@@ -53,7 +53,7 @@
+--- installwatch-0.7.0beta5/Makefile
++++ installwatch-0.7.0beta5/Makefile
+@@ -52,7 +52,7 @@
tar -czvC .. -f ../installwatch-$(VERSION).tar.gz installwatch-$(VERSION)
test: install
@@ -9,8 +9,8 @@
$(DESTDIR)$(PREFIX)/bin/installwatch ./test-installwatch
---- installwatch-0.7.0beta4/installwatch
-+++ installwatch-0.7.0beta4/installwatch
+--- installwatch-0.7.0beta5/installwatch
++++ installwatch-0.7.0beta5/installwatch
@@ -14,7 +14,17 @@
exit 1
fi
++++++ checkinstall-makefile_cleanup.patch ++++++
--- /var/tmp/diff_new_pack.Xn1563/_old 2007-03-29 16:18:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Xn1563/_new 2007-03-29 16:18:49.000000000 +0200
@@ -1,5 +1,5 @@
---- installwatch-0.7.0beta4/Makefile
-+++ installwatch-0.7.0beta4/Makefile
+--- installwatch-0.7.0beta5/Makefile
++++ installwatch-0.7.0beta5/Makefile
@@ -14,13 +14,18 @@
BINDIR=$(PREFIX)/bin
LIBDIR=$(PREFIX)/lib
@@ -20,7 +20,7 @@
localdecls.h:
./create-localdecls
-@@ -48,7 +53,7 @@
+@@ -47,7 +52,7 @@
tar -czvC .. -f ../installwatch-$(VERSION).tar.gz installwatch-$(VERSION)
test: install
++++++ checkinstall-no_fortify_source.patch ++++++
--- /var/tmp/diff_new_pack.Xn1563/_old 2007-03-29 16:18:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Xn1563/_new 2007-03-29 16:18:49.000000000 +0200
@@ -1,5 +1,5 @@
---- installwatch-0.7.0beta4/Makefile
-+++ installwatch-0.7.0beta4/Makefile
+--- installwatch-0.7.0beta5/Makefile
++++ installwatch-0.7.0beta5/Makefile
@@ -15,7 +15,7 @@
LIBDIR=$(PREFIX)/lib
++++++ checkinstall-readlink.patch ++++++
--- /var/tmp/diff_new_pack.Xn1563/_old 2007-03-29 16:18:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Xn1563/_new 2007-03-29 16:18:49.000000000 +0200
@@ -1,5 +1,5 @@
---- installwatch-0.7.0beta4/installwatch.c
-+++ installwatch-0.7.0beta4/installwatch.c
+--- installwatch-0.7.0beta5/installwatch.c
++++ installwatch-0.7.0beta5/installwatch.c
@@ -77,7 +77,7 @@
static int (*true_open)(const char *, int, ...);
static DIR *(*true_opendir)(const char *);
@@ -9,7 +9,7 @@
static char *(*true_realpath)(const char *,char *);
static int (*true_rename)(const char *, const char *);
static int (*true_rmdir)(const char *);
-@@ -2674,7 +2674,7 @@
+@@ -2693,7 +2693,7 @@
return result;
}
++++++ checkinstall-test_with_DESTDIR.patch ++++++
--- installwatch-0.7.0beta5/Makefile
+++ installwatch-0.7.0beta5/Makefile
@@ -52,7 +52,7 @@
tar -czvC .. -f ../installwatch-$(VERSION).tar.gz installwatch-$(VERSION)
test: install
- gcc $(ALL_CFLAGS) -DLIBDIR=\"$(LIBDIR)\" -o test-installwatch test-installwatch.c $(LIBS)
- $(DESTDIR)$(PREFIX)/bin/installwatch ./test-installwatch
+ gcc $(ALL_CFLAGS) -DLIBDIR=\"$(DESTDIR)$(LIBDIR)\" -o test-installwatch test-installwatch.c $(LIBS)
+ PREFIX=$(DESTDIR)$(PREFIX) $(DESTDIR)$(PREFIX)/bin/installwatch ./test-installwatch
--- installwatch-0.7.0beta5/installwatch
+++ installwatch-0.7.0beta5/installwatch
@@ -3,7 +3,7 @@
#set -x
-PREFIX=#PREFIX#
+PREFIX=${PREFIX:-#PREFIX#}
HACK="PREFIX"
HACK="#$HACK#";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org