openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2007
- 1 participants
- 2092 discussions
Hello community,
here is the log from the commit of package rpm
checked in at Fri Aug 31 18:48:04 CEST 2007.
--------
--- rpm/rpm.changes 2007-08-10 16:40:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-08-31 18:41:19.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Aug 31 18:41:04 CEST 2007 - dmueller(a)suse.de
+
+- implement supplements for lang_packages (#306412)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.a29218/_old 2007-08-31 18:45:00.000000000 +0200
+++ /var/tmp/diff_new_pack.a29218/_new 2007-08-31 18:45:00.000000000 +0200
@@ -16,7 +16,7 @@
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2
-Release: 149
+Release: 156
Requires: rpm = %{version}
%py_requires
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.a29218/_old 2007-08-31 18:45:00.000000000 +0200
+++ /var/tmp/diff_new_pack.a29218/_new 2007-08-31 18:45:00.000000000 +0200
@@ -20,7 +20,7 @@
Autoreqprov: on
Summary: The RPM Package Manager
Version: 4.4.2
-Release: 129
+Release: 135
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@@ -341,7 +341,7 @@
License: LGPL v2 or later
Group: System/Libraries
Version: 1.7
-Release: 357
+Release: 363
#
%description -n popt
@@ -364,7 +364,7 @@
License: LGPL v2 or later
Group: System/Libraries
Version: 1.7
-Release: 357
+Release: 363
Requires: popt = 1.7
Requires: glibc-devel
@@ -400,6 +400,8 @@
%doc %{_mandir}/man3/popt.3*
%changelog
+* Fri Aug 31 2007 - dmueller(a)suse.de
+- implement supplements for lang_packages (#306412)
* Fri Aug 10 2007 - dmueller(a)suse.de
- package size reduction (#217472)
* Wed Aug 08 2007 - dmueller(a)suse.de
++++++ rpm-suse_macros ++++++
--- rpm/rpm-suse_macros 2007-08-08 23:20:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpm/rpm-suse_macros 2007-08-31 18:36:01.000000000 +0200
@@ -463,7 +463,7 @@
%package %{-n:-n %{-n*}-}lang \
Summary: Languages for package %{name} \
Group: System/Localization \
-Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
-Requires: %{name} = %{version} \
+Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
+Supplements: bundle-lang-other = %(echo `echo %suse_version | sed -r -e 's,([[:digit:]]*)([[:digit:]])0$,\\1.\\2,'`) \
%description %{-n:-n %{-n*}-}lang \
Provides translations to the package %{name}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lilypond
checked in at Fri Aug 31 18:44:50 CEST 2007.
--------
--- lilypond/lilypond.changes 2007-08-18 12:25:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/lilypond/lilypond.changes 2007-08-31 18:42:46.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 31 18:41:56 CEST 2007 - pcerny(a)suse.cz
+
+- corrected dependencies [#301504]
+- .spec file cleanup (unneeded dependencies, packaging hacks)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lilypond.spec ++++++
--- /var/tmp/diff_new_pack.n27919/_old 2007-08-31 18:44:39.000000000 +0200
+++ /var/tmp/diff_new_pack.n27919/_new 2007-08-31 18:44:39.000000000 +0200
@@ -12,11 +12,10 @@
Name: lilypond
BuildRequires: autotrace bison ec-fonts-mftraced emacs-nox flex freetype2-devel
-BuildRequires: gcc-c++ ghostscript-fonts-std ghostscript-library > 8.15
-BuildRequires: guile-devel > 1.8.0
-BuildRequires: libexif libpng-devel libtiff-devel netpbm pango-devel
-BuildRequires: potrace python-devel > 2.4 scrollkeeper tcsh
-BuildRequires: fontforge >= 20060125 mftrace >= 1.1.19 texinfo > 4.8
+BuildRequires: gcc-c++ ghostscript-fonts-std ghostscript-library >= 8.15
+BuildRequires: guile-devel >= 1.8.0 pango-devel
+BuildRequires: potrace python-devel >= 2.4 scrollkeeper tcsh
+BuildRequires: fontforge >= 20060125 mftrace >= 1.1.19 texinfo >= 4.8
%if 0%{suse_version} <= 1020
BuildRequires: tetex
%else
@@ -25,13 +24,15 @@
%define info yes
License: GPL v2 or later, files in input/ and mutopia/ come from Mutopia project
Group: Productivity/Publishing/Other
-Requires: texlive texlive-latex python tcsh
-Requires: t1utils autotrace mftrace ec-fonts-mftraced
-Requires: freetype2 >= 2 fontconfig >= 2.2 pango >= 1.12
+#Requires: texlive texlive-latex python tcsh
+#Requires: t1utils autotrace mftrace ec-fonts-mftraced
+Requires: fontconfig >= 2.2 guile >= 1.8.0
+Requires: ghostscript-library > 8.15
+Requires: pango >= 1.12 python >= 2.4
Autoreqprov: on
Summary: Music Typesetter
Version: 2.10.29
-Release: 3
+Release: 12
URL: http://www.lilypond.org/
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -106,9 +107,6 @@
--infodir=%{_infodir} \
--disable-optimising \
--enable-shared
-# FIXME: Creates empty out/musicxml2ly.1
-#/usr/bin/perl /usr/src/packages/BUILD/lilypond-2.8.7/buildscripts/out/help2man out/musicxml2ly > out/musicxml2ly.1
-#help2man: can't get `--help' info from out/musicxml2ly
make
%install
@@ -121,25 +119,17 @@
Documentation input \
%{buildroot}/usr/share/doc/packages/%{name}
(
- cd %{buildroot}/usr/share/doc/packages/%{name}/Documentation
- find -type d -name out \
- -exec sh -c "cd {}; mv * .. ; cd .. ; rm -Rf dummy.dep GNUmakefile SConscript index.html.in out" \;
+ # remove buildsystem and git files
+ cd %{buildroot}/usr/share/doc/packages/%{name}
+ find Documentation input -type d -name out \
+ -exec sh -c "cd {}; mv -v * .. ; cd .. ; rm -Rfv dummy.dep GNUmakefile SConscript index.html.in out" \;
)
# fix info files
mv %{buildroot}/usr/share/info/lilypond/* %{buildroot}/usr/share/info
rmdir %{buildroot}/usr/share/info/lilypond
sed -i s:lilypond/lilypond:lilypond:g %{buildroot}/usr/share/info/*
-#find %{buildroot}/usr/share -type f -exec sh -c '
-#sed s:%{buildroot}::g <{} >{}~
-#if ! cmp {} {}~ ; then cat {}~ >{} ; fi ; rm {}~
-#' \;
%find_lang %{name}
texhash %{buildroot}/usr/share/lilypond/%{version}
-# compile lisp scripts
-#cd %{buildroot}/usr/share/emacs/site-lisp
-#emacs-nox -batch -f batch-byte-compile *.el
-#rm *.el
-#cd
%clean
rm -rf %{buildroot}
@@ -212,6 +202,9 @@
%doc %{_infodir}/lilypond-internals.*
%changelog
+* Fri Aug 31 2007 - pcerny(a)suse.cz
+- corrected dependencies [#301504]
+- .spec file cleanup (unneeded dependencies, packaging hacks)
* Sat Aug 18 2007 - aj(a)suse.de
- Require freetype2.
* Thu Aug 16 2007 - pcerny(a)suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Aug 31 18:44:29 CEST 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-08-31 12:53:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-08-31 17:36:47.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 31 17:34:40 CEST 2007 - locilka(a)suse.cz
+
+- Added commandline support for inst_productsources (#304720).
+- 2.15.71
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.70.tar.bz2
New:
----
yast2-packager-2.15.71.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.D26662/_old 2007-08-31 18:44:18.000000000 +0200
+++ /var/tmp/diff_new_pack.D26662/_new 2007-08-31 18:44:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.70)
+# spec file for package yast2-packager (Version 2.15.71)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.70
+Version: 2.15.71
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.70.tar.bz2
+Source0: yast2-packager-2.15.71.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
BuildRequires: yast2 >= 2.15.38
@@ -55,7 +55,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.15.70
+%setup -n yast2-packager-2.15.71
%build
%{prefix}/bin/y2tool y2autoconf
@@ -96,6 +96,9 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Aug 31 2007 - locilka(a)suse.cz
+- Added commandline support for inst_productsources (#304720).
+- 2.15.71
* Fri Aug 31 2007 - lslezak(a)suse.cz
- check exit status and report errors when adding online
repositories (#306272)
++++++ yast2-packager-2.15.70.tar.bz2 -> yast2-packager-2.15.71.tar.bz2 ++++++
++++ 7201 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.70/configure.in new/yast2-packager-2.15.71/configure.in
--- old/yast2-packager-2.15.70/configure.in 2007-08-31 12:53:18.000000000 +0200
+++ new/yast2-packager-2.15.71/configure.in 2007-08-23 17:10:58.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.70, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.66, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.70"
+VERSION="2.15.66"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.70/missing new/yast2-packager-2.15.71/missing
--- old/yast2-packager-2.15.70/missing 2007-08-31 12:53:23.000000000 +0200
+++ new/yast2-packager-2.15.71/missing 2007-08-23 17:11:03.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.70/src/clients/inst_productsources.ycp new/yast2-packager-2.15.71/src/clients/inst_productsources.ycp
--- old/yast2-packager-2.15.70/src/clients/inst_productsources.ycp 2007-08-31 12:51:33.000000000 +0200
+++ new/yast2-packager-2.15.71/src/clients/inst_productsources.ycp 2007-08-31 17:33:06.000000000 +0200
@@ -67,6 +67,7 @@
import "Progress";
import "Stage";
import "Report";
+ import "CommandLine";
import "FileUtils";
import "HTTP";
@@ -86,6 +87,14 @@
return `back;
}
+ list args = WFM::Args();
+ y2milestone("args: %1", args);
+
+ if (Mode::normal() && size (args)>0) {
+ CommandLine::Run ($["id":"inst_productsources"]);
+ return `auto;
+ }
+
// (Applicable only in inst-sys)
boolean preselect_recommended = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.70/VERSION new/yast2-packager-2.15.71/VERSION
--- old/yast2-packager-2.15.70/VERSION 2007-08-31 12:45:55.000000000 +0200
+++ new/yast2-packager-2.15.71/VERSION 2007-08-31 17:36:53.000000000 +0200
@@ -1 +1 @@
-2.15.70
+2.15.71
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-country
checked in at Fri Aug 31 18:44:10 CEST 2007.
--------
--- yast2-country/yast2-country.changes 2007-08-17 15:13:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2007-08-31 17:35:05.094656000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 31 17:26:12 CEST 2007 - kmachalkova(a)suse.cz
+
+- Timezone dialog adjusted to use new ntp installation clients
+ (FaTE #302192, bugzilla #299238,#299557,#302389)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.B25646/_old 2007-08-31 18:44:02.000000000 +0200
+++ /var/tmp/diff_new_pack.B25646/_new 2007-08-31 18:44:02.000000000 +0200
@@ -12,7 +12,7 @@
Name: yast2-country
Version: 2.15.18
-Release: 1
+Release: 10
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -111,6 +111,9 @@
%{prefix}/share/applications/YaST2/timezone.desktop
%changelog
+* Fri Aug 31 2007 - kmachalkova(a)suse.cz
+- Timezone dialog adjusted to use new ntp installation clients
+ (FaTE #302192, bugzilla #299238,#299557,#302389)
* Fri Aug 17 2007 - jsuchome(a)suse.cz
- when non-listed locale is selected, add it to the list of
primary languages (#301019)
++++++ yast2-country-2.15.18.tar.bz2 ++++++
++++ 11667 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/configure.in new/yast2-country-2.15.18/configure.in
--- old/yast2-country-2.15.18/configure.in 2006-12-11 09:59:02.000000000 +0100
+++ new/yast2-country-2.15.18/configure.in 2007-07-27 12:20:15.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-country
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-country, 2.15.2, http://bugs.opensuse.org/, yast2-country)
+AC_INIT(yast2-country, 2.15.13, http://bugs.opensuse.org/, yast2-country)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.2"
+VERSION="2.15.13"
RPMNAME="yast2-country"
MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/language/src/modules/Language.ycp new/yast2-country-2.15.18/language/src/modules/Language.ycp
--- old/yast2-country-2.15.18/language/src/modules/Language.ycp 2007-08-17 14:34:14.000000000 +0200
+++ new/yast2-country-2.15.18/language/src/modules/Language.ycp 2007-08-31 17:26:05.000000000 +0200
@@ -6,7 +6,7 @@
* Thomas Roelz <tom(a)suse.de>
* Maintainer: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: Language.ycp 36138 2007-02-14 13:53:58Z jsuchome $
+ * $Id: Language.ycp 40336 2007-08-17 13:13:23Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/language/src/select_language.ycp new/yast2-country-2.15.18/language/src/select_language.ycp
--- old/yast2-country-2.15.18/language/src/select_language.ycp 2007-08-16 16:48:07.000000000 +0200
+++ new/yast2-country-2.15.18/language/src/select_language.ycp 2007-08-31 17:26:05.000000000 +0200
@@ -15,7 +15,7 @@
* Summary:
* This client shows main dialog for choosing the language.
*
- * $Id: select_language.ycp 39934 2007-08-03 11:14:11Z sh-sh-sh $
+ * $Id: select_language.ycp 40336 2007-08-17 13:13:23Z jsuchome $
*
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/language/testsuite/tests/IncompleteTranslation.ycp new/yast2-country-2.15.18/language/testsuite/tests/IncompleteTranslation.ycp
--- old/yast2-country-2.15.18/language/testsuite/tests/IncompleteTranslation.ycp 2006-09-08 11:20:22.000000000 +0200
+++ new/yast2-country-2.15.18/language/testsuite/tests/IncompleteTranslation.ycp 2007-05-18 10:56:17.000000000 +0200
@@ -1,7 +1,7 @@
/**
* tests for Language::IncompleteTranslation
* Author: jsuchome(a)suse.cz
- * $Id: IncompleteTranslation.ycp 31977 2006-07-25 08:02:35Z jsuchome $
+ * $Id: IncompleteTranslation.ycp 31976 2006-07-25 08:02:24Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/missing new/yast2-country-2.15.18/missing
--- old/yast2-country-2.15.18/missing 2006-12-11 09:59:08.000000000 +0100
+++ new/yast2-country-2.15.18/missing 2007-07-27 12:20:22.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/timezone/src/dialogs.ycp new/yast2-country-2.15.18/timezone/src/dialogs.ycp
--- old/yast2-country-2.15.18/timezone/src/dialogs.ycp 2007-07-27 13:38:38.000000000 +0200
+++ new/yast2-country-2.15.18/timezone/src/dialogs.ycp 2007-08-31 17:28:14.000000000 +0200
@@ -11,7 +11,7 @@
* Summary:
* Dialogs for timezone and time configuration.
*
- * $Id: dialogs.ycp 39743 2007-07-27 11:38:38Z jsuchome $
+ * $Id: dialogs.ycp 40656 2007-08-31 15:28:13Z kmachalkova $
*/
{
textdomain "country";
@@ -121,67 +121,28 @@
);
dt_widgets = true;
}
- list ntp_items = [];
- boolean ntp_used = Service::Enabled ("ntp") && Package::Installed ("yast2-ntp-client");
- // list of servers based on the language (got from ntp-client module)
- list ntp_items_proposed = nil;
- list ntp_items_proposal () {
- if (ntp_items_proposed == nil)
- {
- list servers = (list) WFM::CallFunction ("ntp-client_auto", [
- "GetNtpServersByCountry",
- $[ "country" : Language::GetLanguageCountry () ]
- ]);
- ntp_items_proposed = (servers == nil) ? [] : servers;
- }
- return ntp_items_proposed;
- }
-
- /**
- * get the list of ntp servers from current ntp-client instance
- */
- list get_current_ntp_settings () {
-
- list ret = [];
- map ex = (map)WFM::CallFunction ("ntp-client_auto", ["Export"]);
- if (ex == nil) return ret;
- foreach (map peer, ex["peers"]:[], {
- if (peer["type"]:"" == "server")
- ret = add (ret, peer["address"]:"");
- });
- return ret;
- }
-
- /**
- * read current NTP settings (using yast2-ntp-client)
- * and fill the list of servers
- */
- boolean read_ntp_settings () {
-
- // busy popup
- Popup::ShowFeedback ("", _("Reading NTP configuration..."));
- any read = WFM::CallFunction ("ntp-client_auto", ["Read"]);
- if (read == false)
- {
- ntp_used = false;
- ntp_items = [];
- }
- else
- {
- ntp_items = get_current_ntp_settings ();
- }
- if (ntp_used && ntp_items == [])
- ntp_items = ntp_items_proposal ();
- Popup::ClearFeedback ();
- return ntp_used;
+ void enable_disable_widgets ( boolean ntp_used) {
+ if (!dt_widgets)
+ {
+ foreach (symbol widget, [`hour, `minute, `second, `day, `month, `year],{
+ UI::ChangeWidget (`id (widget), `Enabled, !ntp_used);
+ });
+ }
+ else
+ {
+ UI::ChangeWidget (`id (`date), `Enabled, !ntp_used);
+ UI::ChangeWidget (`id (`time), `Enabled, !ntp_used);
+ }
+ UI::ChangeWidget (`id (`ntp_address), `Enabled, ntp_used);
+ UI::ChangeWidget (`id (`ntp_configure), `Enabled, ntp_used);
}
term cont = `HBox (
`RadioButtonGroup (`id (`rb), `HCenter (`VBox (
`Left (`VBox (
// radio button label (= how to setup time)
- `Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"), !ntp_used)),
+ `Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"), true)),
`VSpacing (0.5),
`HBox (
`HSpacing (3),
@@ -190,35 +151,17 @@
`VSpacing(),
`Left (dateterm)
)
- )
- )),
- `VSpacing (1),
- `Left (`VBox (
- `Left (`RadioButton (`id (`ntp), `opt (`notify),
- // radio button label
- _("Synchronize with NTP Server"), ntp_used)
),
- `VSpacing (0.5),
- `HBox (
- `HSpacing (3),
- `MinWidth (38,
- `ComboBox (`id (`ntp_address), `opt (`editable),
- // combo box label
- _("NTP Server Address"), ntp_items
- )
- ),
- `VBox (
- `Label (""),
- // push button label
- `PushButton (`id (`ntp_configure), _("Configure..."))
- )
- )
+ `VSpacing (1),
+ `ReplacePoint(`id(`rp), `Empty())
))
- )))
- );
+ ))));
Wizard::OpenAcceptDialog ();
Wizard::SetContents (_("Change Date and Time"), cont, htext, true, true);
+ Wizard::SetDesktopIcon("timezone");
+ WFM::CallFunction("ntp-client_proposal", ["CreateUI"]);
+ enable_disable_widgets(false);
if (!dt_widgets)
{
@@ -229,38 +172,17 @@
});
}
- if (ntp_used)
- {
- read_ntp_settings ();
- UI::ChangeWidget (`id (`ntp_address), `Items, ntp_items);
- }
+ boolean ntp_installed = false;
+ boolean ntp_used = false;
- void enable_disable_widgets () {
- if (!dt_widgets)
- {
- foreach (symbol widget, [`hour, `minute, `second, `day, `month, `year],{
- UI::ChangeWidget (`id (widget), `Enabled, !ntp_used);
- });
- }
- else
- {
- UI::ChangeWidget (`id (`date), `Enabled, !ntp_used);
- UI::ChangeWidget (`id (`time), `Enabled, !ntp_used);
- }
- UI::ChangeWidget (`id (`ntp_address), `Enabled, ntp_used);
- UI::ChangeWidget (`id (`ntp_configure), `Enabled, ntp_used);
- }
-
- enable_disable_widgets ();
- any ret = `cancel;
- boolean ntp_installed = false;
+ any ret = nil;
repeat
{
ret = UI::UserInput();
y2debug ("UserInput ret:%1", ret );
if (ret == `ntp || ret == `manual)
- {
- ntp_used = (ret == `ntp);
+ {
+ ntp_used = (ret == `ntp);
if (ntp_used && !Stage::initial () && !ntp_installed)
{
ntp_installed = Package::Install ("yast2-ntp-client");
@@ -271,49 +193,17 @@
UI::ChangeWidget (`id (`ntp), `Value, false);
}
}
- if (ntp_used && ntp_items == [])
+ if (ntp_used )
{
- if (!read_ntp_settings ())
- {
- UI::ChangeWidget (`id (`manual), `Value, true);
- UI::ChangeWidget (`id (`ntp), `Value, false);
- continue;
- }
- UI::ChangeWidget (`id (`ntp_address), `Items, ntp_items);
+ WFM::CallFunction("ntp-client_proposal", [ "MakeProposal",
+ $[ "country" : Language::GetLanguageCountry() ] ]);
}
- enable_disable_widgets ();
+ enable_disable_widgets (ntp_used);
}
if (ret == `ntp_configure)
{
- if (WFM::CallFunction ("ntp-client_auto", ["Change"]) != `next)
+ if (WFM::CallFunction ("ntp-client_proposal", ["AskUser"]) != `next)
continue;
- // read current settings again
- ntp_items = get_current_ntp_settings ();
- UI::ChangeWidget (`id (`ntp_address), `Items, ntp_items);
- // adapt current time after the attempt to synchronize
- val = Timezone::GetDateTimeMap();
- hour = val["hour"]:"";
- minute = val["minute"]:"";
- second = val["second"]:"";
- day = val["day"]:"";
- month = val["month"]:"";
- year = val["year"]:"";
- if (dt_widgets)
- {
- UI::ChangeWidget (`id (`date), `Value,
- sformat ("%1-%2-%3", year, month, day));
- UI::ChangeWidget (`id (`time), `Value,
- sformat ("%1:%2:%3", hour, minute, second));
- }
- else
- {
- UI::ChangeWidget (`id (`hour), `Value, hour);
- UI::ChangeWidget (`id (`minute), `Value, minute);
- UI::ChangeWidget (`id (`second), `Value, second);
- UI::ChangeWidget (`id (`day), `Value, day);
- UI::ChangeWidget (`id (`month), `Value, month);
- UI::ChangeWidget (`id (`year), `Value, year);
- }
}
if (ret == `accept && !ntp_used)
{
@@ -366,24 +256,22 @@
}
if (ret == `accept && ntp_used)
{
- // check the address validity, call ntp-client API etc.
- map ex = (map)WFM::CallFunction ("ntp-client_auto", ["Export"]);
- list peers = add (ex["peers"]:[], $[
- "address" : UI::QueryWidget (`id (`ntp_address), `Value),
- "comment" : "",
- "options" : "",
- "type" : "server",
- "initial_sync" : true,
- ]
- );
- map import_map = $[
- "peers" : peers,
- "start_at_boot" : true,
- ];
- WFM::CallFunction ("ntp-client_auto", ["Import", import_map]);
- WFM::CallFunction ("ntp-client_auto", ["Write", $[
- "restart_services": true
- ]]);
+ symbol rv = (symbol) WFM::CallFunction("ntp-client_proposal", ["Write"]);
+
+ string server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
+
+ if (rv == `invalid_hostname)
+ {
+ Popup::Error( sformat("Invalid NTP server hostname %1", server) );
+ ret = `retry;
+ continue;
+ }
+ else if ( rv == `ntpdate_failed)
+ {
+ if (Popup::YesNo( sformat("'ntpdate %1' failed. Revisit NTP server configuration?", server) ))
+ ret = `retry;
+ continue;
+ }
}
}
until( ret==`accept || ret==`cancel );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTimeMap.ycp new/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTimeMap.ycp
--- old/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTimeMap.ycp 2006-09-08 11:21:28.000000000 +0200
+++ new/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTimeMap.ycp 2007-05-18 10:56:17.000000000 +0200
@@ -2,7 +2,7 @@
* test for Timezone::GetDateTimeMap
* - check correct parsing after changed time format (bug #62312)
* Author: jsuchome(a)suse.cz
- * $Id: GetDateTimeMap.ycp 31664 2006-06-26 14:24:19Z jsuchome $
+ * $Id: GetDateTimeMap.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*/
{
// testedfiles: Timezone.ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTime.ycp new/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTime.ycp
--- old/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTime.ycp 2006-09-08 11:21:28.000000000 +0200
+++ new/yast2-country-2.15.18/timezone/testsuite/tests/GetDateTime.ycp 2007-05-18 10:56:17.000000000 +0200
@@ -1,7 +1,7 @@
/**
* tests for Timezone::GetDateTime
* Author: jsuchome(a)suse.cz
- * $Id: GetDateTime.ycp 31664 2006-06-26 14:24:19Z jsuchome $
+ * $Id: GetDateTime.ycp 31665 2006-06-26 14:24:27Z jsuchome $
*/
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-server
checked in at Fri Aug 31 18:43:54 CEST 2007.
--------
--- xorg-x11-server/xorg-x11-server.changes 2007-08-23 14:20:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2007-08-31 17:09:00.349979000 +0200
@@ -1,0 +2,30 @@
+Fri Aug 31 17:02:26 CEST 2007 - sndirsch(a)suse.de
+
+- added several RANDR 1.2 fixes (Bug #306699)
+ * randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff
+ Allocate the right number of entries for saving crtcs
+ * randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff
+ Set the crtc before the output change is notified. Set the new
+ randr crtc of the output before the output change notification
+ is delivered to the clients. Remove RROutputSetCrtc as it is
+ not really necessary. All we have to do is set the output's
+ crtc on RRCrtcNotify
+ * randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
+ Fix the output->crtc initialization in the old randr setup
+ * randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff
+ Fix a crash when rotating the screen. Remember output->crtc
+ before setting a NULL mode because RRCrtcNotify now sets
+ output->crtc to NULL. Use the saved crtc to set the new mode.
+ * randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff
+ RRScanOldConfig cannot use RRFirstOutput before output is
+ configured. RRFirstOutput returns the first active output,
+ which won't be set until after RRScanOldConfig is finished
+ running. Instead, just use the first output (which is the only
+ output present with an old driver, after all).
+ * randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff
+ RRScanOldConfig wasn't getting crtcs set correctly. The output
+ crtc is set by RRCrtcNotify, which is called at the end of
+ RRScanOldConfig. Several uses of output->crtc in this function
+ were wrong.
+
+-------------------------------------------------------------------
New:
----
randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff
randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff
randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff
randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff
randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.L23775/_old 2007-08-31 18:42:56.000000000 +0200
+++ /var/tmp/diff_new_pack.L23775/_new 2007-08-31 18:42:56.000000000 +0200
@@ -21,7 +21,7 @@
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
-Release: 123
+Release: 129
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -93,6 +93,12 @@
Patch68: xephyr-sig11-fix.diff
Patch69: xserver-mode-fuzzy-check.diff
Patch70: i810_dri_fix_freeze.diff
+Patch71: randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff
+Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
+Patch73: randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff
+Patch74: randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff
+Patch75: randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff
+Patch76: randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff
Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff
@@ -206,6 +212,12 @@
%patch68
%patch69 -p1
%patch70 -p1
+%patch71 -p1
+%patch72 -p1
+%patch73 -p1
+%patch74 -p1
+%patch75 -p1
+%patch76 -p1
%build
pushd xorg-docs-*
@@ -541,6 +553,33 @@
%endif
%changelog
+* Fri Aug 31 2007 - sndirsch(a)suse.de
+- added several RANDR 1.2 fixes (Bug #306699)
+ * randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff
+ Allocate the right number of entries for saving crtcs
+ * randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff
+ Set the crtc before the output change is notified. Set the new
+ randr crtc of the output before the output change notification
+ is delivered to the clients. Remove RROutputSetCrtc as it is
+ not really necessary. All we have to do is set the output's
+ crtc on RRCrtcNotify
+ * randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
+ Fix the output->crtc initialization in the old randr setup
+ * randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff
+ Fix a crash when rotating the screen. Remember output->crtc
+ before setting a NULL mode because RRCrtcNotify now sets
+ output->crtc to NULL. Use the saved crtc to set the new mode.
+ * randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff
+ RRScanOldConfig cannot use RRFirstOutput before output is
+ configured. RRFirstOutput returns the first active output,
+ which won't be set until after RRScanOldConfig is finished
+ running. Instead, just use the first output (which is the only
+ output present with an old driver, after all).
+ * randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff
+ RRScanOldConfig wasn't getting crtcs set correctly. The output
+ crtc is set by RRCrtcNotify, which is called at the end of
+ RRScanOldConfig. Several uses of output->crtc in this function
+ were wrong.
* Thu Aug 23 2007 - sndirsch(a)suse.de
- i810_dri_fix_freeze.diff:
* fixes freeze after pressing Ctrl-Alt-BS (X.Org Bug #10809)
++++++ randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff ++++++
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 889be6f..9d74e53 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -716,7 +716,7 @@ xf86RandR12CrtcSet (ScreenPtr pScreen,
xf86CrtcPtr *save_crtcs;
Bool save_enabled = crtc->enabled;
- save_crtcs = ALLOCATE_LOCAL(config->num_crtc * sizeof (xf86CrtcPtr));
+ save_crtcs = ALLOCATE_LOCAL(config->num_output * sizeof (xf86CrtcPtr));
if ((randr_mode != NULL) != crtc->enabled)
changed = TRUE;
else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))
++++++ randr12-5b424b562eee863b11571de4cd0019cd9bc5b379.diff ++++++
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 6c3bf8d..889be6f 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -951,7 +951,6 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
return FALSE;
}
- RROutputSetCrtc (output->randr_output, randr_crtc);
RROutputSetPhysicalSize(output->randr_output,
output->mm_width,
output->mm_height);
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 4cc3a46..bd19fe9 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -694,9 +694,6 @@ RROutputSetCrtcs (RROutputPtr output,
RRCrtcPtr *crtcs,
int numCrtcs);
-void
-RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc);
-
Bool
RROutputSetConnection (RROutputPtr output,
CARD8 connection);
@@ -802,7 +799,6 @@ Query state:
1.2:
RRScreenSetSizeRange
RROutputSetCrtcs
- RROutputSetCrtc
RRModeGet
RROutputSetModes
RROutputSetConnection
@@ -822,7 +818,6 @@ Query state:
RRCrtcCreate
RROutputCreate
RROutputSetCrtcs
- RROutputSetCrtc
RROutputSetConnection
RROutputSetSubpixelOrder
RROldModeAdd • This adds modes one-at-a-time
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 3ce9e21..db5007e 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -134,6 +134,7 @@ RRCrtcNotify (RRCrtcPtr crtc,
break;
if (j == crtc->numOutputs)
{
+ outputs[i]->crtc = crtc;
RROutputChanged (outputs[i], FALSE);
RRCrtcChanged (crtc, FALSE);
}
@@ -149,6 +150,7 @@ RRCrtcNotify (RRCrtcPtr crtc,
break;
if (i == numOutputs)
{
+ crtc->outputs[j]->crtc = NULL;
RROutputChanged (crtc->outputs[j], FALSE);
RRCrtcChanged (crtc, FALSE);
}
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 5ef1a6b..858b1ed 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -98,7 +98,6 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
if (!output)
return;
RROutputSetCrtcs (output, &crtc, 1);
- RROutputSetCrtc (output, crtc);
RROutputSetConnection (output, RR_Connected);
#ifdef RENDER
RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
diff --git a/randr/rroutput.c b/randr/rroutput.c
index e001162..1e1cfa5 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -286,15 +286,6 @@ RROutputSetCrtcs (RROutputPtr output,
return TRUE;
}
-void
-RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc)
-{
- if (output->crtc == crtc)
- return;
- output->crtc = crtc;
- RROutputChanged (output, FALSE);
-}
-
Bool
RROutputSetConnection (RROutputPtr output,
CARD8 connection)
++++++ randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff ++++++
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 858b1ed..bd5d5b1 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -98,6 +98,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
if (!output)
return;
RROutputSetCrtcs (output, &crtc, 1);
+ output->crtc = crtc;
RROutputSetConnection (output, RR_Connected);
#ifdef RENDER
RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
++++++ randr12-aec0d06469a2fa7440fdd5ee03dc256a68704e77.diff ++++++
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index d92a0ff..8798b42 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -738,6 +738,7 @@ ProcRRSetScreenConfig (ClientPtr client)
int rate;
Bool has_rate;
RROutputPtr output;
+ RRCrtcPtr crtc;
RRModePtr mode;
RR10DataPtr pData = NULL;
RRScreenSizePtr pSize;
@@ -783,7 +784,9 @@ ProcRRSetScreenConfig (ClientPtr client)
rep.status = RRSetConfigFailed;
goto sendReply;
}
-
+
+ crtc = output->crtc;
+
/*
* if the client's config timestamp is not the same as the last config
* timestamp, then the config information isn't up-to-date and
@@ -831,7 +834,7 @@ ProcRRSetScreenConfig (ClientPtr client)
return BadValue;
}
- if ((~output->crtc->rotations) & rotation)
+ if ((~crtc->rotations) & rotation)
{
/*
* requested rotation or reflection not supported by screen
@@ -914,7 +917,7 @@ ProcRRSetScreenConfig (ClientPtr client)
}
}
- if (!RRCrtcSet (output->crtc, mode, 0, 0, stuff->rotation, 1, &output))
+ if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))
rep.status = RRSetConfigFailed;
else
rep.status = RRSetConfigSuccess;
++++++ randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff ++++++
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 8b0c93d..7e77d39 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -104,7 +104,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
#endif
}
- output = RRFirstOutput (pScreen);
+ output = pScrPriv->outputs[0];
if (!output)
return;
crtc = pScrPriv->crtcs[0];
++++++ randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff ++++++
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index bd5d5b1..8b0c93d 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -98,7 +98,6 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
if (!output)
return;
RROutputSetCrtcs (output, &crtc, 1);
- output->crtc = crtc;
RROutputSetConnection (output, RR_Connected);
#ifdef RENDER
RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
@@ -108,7 +107,9 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
output = RRFirstOutput (pScreen);
if (!output)
return;
- crtc = output->crtc;
+ crtc = pScrPriv->crtcs[0];
+ if (!crtc)
+ return;
/* check rotations */
if (rotations != crtc->rotations)
@@ -168,7 +169,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
/* notice current mode */
if (newMode)
- RRCrtcNotify (output->crtc, newMode, 0, 0, pScrPriv->rotation,
+ RRCrtcNotify (crtc, newMode, 0, 0, pScrPriv->rotation,
1, &output);
}
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package MozillaFirefox
checked in at Fri Aug 31 18:42:46 CEST 2007.
--------
--- MozillaFirefox/MozillaFirefox.changes 2007-08-28 17:08:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2007-08-31 18:36:27.290074000 +0200
@@ -1,0 +2,5 @@
+Fri Aug 31 18:36:16 CEST 2007 - maw(a)suse.de
+
+- Mark a .png file as nonexecutable.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.c19640/_old 2007-08-31 18:42:31.000000000 +0200
+++ /var/tmp/diff_new_pack.c19640/_new 2007-08-31 18:42:31.000000000 +0200
@@ -29,7 +29,7 @@
Obsoletes: mozilla
%endif
Version: 2.0.0.6
-Release: 3
+Release: 6
Summary: Mozilla Firefox Web Browser
URL: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -421,6 +421,7 @@
%define __find_requires %{my_requires}
%endif
%find_gconf_schemas
+chmod -x $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png
%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT
@@ -556,6 +557,8 @@
%endif
%changelog
+* Fri Aug 31 2007 - maw(a)suse.de
+- Mark a .png file as nonexecutable.
* Tue Aug 28 2007 - maw(a)suse.de
- Minor .spec update (#305193)
+ Remove two obsolete patches
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Fri Aug 31 18:42:34 CEST 2007.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2007-08-06 16:16:34.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2007-08-31 17:31:07.889721000 +0200
@@ -1,0 +2,11 @@
+Fri Aug 31 17:04:37 CEST 2007 - kmachalkova(a)suse.cz
+
+- Move all installation-related functionality into separate inst.
+ clients (_proposal and _finish) (FaTE #302192)
+- Do not check for xntp package during installation (#299557, #299238)
+- Call 'ntpdate' to synchronize with NTP server during installation
+ (do not restart the service) (#299238)
+- 'During boot' NTP service start is now default (#302389)
+- 2.15.7
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.15.6.tar.bz2
New:
----
yast2-ntp-client-2.15.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.Z18029/_old 2007-08-31 18:42:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Z18029/_new 2007-08-31 18:42:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.15.6)
+# spec file for package yast2-ntp-client (Version 2.15.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ntp-client
-Version: 2.15.6
+Version: 2.15.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.15.6.tar.bz2
+Source0: yast2-ntp-client-2.15.7.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
#SLPAPI.pm
@@ -36,7 +36,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-ntp-client-2.15.6
+%setup -n yast2-ntp-client-2.15.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,14 @@
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog
+* Fri Aug 31 2007 - kmachalkova(a)suse.cz
+- Move all installation-related functionality into separate inst.
+ clients (_proposal and _finish) (FaTE #302192)
+- Do not check for xntp package during installation (#299557, #299238)
+- Call 'ntpdate' to synchronize with NTP server during installation
+ (do not restart the service) (#299238)
+- 'During boot' NTP service start is now default (#302389)
+- 2.15.7
* Mon Aug 06 2007 - kmachalkova(a)suse.cz
- Do not allow to edit access control rules if NTP is configured
via DHCP (DHCP may servers distribute their own rule set)
++++++ yast2-ntp-client-2.15.6.tar.bz2 -> yast2-ntp-client-2.15.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/dialogs.ycp new/yast2-ntp-client-2.15.7/src/dialogs.ycp
--- old/yast2-ntp-client-2.15.6/src/dialogs.ycp 2007-08-06 16:00:31.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/src/dialogs.ycp 2007-08-31 17:04:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: dialogs.ycp 40007 2007-08-06 14:00:31Z kmachalkova $
+ * $Id: dialogs.ycp 40655 2007-08-31 15:04:20Z kmachalkova $
*/
{
@@ -16,6 +16,7 @@
import "Label";
import "NtpClient";
import "Popup";
+import "Stage";
import "SuSEFirewall";
import "Wizard";
import "Report";
@@ -51,14 +52,22 @@
*/
define symbol ReadDialog() ``{
Wizard::RestoreHelp(HELPS["read"]:"");
-
- // checking for root permissions (#158483)
- if (!Confirm::MustBeRoot())
- return `abort;
-
- NtpClient::AbortFunction = PollAbort;
- boolean ret = NtpClient::Read();
- return ret ? `next : `abort;
+
+ if(Stage::initial())
+ {
+ NtpClient::ProcessNtpConf();
+ return `next;
+ }
+ else
+ {
+ // checking for root permissions (#158483)
+ if (!Confirm::MustBeRoot())
+ return `abort;
+
+ NtpClient::AbortFunction = PollAbort;
+ boolean ret = NtpClient::Read();
+ return ret ? `next : `abort;
+ }
}
/**
@@ -66,6 +75,9 @@
* @return `abort if aborted and `next otherwise
*/
define symbol WriteDialog() ``{
+ if (Stage::initial())
+ return `next;
+
Wizard::RestoreHelp(HELPS["write"]:"");
NtpClient::AbortFunction = PollAbort;
boolean ret = NtpClient::Write();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/helps.ycp new/yast2-ntp-client-2.15.7/src/helps.ycp
--- old/yast2-ntp-client-2.15.6/src/helps.ycp 2007-08-06 15:15:49.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/src/helps.ycp 2007-08-10 12:25:19.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: helps.ycp 40001 2007-08-06 13:15:48Z kmachalkova $
+ * $Id: helps.ycp 40156 2007-08-10 10:25:18Z kmachalkova $
*/
{
@@ -45,12 +45,13 @@
<b>Run NTP Daemon in Chroot Jail</b>. Starting any daemon in a chroot jail
is more secure and strongly recommended.</p>"),
- "secure" : _("<p><b><big>Restricting NTP Service</big></b><br>
+ "secure" : _("<p><b><big>Secure NTP Configuration</big></b><br>
By selecting the option <b>Restrict NTP Service to Configured Servers Only</b>
-you prohibit general access to NTP service on your computer and restrict it
-only to those servers listed in <i>/etc/ntp.conf</i> and localhost. Access
-control flags can be fine-tuned by editing corresponding server entry in
-servers overview table. This option is however not available, if NTP is
+you prohibit all remote hosts to view and modify NTP settings on your
+computer. In this way NTP service is restricted only to those servers listed
+in <i>/etc/ntp.conf</i> and localhost.<br>
+Access control flags can be fine-tuned by editing corresponding server entry
+in servers overview table. This option is not available if NTP is
configured via DHCP.</p>"),
// help text 3/5
@@ -143,10 +144,11 @@
<i>/usr/share/doc/packages/xntp-doc/html/confopt.htm</i>.</p>"),
"restrict" : _("<p><b><big>Access Control Options</big></b><br>
-Here you can define access control flags (<i>restrict</i> directive in <i>
-/etc/ntp.conf</i>) for this server, indicating which type of packets you
-wish to accept from it. This option is only available if you have
-chosen <b>Restrict NTP Service to Configured Servers Only</b> option in
+Here you can define access control flags (<b><i>restrict</i></b> directive in
+<i>/etc/ntp.conf</i>) for this server, indicating which types of actions remote
+host can perform on your NTP daemon. By default, it is set to <i>notrap
+nomodify noquery</i> This option is only available if you have checked
+<b>Restrict NTP Service to Configured Servers Only</b> option in
<b>Security Settings</b>.</p>
"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/Makefile.am new/yast2-ntp-client-2.15.7/src/Makefile.am
--- old/yast2-ntp-client-2.15.6/src/Makefile.am 2007-05-18 10:56:19.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/src/Makefile.am 2007-08-31 10:33:18.000000000 +0200
@@ -8,7 +8,9 @@
client_DATA = \
ntp-client.ycp \
- ntp-client_auto.ycp
+ ntp-client_auto.ycp \
+ ntp-client_proposal.ycp \
+ ntp-client_finish.ycp
ynclude_DATA = \
helps.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/Makefile.in new/yast2-ntp-client-2.15.7/src/Makefile.in
--- old/yast2-ntp-client-2.15.6/src/Makefile.in 2007-06-15 17:10:45.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/src/Makefile.in 2007-08-31 11:29:48.000000000 +0200
@@ -187,7 +187,9 @@
YCPCFLAGS = -I .
client_DATA = \
ntp-client.ycp \
- ntp-client_auto.ycp
+ ntp-client_auto.ycp \
+ ntp-client_proposal.ycp \
+ ntp-client_finish.ycp
ynclude_DATA = \
helps.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/ntp-client_auto.ycp new/yast2-ntp-client-2.15.7/src/ntp-client_auto.ycp
--- old/yast2-ntp-client-2.15.6/src/ntp-client_auto.ycp 2007-07-26 17:32:55.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/src/ntp-client_auto.ycp 2007-08-31 17:04:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: ntp-client_auto.ycp 39724 2007-07-26 15:32:56Z kmachalkova $
+ * $Id: ntp-client_auto.ycp 40655 2007-08-31 15:04:20Z kmachalkova $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -87,18 +87,11 @@
else if (func == "Write") {
import "Progress";
boolean progress_orig = Progress::set (false);
- //restart_service - also do 'rcntpd restart' and trigger time change
- //otherwise - only write ntp.conf and stuff (default for autoyast)
- if (param["restart_services"]:false == false)
- NtpClient::write_only = true;
+ NtpClient::write_only = true;
ret = NtpClient::Write();
Progress::set (progress_orig);
}
-else if (func == "GetNtpServersByCountry") {
- string cc = param["country"]:NtpClient::GetCurrentLanguageCode();
- ret = NtpClient::GetNtpServersByCountry( cc );
-}
/* Unknown function */
else {
y2error("Unknown function: %1", func);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/ntp-client_finish.ycp new/yast2-ntp-client-2.15.7/src/ntp-client_finish.ycp
--- old/yast2-ntp-client-2.15.6/src/ntp-client_finish.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ntp-client-2.15.7/src/ntp-client_finish.ycp 2007-08-31 15:17:15.000000000 +0200
@@ -0,0 +1,58 @@
+/**
+ * File: clients/ntp-client_finish.ycp
+ * Summary: Installation client for writing ntp configuration
+ * at the end of 1st stage
+ * Author: Bubli <kmachalkova(a)suse.cz>
+ *
+ */
+{
+textdomain "ntp-client";
+
+import "NtpClient";
+
+any ret = nil;
+string func = "";
+map param = $[];
+
+/* Check arguments */
+if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+ func = (string)WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = (map)WFM::Args(1);
+}
+
+y2milestone ("starting ntp-client_finish");
+y2debug("func=%1", func);
+y2debug("param=%1", param);
+
+if (func == "Info")
+{
+ return (any)$[
+ "steps" : 1,
+ // progress step title
+ "title" : _("Writing NTP Configuration..."),
+ "when" : [ `installation, `autoinst ],
+ ];
+}
+else if (func == "Write")
+{
+ map ex = NtpClient::Export();
+
+ NtpClient::Read();
+
+ NtpClient::Import( ex );
+
+ NtpClient::Write();
+
+}
+else
+{
+ y2error ("unknown function: %1", func);
+ ret = nil;
+}
+
+y2debug("ret=%1", ret);
+y2milestone("ntp-client_finish finished");
+return ret;
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.15.7/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.15.6/src/ntp-client_proposal.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ntp-client-2.15.7/src/ntp-client_proposal.ycp 2007-08-31 17:17:11.000000000 +0200
@@ -0,0 +1,168 @@
+/**
+ * File: clients/ntp-client_proposal.ycp
+ * Summary: Installation client for ntp configuration
+ * Author: Bubli <kmachalkova(a)suse.cz>
+ *
+ */
+
+{
+textdomain "ntp-client";
+
+import "Hostname";
+import "NetworkService";
+import "NtpClient";
+import "Service";
+import "String";
+import "Stage";
+import "Package";
+import "Pkg";
+
+y2milestone("----------------------------------------");
+y2milestone("Ntp client proposal started");
+y2milestone("Arguments: %1", WFM::Args());
+
+any ret = nil;
+string func = "";
+map param = $[];
+
+if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+ func = (string)WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = (map)WFM::Args(1);
+}
+
+void ProposeSomething()
+{
+ list ntp_items = [];
+ if( NtpClient::already_proposed || NtpClient::ProcessNtpConf() )
+ {
+ ntp_items = maplist(string server, NtpClient::GetUsedNtpServers(),{
+ return `item(`id(server), server);
+ });
+ }
+ if( ntp_items == [])
+ {
+ string cc = param["country"]:NtpClient::GetCurrentLanguageCode();
+ y2milestone("Nothing found in /etc/ntp.conf, proposing current language-based NTP server list");
+ ntp_items = NtpClient::GetNtpServersByCountry( cc, true );
+ NtpClient::already_proposed = true;
+ }
+ UI::ChangeWidget(`id(`ntp_address), `Items, ntp_items);
+
+}
+
+void AddSingleServer( string server )
+{
+ NtpClient::selected_record["address"] = server;
+ NtpClient::selected_record["type"] = "server";
+ NtpClient::storeSyncRecord();
+}
+
+if (func == "CreateUI")
+{
+ term cont =
+ `Left (`VBox ( `id(`ntp_content),
+ `Left (`RadioButton (`id (`ntp), `opt (`notify),
+ // radio button label
+ _("Synchronize with NTP Server"), false)
+ ),
+ `VSpacing (0.5),
+ `HBox (
+ `HSpacing (3),
+ `MinWidth (38,
+ `ComboBox (`id (`ntp_address), `opt (`editable),
+ // combo box label
+ _("NTP Server Address")
+ )
+ ),
+ `VBox (
+ `Label (""),
+ // push button label
+ `PushButton (`id (`ntp_configure), _("Configure..."))
+ )
+ )
+ ));
+
+ if (UI::WidgetExists(`id(`rp)))
+ {
+ UI::ReplaceWidget(`id(`rp), cont);
+
+ if (!NetworkService::isNetworkRunning())
+ {
+ y2warning("Network is not running, NTP synchronization will not be available");
+ UI::ChangeWidget(`id(`ntp_content), `Enabled, false);
+ }
+
+ //does not really work ideally, need something better pkg binding :(
+ if (!Package::Available("xntp"))
+ {
+ y2warning("xntp package is not installable, NTP synchronization will not be available");
+ UI::ChangeWidget(`id(`ntp_content), `Enabled, false);
+ }
+ }
+
+ ret = true;
+}
+
+else if (func == "MakeProposal")
+{
+ ProposeSomething();
+ ret = true;
+}
+
+else if (func == "Write")
+{
+ string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
+ if (!Hostname::CheckFQ(ntp_server))
+ {
+ UI::SetFocus(`id(`ntp_address));
+ ret = `invalid_hostname;
+ }
+ else
+ {
+ y2milestone("Running ntpdate to sync with %1", ntp_server);
+
+ integer status = 0;
+ string service_name = "ntp";
+
+ //Stop NTP service on running system (during 1st stage, we don't care)
+ if( !Stage::initial() && status == 0)
+ {
+ Service::Stop(service_name);
+ }
+
+ //Schedule package for installation
+ Pkg::PkgInstall("xntp");
+
+ integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server)));
+ y2milestone ("'ntpdate %1' returned %2", ntp_server, r);
+
+ if( !Stage::initial() && status == 0)
+ {
+ Service::Start(service_name);
+ }
+
+ if (r == 0)
+ {
+ ret = `success;
+ AddSingleServer(ntp_server);
+ }
+ else
+ ret = `ntpdate_failed;
+ }
+}
+
+else if (func == "AskUser")
+{
+ string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
+ AddSingleServer(ntp_server);
+ ret = (symbol) WFM::CallFunction("ntp-client");
+ ProposeSomething();
+}
+
+y2milestone("Ntp client proposal finished");
+y2milestone("----------------------------------------");
+return ret;
+}
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/NtpClient.ycp new/yast2-ntp-client-2.15.7/src/NtpClient.ycp
--- old/yast2-ntp-client-2.15.6/src/NtpClient.ycp 2007-07-27 15:55:51.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/src/NtpClient.ycp 2007-08-31 17:04:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of ntp-client, input and output functions.
* Authors: Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: NtpClient.ycp 39727 2007-07-26 16:15:06Z kmachalkova $
+ * $Id: NtpClient.ycp 40655 2007-08-31 15:04:20Z kmachalkova $
*
* Representation of the configuration of ntp-client.
* Input and output routines.
@@ -58,7 +58,7 @@
/**
* Should the daemon be started when system boots?
*/
-global boolean run_service = false;
+global boolean run_service = true;
/**
* Service name of the NTP daemon
@@ -124,6 +124,8 @@
global boolean simple_dialog = false;
+global boolean already_proposed = false;
+
/**
* Abort function
* @return blah blah lahjk
@@ -156,7 +158,7 @@
//workaround bug #241054: servers in United Kingdom are in domain .uk
// domain .gb does not exist - add UK to the list of known countries
- if (haskey(known_countries, "GB")){
+ if (haskey(known_countries, "GB")){
known_countries["UK"] = known_countries["GB"]:"";
known_countries = remove(known_countries,"GB");
}
@@ -238,9 +240,10 @@
/**
* Get list of public NTP servers for a country
* @param country two-letter country code
+ * @param terse_output display additional data (location etc.)
* @return list of servers (usable as combo-box items)
*/
-global list GetNtpServersByCountry ( string country ) {
+global list GetNtpServersByCountry ( string country, boolean terse_output ) {
map<string,string> country_names = $[];
map<string,map<string,string> > servers = GetNtpServers ();
if (country != "")
@@ -255,7 +258,7 @@
}
list items = maplist (string s, map<string,string> o, servers, {
- string label = o["location"]:"";
+ string label = o["location"]:"";
string l_country = o["country"]:"";
if (country != "")
l_country = "";
@@ -267,7 +270,11 @@
label = s;
else
label = sformat ("%1 (%2%3)", s, label, l_country);
- return `item (`id (s), label);
+
+ if (terse_output)
+ return `item (`id(s), s);
+ else
+ return `item (`id (s), label);
});
return items;
@@ -275,79 +282,22 @@
}
/**
- * Read all ntp-client settings
+ * Read and parse /etc.ntp.conf
* @return true on success
*/
-global define boolean Read() ``{
-
- /* NtpClient read dialog caption */
- string caption = _("Initializing NTP Client Configuration");
-
- integer steps = 2;
- integer sl = 500;
- // We do not set help text here, because it was set outside
- Progress::New( caption, " ", steps, [
- // progress stage
- _("Read network configuration"),
- // progress stage
- _("Read NTP settings"),
- ], [
- // progress step
- _("Reading network configuration..."),
- // progress step
- _("Reading NTP settings..."),
- // progress step
- _("Finished")
- ],
- ""
- );
-
- // read network configuration
- if(Abort()) return false;
- Progress::NextStage();
-
- boolean progress_orig = Progress::set (false);
- NetworkDevices::Read ();
- Progress::set (progress_orig);
- config_dhcp = tolower ((string)SCR::Read (.sysconfig.network.dhcp.DHCLIENT_MODIFY_NTP_CONF)) == "yes";
- original_config_dhcp = config_dhcp;
-
- GetNtpServers ();
- GetCountryNames ();
- // read current settings
- if(Abort()) return false;
- Progress::NextStage();
+global define boolean ProcessNtpConf() ``{
- boolean failed = false;
+ map conf = nil;
+ if (FileUtils::Exists("/etc/ntp.conf"))
+ conf = (map)SCR::Read (.etc.ntp_conf.all);
- if (! Mode::testsuite ()
- && ! PackageSystem::CheckAndInstallPackagesInteractive (["xntp"])
- )
+ if (conf == nil )
{
+ y2error("Failed to read /etc/ntp.conf, either it doesn't exist or contains no data");
return false;
}
- run_service = Service::Enabled (service_name);
-
- //Poke to /var/lib/YaST if there is Active Directory controller address dumped in .ycp file
- string ad_ntp_file = Directory::vardir + "/ad_ntp_data.ycp";
- if(FileUtils::Exists(ad_ntp_file)) {
- y2milestone("Reading %1", ad_ntp_file);
- map <string, string> ad_ntp_data = (map <string, string>) SCR::Read(.target.ycp, ad_ntp_file);
- ad_controller = ad_ntp_data["ads"]:"";
- if(ad_controller != "") {
- y2milestone("Got %1 for ntp sync, deleting %2, since it is no longer needed", ad_controller, ad_ntp_file);
- SCR::Execute(.target.remove, ad_ntp_file);
- }
- }
-
-
- map conf = (map)SCR::Read (.etc.ntp_conf.all);
- if (conf == nil)
- {
- failed = true;
- conf = $[];
- }
+ already_proposed = true;
list<map<string, any> > value = conf["value"]:[];
integer index = -1;
ntp_records = maplist (map<string, any> m, value, ``{
@@ -424,16 +374,6 @@
return m;
});
- run_chroot = SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED) == "yes";
-
- string initial_sync = (string)SCR::Read (.sysconfig.ntp.NTPD_INITIAL_NTPDATE);
- if (initial_sync == nil)
- {
- initial_sync = "";
- failed = true;
- y2error ("Failed reading .sysconfig.ntp.NTPD_INITIAL_NTPDATE");
- }
-
// mark local clock to be local clock and not real servers
ntp_records = maplist (map<string,any> p, ntp_records, ``{
if (p["type"]:"" == "server"
@@ -444,6 +384,89 @@
return p;
});
+ return true;
+
+}
+
+/**
+ * Read all ntp-client settings
+ * @return true on success
+ */
+global define boolean Read() ``{
+
+ /* NtpClient read dialog caption */
+ string caption = _("Initializing NTP Client Configuration");
+
+ integer steps = 2;
+ integer sl = 500;
+ // We do not set help text here, because it was set outside
+ Progress::New( caption, " ", steps, [
+ // progress stage
+ _("Read network configuration"),
+ // progress stage
+ _("Read NTP settings"),
+ ], [
+ // progress step
+ _("Reading network configuration..."),
+ // progress step
+ _("Reading NTP settings..."),
+ // progress step
+ _("Finished")
+ ],
+ ""
+ );
+
+ // read network configuration
+ if(Abort()) return false;
+ Progress::NextStage();
+
+ boolean progress_orig = Progress::set (false);
+ NetworkDevices::Read ();
+ Progress::set (progress_orig);
+ config_dhcp = tolower ((string)SCR::Read (.sysconfig.network.dhcp.DHCLIENT_MODIFY_NTP_CONF)) == "yes";
+ original_config_dhcp = config_dhcp;
+
+ GetNtpServers ();
+ GetCountryNames ();
+ // read current settings
+ if(Abort()) return false;
+ Progress::NextStage();
+
+ boolean failed = false;
+
+ if (! Mode::testsuite () && ! Mode::installation ()
+ && ! PackageSystem::CheckAndInstallPackagesInteractive (["xntp"])
+ )
+ {
+ return false;
+ }
+
+ run_service = Service::Enabled (service_name);
+
+ //Poke to /var/lib/YaST if there is Active Directory controller address dumped in .ycp file
+ string ad_ntp_file = Directory::vardir + "/ad_ntp_data.ycp";
+ if(FileUtils::Exists(ad_ntp_file)) {
+ y2milestone("Reading %1", ad_ntp_file);
+ map <string, string> ad_ntp_data = (map <string, string>) SCR::Read(.target.ycp, ad_ntp_file);
+ ad_controller = ad_ntp_data["ads"]:"";
+ if(ad_controller != "") {
+ y2milestone("Got %1 for ntp sync, deleting %2, since it is no longer needed", ad_controller, ad_ntp_file);
+ SCR::Execute(.target.remove, ad_ntp_file);
+ }
+ }
+
+ ProcessNtpConf();
+
+ run_chroot = SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED) == "yes";
+
+ string initial_sync = (string)SCR::Read (.sysconfig.ntp.NTPD_INITIAL_NTPDATE);
+ if (initial_sync == nil)
+ {
+ initial_sync = "";
+ failed = true;
+ y2error ("Failed reading .sysconfig.ntp.NTPD_INITIAL_NTPDATE");
+ }
+
// mark those servers and peers that are used for initial syncing
if (initial_sync == "AUTO")
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/src/widgets.ycp new/yast2-ntp-client-2.15.7/src/widgets.ycp
--- old/yast2-ntp-client-2.15.6/src/widgets.ycp 2007-08-06 15:15:49.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/src/widgets.ycp 2007-08-31 17:04:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets definitions
* Authors: Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: widgets.ycp 40001 2007-08-06 13:15:48Z kmachalkova $
+ * $Id: widgets.ycp 40655 2007-08-31 15:04:20Z kmachalkova $
*/
{
@@ -887,7 +887,7 @@
{
last_country = country;
- list items = NtpClient::GetNtpServersByCountry ( country);
+ list items = NtpClient::GetNtpServersByCountry ( country, false);
UI::ReplaceWidget (`servers_rp,
`VBox(
// Combobox has at least 40 characters
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.6/VERSION new/yast2-ntp-client-2.15.7/VERSION
--- old/yast2-ntp-client-2.15.6/VERSION 2007-08-06 16:03:19.000000000 +0200
+++ new/yast2-ntp-client-2.15.7/VERSION 2007-08-31 17:23:03.000000000 +0200
@@ -1 +1 @@
-2.15.6
+2.15.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kdepim3
checked in at Fri Aug 31 18:42:22 CEST 2007.
--------
--- KDE/kdepim3/kdepim3.changes 2007-08-29 12:14:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-08-31 18:32:00.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 31 15:52:54 CEST 2007 - wstephenson(a)suse.de
+
+- Fix crash on pasting into mail composer
+ (#302067)
+- Fix crashes around POP fetching
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.V16286/_old 2007-08-31 18:42:03.000000000 +0200
+++ /var/tmp/diff_new_pack.V16286/_new 2007-08-31 18:42:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdepim3 (Version 3.5.7.enterprise.0.20070731.694771)
+# spec file for package kdepim3 (Version 3.5.7.enterprise.0.20070731.705702)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -27,8 +27,8 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: Personal Information Manager Software for KDE
-Version: 3.5.7.enterprise.0.20070731.694771
-Release: 18
+Version: 3.5.7.enterprise.0.20070731.705702
+Release: 1
%define realversion 3.5.6.enterprise.0.20070731.694771
URL: http://www.kde.org/
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
@@ -311,6 +311,19 @@
/opt/kde3/bin/korga*
/opt/kde3/bin/kode
/opt/kde3/bin/exchangewizard
+/opt/kde3/bin/scalixadmin
+/opt/kde3/bin/scalixwizard
+/opt/kde3/%_lib/kde3/kio_scalix.*
+/opt/kde3/%_lib/kde3/knotes_scalix.*
+/opt/kde3/%_lib/kde3/libscalixwizard.*
+/opt/kde3/%_lib/libkabcscalix.*
+/opt/kde3/%_lib/libkabcscalix.so.*
+/opt/kde3/%_lib/libkcalscalix.*
+/opt/kde3/%_lib/libknotesscalix.*
+/opt/kde3/share/config.kcfg/scalix.kcfg
+/opt/kde3/share/services/scalix.protocol
+/opt/kde3/share/services/scalixs.protocol
+
/opt/kde3/%_lib/kde3/libexchangewizard.*
/opt/kde3/%_lib/kde3/kcm_korganizer.*
/opt/kde3/%_lib/kde3/libkorg*
@@ -783,6 +796,10 @@
%endif
%changelog
+* Fri Aug 31 2007 - wstephenson(a)suse.de
+- Fix crash on pasting into mail composer
+ (#302067)
+- Fix crashes around POP fetching
* Wed Aug 29 2007 - wstephenson(a)suse.de
- Update enterprise branch diff to fix
- #305828 KMail crash retrieving mail
++++++ ENTERPRISE_BRANCH.diff ++++++
++++ 16349 lines (skipped)
++++ between KDE/kdepim3/ENTERPRISE_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdepim3/ENTERPRISE_BRANCH.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Aug 31 18:42:14 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-08-24 15:42:41.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-08-31 16:27:55.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 31 16:26:07 CEST 2007 - locilka(a)suse.cz
+
+- Calling ntp_client_finish client at the end of the installation
+ (#299238#c9).
+- 2.15.45
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.44.tar.bz2
New:
----
yast2-installation-2.15.45.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.l16663/_old 2007-08-31 18:42:08.000000000 +0200
+++ /var/tmp/diff_new_pack.l16663/_new 2007-08-31 18:42:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.44)
+# spec file for package yast2-installation (Version 2.15.45)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.15.44
+Version: 2.15.45
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.44.tar.bz2
+Source0: yast2-installation-2.15.45.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
# Mode::live_installation
@@ -63,12 +63,12 @@
BuildArchitectures: noarch
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.15.44
+Version: 2.15.45
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.44.tar.bz2
+Source0: yast2-installation-2.15.45.tar.bz2
prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -102,7 +102,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-installation-2.15.44
+%setup -n yast2-installation-2.15.45
%build
%{prefix}/bin/y2tool y2autoconf
@@ -176,6 +176,10 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Fri Aug 31 2007 - locilka(a)suse.cz
+- Calling ntp_client_finish client at the end of the installation
+ (#299238#c9).
+- 2.15.45
* Fri Aug 24 2007 - locilka(a)suse.cz
- Changing forgotten "catalogs" to "initializing..." (#302384).
- 2.15.44
++++++ yast2-installation-2.15.44.tar.bz2 -> yast2-installation-2.15.45.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.44/src/clients/inst_finish.ycp new/yast2-installation-2.15.45/src/clients/inst_finish.ycp
--- old/yast2-installation-2.15.44/src/clients/inst_finish.ycp 2007-08-09 09:15:50.000000000 +0200
+++ new/yast2-installation-2.15.45/src/clients/inst_finish.ycp 2007-08-31 16:28:05.000000000 +0200
@@ -6,7 +6,7 @@
* Arvin Schnell <arvin(a)suse.de>
* Jiri Srain <jsrain(a)suse.de>
*
- * $Id: inst_finish.ycp 40085 2007-08-08 10:48:41Z jsrain $
+ * $Id: inst_finish.ycp 40652 2007-08-31 14:28:04Z locilka $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -79,6 +79,7 @@
"label" : _("Save installation settings"),
"steps" : [
"network",
+ "ntp_client",
"ssh_settings",
"save_hw_status",
"autoinst_scripts2",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.44/VERSION new/yast2-installation-2.15.45/VERSION
--- old/yast2-installation-2.15.44/VERSION 2007-08-24 15:42:46.000000000 +0200
+++ new/yast2-installation-2.15.45/VERSION 2007-08-31 16:26:00.000000000 +0200
@@ -1 +1 @@
-2.15.44
+2.15.45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package glibc
checked in at Fri Aug 31 18:41:42 CEST 2007.
--------
--- glibc/glibc.changes 2007-08-22 00:24:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2007-08-31 17:39:16.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 31 17:38:02 CEST 2007 - aj(a)suse.de
+
+- Add /usr/share/locale-bundle/ as fallback directory for usage
+ with bundle-lang packages (see bug #302270).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glibc.spec ++++++
--- /var/tmp/diff_new_pack.R13108/_old 2007-08-31 18:41:10.000000000 +0200
+++ /var/tmp/diff_new_pack.R13108/_new 2007-08-31 18:41:10.000000000 +0200
@@ -27,7 +27,7 @@
Provides: rtld(GNU_HASH)
Autoreqprov: on
Version: 2.6.1
-Release: 8
+Release: 11
%define snapshot_date 2007080316
URL: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem
@@ -894,6 +894,9 @@
%{_libdir}/libdl_p.a
%changelog
+* Fri Aug 31 2007 - aj(a)suse.de
+- Add /usr/share/locale-bundle/ as fallback directory for usage
+ with bundle-lang packages (see bug #302270).
* Tue Aug 21 2007 - pbaudis(a)suse.cz
- Reintroduce errorneously omitted AMD64 optimizations
(and fix them to compile again)
++++++ glibc-2.3.90-langpackdir.diff ++++++
--- /var/tmp/diff_new_pack.R13108/_old 2007-08-31 18:41:10.000000000 +0200
+++ /var/tmp/diff_new_pack.R13108/_new 2007-08-31 18:41:10.000000000 +0200
@@ -1,6 +1,11 @@
---- intl/loadmsgcat.c
-+++ intl/loadmsgcat.c 2006/02/06 14:18:51
-@@ -806,8 +806,31 @@
+Index: intl/loadmsgcat.c
+===================================================================
+RCS file: /cvs/glibc/libc/intl/loadmsgcat.c,v
+retrieving revision 1.57
+diff -u -p -r1.57 loadmsgcat.c
+--- intl/loadmsgcat.c 28 Jul 2007 20:34:43 -0000 1.57
++++ intl/loadmsgcat.c 31 Aug 2007 15:36:40 -0000
+@@ -806,8 +806,52 @@ _nl_load_domain (domain_file, domainbind
if (domain_file->filename == NULL)
goto out;
@@ -9,21 +14,21 @@
+ /* Replace /locale/ with /usr/share/locale-langpack/ */
+ const char *langpackdir = "/usr/share/locale-langpack/";
+ char *filename_langpack = malloc (strlen (domain_file->filename) +
-+ strlen (langpackdir));
++ strlen (langpackdir));
+ if (filename_langpack != NULL)
+ {
+ char *p = strstr (domain_file->filename, "/locale/");
+ if (p != NULL)
-+ {
-+ strcpy (filename_langpack, langpackdir);
-+ strcpy (&filename_langpack[strlen (langpackdir)],
-+ (p+8));
-+ if ((fd = open (filename_langpack, O_RDONLY)) == -1)
-+ fd = open (domain_file->filename, O_RDONLY);
-+ }
++ {
++ strcpy (filename_langpack, langpackdir);
++ strcpy (&filename_langpack[strlen (langpackdir)],
++ (p+8));
++ if ((fd = open (filename_langpack, O_RDONLY)) == -1)
++ fd = open (domain_file->filename, O_RDONLY);
++ }
+ else
-+ /* Try to open the addressed file. */
-+ fd = open (domain_file->filename, O_RDONLY);
++ /* Try to open the addressed file. */
++ fd = open (domain_file->filename, O_RDONLY);
+
+ free (filename_langpack);
+ }
@@ -31,6 +36,27 @@
+ /* Try to open the addressed file. */
+ fd = open (domain_file->filename, O_RDONLY);
+
++ if (fd == -1)
++ {
++ /* Use the fallback directory. */
++ const char *bundle_dir = "/usr/share/locale-bundle/";
++ char *filename_bundle = malloc (strlen (domain_file->filename) +
++ strlen (bundle_dir));
++ if (filename_bundle != NULL)
++ {
++ char *p = strstr (domain_file->filename, "/locale/");
++ if (p != NULL)
++ {
++ strcpy (filename_bundle, bundle_dir);
++ strcpy (&filename_bundle[strlen (bundle_dir)],
++ (p+8));
++ fd = open (filename_bundle, O_RDONLY);
++ }
++
++ free (filename_bundle);
++ }
++ }
++
if (fd == -1)
goto out;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0