[CVS] RPM: rpm/ CHANGES rpm/build/ parseChangelog.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-Jun-2007 17:58:15 Branch: HEAD Handle: 2007062016581401 Modified files: rpm CHANGES rpm/build parseChangelog.c Log: - rse: calculate timezone directly, don't rely on timezone variable. Summary: RevisionChanges Path 1.1379 +1 -0 rpm/CHANGES 2.30+6 -2 rpm/build/parseChangelog.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1378 -r1.1379 CHANGES --- rpm/CHANGES 20 Jun 2007 15:55:39 - 1.1378 +++ rpm/CHANGES 20 Jun 2007 15:58:14 - 1.1379 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- rse: calculate timezone directly, don't rely on timezone variable. - rse: remove the hysterical bzip2 interface. - rse: add the missing Autoconf glue code for using mmap(2) in the code - rse: (temporarily) remove partial Lua/libsyck support from build environment @@ . patch -p0 '@@ .' Index: rpm/build/parseChangelog.c $ cvs diff -u -r2.29 -r2.30 parseChangelog.c --- rpm/build/parseChangelog.c25 May 2007 17:35:56 - 2.29 +++ rpm/build/parseChangelog.c20 Jun 2007 15:58:15 - 2.30 @@ -34,6 +34,7 @@ /[EMAIL PROTECTED] *secs @*/ { struct tm time; +time_t timezone_offset; char * p, * pe, * q, ** idx; char * date = strcpy(alloca(strlen(datestr) + 1), datestr); /[EMAIL PROTECTED]@*/ static char * days[] = @@ -89,8 +90,11 @@ *secs = mktime(time); if (*secs == -1) return -1; -/* adjust to GMT */ -*secs += timezone; +/* determine timezone offset */ +timezone_offset = mktime(gmtime(secs)) - *secs; + +/* adjust to UTC */ +*secs += timezone_offset; return 0; } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/scripts/ Makefile.am brp-compress brp-impl...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-Jun-2007 18:56:48 Branch: HEAD Handle: 2007062017564700 Added files: rpm/scripts brp-implant-ident-static brp-java-repack-jars find-provides.ksyms find-requires.ksyms kmodtool rpmsort symset-table Modified files: rpm CHANGES rpm/scripts Makefile.am brp-compress brp-strip brp-strip-comment-note brp-strip-shared brp-strip-static-archive find-lang.sh Log: - collect CentOS5 redhat-rpm-config changes for reference composting. Summary: RevisionChanges Path 1.1380 +1 -0 rpm/CHANGES 1.38+3 -0 rpm/scripts/Makefile.am 1.13+3 -3 rpm/scripts/brp-compress 1.1 +34 -0 rpm/scripts/brp-implant-ident-static 1.1 +95 -0 rpm/scripts/brp-java-repack-jars 1.6 +4 -1 rpm/scripts/brp-strip 1.5 +7 -2 rpm/scripts/brp-strip-comment-note 1.4 +4 -1 rpm/scripts/brp-strip-shared 1.3 +4 -1 rpm/scripts/brp-strip-static-archive 1.8 +1 -1 rpm/scripts/find-lang.sh 1.1 +9 -0 rpm/scripts/find-provides.ksyms 1.1 +48 -0 rpm/scripts/find-requires.ksyms 1.1 +258 -0 rpm/scripts/kmodtool 1.1 +76 -0 rpm/scripts/rpmsort 1.1 +40 -0 rpm/scripts/symset-table patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.1379 -r1.1380 CHANGES --- rpm/CHANGES 20 Jun 2007 15:58:14 - 1.1379 +++ rpm/CHANGES 20 Jun 2007 16:56:47 - 1.1380 @@ -1,4 +1,5 @@ 4.5 - 5.0: +- jbj: collect CentOS5 redhat-rpm-config changes for reference composting. - rse: calculate timezone directly, don't rely on timezone variable. - rse: remove the hysterical bzip2 interface. - rse: add the missing Autoconf glue code for using mmap(2) in the code @@ . patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.37 -r1.38 Makefile.am --- rpm/scripts/Makefile.am 17 Jun 2007 01:21:39 - 1.37 +++ rpm/scripts/Makefile.am 20 Jun 2007 16:56:47 - 1.38 @@ -6,8 +6,10 @@ brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note brp-nobuildrootpath \ brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ + brp-implant-ident-static brp-java-repack-jars \ check-files cross-build executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ + find-provides.ksyms find-requires.ksyms kmodtool \ cpanflute cpanflute2 Specfile.pm find-provides.perl \ find-requires.perl freshen.sh gendiff getpo.sh http.req \ check-java-closure.sh java.prov.sh java.req.sh \ @@ -16,6 +18,7 @@ php.prov php.req rpm2cpio \ rpmdb_loadcvt rpmdiff rpmdiff.cgi \ rpm.daily rpm.log rpm.xinetd \ + rpmsort symset-table \ sql.prov sql.req symclash.py symclash.sh tcl.req tgpg trpm u_pkg.sh \ vpkg-provides.sh vpkg-provides2.sh \ macros.perl* macros.python* \ @@ . patch -p0 '@@ .' Index: rpm/scripts/brp-compress $ cvs diff -u -r1.12 -r1.13 brp-compress --- rpm/scripts/brp-compress 17 Oct 2004 18:49:52 - 1.12 +++ rpm/scripts/brp-compress 20 Jun 2007 16:56:47 - 1.13 @@ -23,9 +23,9 @@ [ `basename $f` = dir ] continue case $f in - *.Z) gunzip $f; b=`echo $f | sed -e 's/\.Z$//'`;; - *.gz) gunzip $f; b=`echo $f | sed -e 's/\.gz$//'`;; - *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;; + *.Z) gunzip -f $f; b=`echo $f | sed -e 's/\.Z$//'`;; + *.gz) gunzip -f $f; b=`echo $f | sed -e 's/\.gz$//'`;; + *.bz2) bunzip2 -f $f; b=`echo $f | sed -e 's/\.bz2$//'`;; *) b=$f;; esac @@ . patch -p0 '@@ .' Index: rpm/scripts/brp-implant-ident-static $ cvs diff -u -r0 -r1.1 brp-implant-ident-static --- /dev/null 2007-06-20 18:55:00 +0200 +++ brp-implant-ident-static 2007-06-20 18:56:48 +0200 @@ -0,0 +1,34 @@ +#!/bin/bash + +# If using normal root,
[CVS] RPM: rpm/ rpm.spec.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-Jun-2007 20:54:24 Branch: HEAD Handle: 2007062019542400 Modified files: rpm rpm.spec.in Log: require bzip2 1.0 or higher because older versions have known security issues and the code now supports 1.0.x only anyway Summary: RevisionChanges Path 2.443 +1 -1 rpm/rpm.spec.in patch -p0 '@@ .' Index: rpm/rpm.spec.in $ cvs diff -u -r2.442 -r2.443 rpm.spec.in --- rpm/rpm.spec.in 18 Jun 2007 19:04:09 - 2.442 +++ rpm/rpm.spec.in 20 Jun 2007 18:54:24 - 2.443 @@ -38,7 +38,7 @@ BuildRequires: sqlite-devel %if %{with_bzip2} -BuildRequires: bzip2-devel = 0.9.0c-2 +BuildRequires: bzip2-devel = 1.0 %endif %if %{with_python_subpackage} BuildRequires: python-devel = %{with_python_version} @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ autogen.sh configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 07:52:51 Branch: HEAD Handle: 2007062106525000 Modified files: rpm autogen.sh configure.ac Log: place po/Makefile.in to the begin of AC_CONFIG_FILES (this way gettextize seems to not double the entry?) and unconditionally run gettextize (similar to the approach in POPT) Summary: RevisionChanges Path 2.74+1 -1 rpm/autogen.sh 2.100 +2 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.73 -r2.74 autogen.sh --- rpm/autogen.sh20 Jun 2007 22:17:29 - 2.73 +++ rpm/autogen.sh21 Jun 2007 05:52:50 - 2.74 @@ -70,7 +70,7 @@ echo --- rpm $libtoolize --copy --force -[ -f po/Makefile.in.in ] || gettextize --copy --force --intl --no-changelog +gettextize --copy --force --intl --no-changelog aclocal -I m4 autoheader automake -a -c @@ . patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.99 -r2.100 configure.ac --- rpm/configure.ac 20 Jun 2007 21:42:24 - 2.99 +++ rpm/configure.ac 21 Jun 2007 05:52:50 - 2.100 @@ -1295,7 +1295,8 @@ AC_CONFIG_SUBDIRS() -AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec +AC_CONFIG_FILES([ po/Makefile.in + Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile scripts/Makefile scripts/macros.perl scripts/macros.php scripts/macros.python @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ autogen.sh
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 07:57:43 Branch: HEAD Handle: 2007062106574200 Modified files: rpm autogen.sh Log: we use AM_GNU_GETTEXT([external]) so IMHO no need to provide a local copy of the intl/* files Summary: RevisionChanges Path 2.75+1 -1 rpm/autogen.sh patch -p0 '@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.74 -r2.75 autogen.sh --- rpm/autogen.sh21 Jun 2007 05:52:50 - 2.74 +++ rpm/autogen.sh21 Jun 2007 05:57:42 - 2.75 @@ -70,7 +70,7 @@ echo --- rpm $libtoolize --copy --force -gettextize --copy --force --intl --no-changelog +gettextize --copy --force --no-changelog aclocal -I m4 autoheader automake -a -c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org