Hello community,
here is the log from the commit of package yast2-phone-services for
openSUSE:Factory checked in at 2012-03-20 17:48:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-phone-services (Old)
and /work/SRC/openSUSE:Factory/.yast2-phone-services.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-phone-services", Maintainer is "mvid...@suse.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-phone-services/yast2-phone-services.changes
2011-10-03 09:26:51.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-phone-services.new/yast2-phone-services.changes
2012-03-20 17:48:51.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 19 12:46:25 UTC 2012 - mfi...@suse.com
+
+- Fixed definition of Fax user edit dialog - bnc#739731
+- 2.21.1
+
+-------------------------------------------------------------------
Old:
----
yast2-phone-services-2.21.0.tar.bz2
New:
----
yast2-phone-services-2.21.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-phone-services.spec ++++++
--- /var/tmp/diff_new_pack.lSpaTP/_old 2012-03-20 17:48:52.000000000 +0100
+++ /var/tmp/diff_new_pack.lSpaTP/_new 2012-03-20 17:48:52.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-phone-services
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: yast2-phone-services
-Version: 2.21.0
+Version: 2.21.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-phone-services-%{version}.tar.bz2
-Prefix: /usr
-
Group: System/YaST
License: GPL-2.0+
BuildRequires: doxygen perl-XML-Writer pkg-config update-desktop-files yast2
yast2-devtools yast2-users
@@ -45,23 +42,22 @@
%setup -n yast2-phone-services-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -75,8 +71,8 @@
/usr/share/YaST2/include/phone-services/*
/usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/modules/*.y*
-%{prefix}/share/applications/YaST2/*.desktop
+%{_prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/scrconf/*.scr
-%doc %{prefix}/share/doc/packages/yast2-phone-services
+%doc %{_prefix}/share/doc/packages/yast2-phone-services
%changelog
++++++ yast2-phone-services-2.21.0.tar.bz2 ->
yast2-phone-services-2.21.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-phone-services-2.21.0/Makefile.am
new/yast2-phone-services-2.21.1/Makefile.am
--- old/yast2-phone-services-2.21.0/Makefile.am 2011-09-27 10:25:50.000000000
+0200
+++ new/yast2-phone-services-2.21.1/Makefile.am 2012-03-20 12:32:41.000000000
+0100
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -35,7 +34,7 @@
# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo
./devtools/admin; else pkg-config --print-errors --variable=datadir
yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo
./devtools/admin; else pkg-config --print-errors --variable=datadir
yast2-devtools; fi`/aclocal --verbose
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-phone-services-2.21.0/Makefile.in
new/yast2-phone-services-2.21.1/Makefile.in
--- old/yast2-phone-services-2.21.0/Makefile.in 2011-09-27 10:25:54.000000000
+0200
+++ new/yast2-phone-services-2.21.1/Makefile.in 2012-03-20 12:32:47.000000000
+0100
@@ -261,7 +261,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -274,7 +273,7 @@
# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo
./devtools/admin; else pkg-config --print-errors --variable=datadir
yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo
./devtools/admin; else pkg-config --print-errors --variable=datadir
yast2-devtools; fi`/aclocal --verbose
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2
package/$(RPMNAME).spec
POT_DST = $(shell find -type d -name testsuite -prune , \
@@ -902,7 +901,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -930,21 +929,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-phone-services-2.21.0/VERSION
new/yast2-phone-services-2.21.1/VERSION
--- old/yast2-phone-services-2.21.0/VERSION 2011-09-27 10:24:59.000000000
+0200
+++ new/yast2-phone-services-2.21.1/VERSION 2012-03-19 13:46:05.000000000
+0100
@@ -1 +1 @@
-2.21.0
+2.21.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-phone-services-2.21.0/configure
new/yast2-phone-services-2.21.1/configure
--- old/yast2-phone-services-2.21.0/configure 2011-09-27 10:25:54.000000000
+0200
+++ new/yast2-phone-services-2.21.1/configure 2012-03-19 13:48:20.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-phone-services 2.21.0.
+# Generated by GNU Autoconf 2.68 for yast2-phone-services 2.21.1.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-phone-services'
PACKAGE_TARNAME='yast2-phone-services'
-PACKAGE_VERSION='2.21.0'
-PACKAGE_STRING='yast2-phone-services 2.21.0'
+PACKAGE_VERSION='2.21.1'
+PACKAGE_STRING='yast2-phone-services 2.21.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-phone-services 2.21.0 to adapt to many kinds of
systems.
+\`configure' configures yast2-phone-services 2.21.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-phone-services 2.21.0:";;
+ short | recursive ) echo "Configuration of yast2-phone-services 2.21.1:";;
esac
cat <<\_ACEOF
@@ -1381,7 +1381,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-phone-services configure 2.21.0
+yast2-phone-services configure 2.21.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1398,7 +1398,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-phone-services $as_me 2.21.0, which was
+It was created by yast2-phone-services $as_me 2.21.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2328,7 +2328,7 @@
# Define the identity of the package.
PACKAGE='yast2-phone-services'
- VERSION='2.21.0'
+ VERSION='2.21.1'
cat >>confdefs.h <<_ACEOF
@@ -2450,7 +2450,7 @@
-VERSION="2.21.0"
+VERSION="2.21.1"
RPMNAME="yast2-phone-services"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
@@ -3380,7 +3380,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-phone-services $as_me 2.21.0, which was
+This file was extended by yast2-phone-services $as_me 2.21.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3433,7 +3433,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-phone-services config.status 2.21.0
+yast2-phone-services config.status 2.21.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-phone-services-2.21.0/configure.in
new/yast2-phone-services-2.21.1/configure.in
--- old/yast2-phone-services-2.21.0/configure.in 2011-09-27
10:25:50.000000000 +0200
+++ new/yast2-phone-services-2.21.1/configure.in 2012-03-19
13:48:16.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-phone-services
dnl
-dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-phone-services, 2.21.0, http://bugs.opensuse.org/,
yast2-phone-services)
+AC_INIT(yast2-phone-services, 2.21.1, http://bugs.opensuse.org/,
yast2-phone-services)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.21.0"
+VERSION="2.21.1"
RPMNAME="yast2-phone-services"
MAINTAINER="Martin Vidner <mvid...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-phone-services-2.21.0/src/phone-services/fax.ycp
new/yast2-phone-services-2.21.1/src/phone-services/fax.ycp
--- old/yast2-phone-services-2.21.0/src/phone-services/fax.ycp 2011-09-27
10:24:21.000000000 +0200
+++ new/yast2-phone-services-2.21.1/src/phone-services/fax.ycp 2012-03-20
13:07:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Fax machine dialogs
* Authors: Karsten Keil <kk...@suse.de>
*
- * $Id: fax.ycp 64517 2011-06-21 15:37:41Z jreidinger $
+ * $Id: fax.ycp 67668 2012-03-20 12:07:09Z mfilka $
*
*
*/
@@ -328,7 +328,6 @@
`VSpacing(1),
`ButtonBox(
`PushButton(`id(`ok), `opt(`default), Label::OKButton()),
- `HSpacing(5),
`PushButton(`id(`cancel), Label::CancelButton())
)
),
@@ -340,10 +339,10 @@
UI::ChangeWidget(`id(`phone), `ValidChars, "0123456789#*,");
UI::ChangeWidget(`id(`station), `ValidChars, "0123456789+ ");
if (uc["fax_action"]:"" == "MailAndSave")
- UI::ChangeWidget(`id(`action), `Value, `MailAndSave);
+ UI::ChangeWidget(`id(`action), `Value, `MailAndSave);
else
UI::ChangeWidget(`id(`action), `Value, `SaveOnly);
-
+
UI::SetFocus(`id(`user));
any ret = nil;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
