Hello community,
here is the log from the commit of package yast2-firewall for openSUSE:Factory
checked in at 2011-11-05 11:35:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old)
and /work/SRC/openSUSE:Factory/.yast2-firewall.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firewall", Maintainer is "loci...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes
2011-10-19 00:56:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-firewall.new/yast2-firewall.changes
2011-11-05 12:15:01.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 4 15:50:22 CET 2011 - loci...@suse.cz
+
+- Added function keys for buttons (bnc#595564)
+- 2.21.2
+
+-------------------------------------------------------------------
Old:
----
yast2-firewall-2.21.1.tar.bz2
New:
----
yast2-firewall-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.awCOYV/_old 2011-11-05 12:18:32.000000000 +0100
+++ /var/tmp/diff_new_pack.awCOYV/_new 2011-11-05 12:18:32.000000000 +0100
@@ -19,13 +19,11 @@
Name: yast2-firewall
-Version: 2.21.1
+Version: 2.21.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firewall-2.21.1.tar.bz2
-
-Prefix: /usr
+Source0: yast2-firewall-%{version}.tar.bz2
Group: System/YaST
License: GPL-2.0+
@@ -51,26 +49,26 @@
A YaST2 module to be used for configuring a firewall.
%prep
-%setup -n yast2-firewall-2.21.1
+%setup -n yast2-firewall-%{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
@@ -84,8 +82,8 @@
/usr/share/YaST2/include/firewall/*
/usr/share/YaST2/modules/SuSEFirewall*
/usr/share/YaST2/clients/firewall*
-%{prefix}/share/applications/YaST2/firewall.desktop
+%{_prefix}/share/applications/YaST2/firewall.desktop
/usr/share/YaST2/schema/autoyast/rnc/firewall.rnc
-%doc %{prefix}/share/doc/packages/yast2-firewall
+%doc %{_prefix}/share/doc/packages/yast2-firewall
%changelog
++++++ yast2-firewall-2.21.1.tar.bz2 -> yast2-firewall-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.1/Makefile.am
new/yast2-firewall-2.21.2/Makefile.am
--- old/yast2-firewall-2.21.1/Makefile.am 2011-10-13 10:50:13.000000000
+0200
+++ new/yast2-firewall-2.21.2/Makefile.am 2011-11-04 14:33:55.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
@@ -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-firewall-2.21.1/Makefile.in
new/yast2-firewall-2.21.2/Makefile.in
--- old/yast2-firewall-2.21.1/Makefile.in 2011-10-13 10:50:16.000000000
+0200
+++ new/yast2-firewall-2.21.2/Makefile.in 2011-11-04 14:33:59.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 \
@@ -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-firewall-2.21.1/VERSION
new/yast2-firewall-2.21.2/VERSION
--- old/yast2-firewall-2.21.1/VERSION 2011-10-13 10:36:59.000000000 +0200
+++ new/yast2-firewall-2.21.2/VERSION 2011-11-04 15:51:19.000000000 +0100
@@ -1 +1 @@
-2.21.1
+2.21.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.1/configure.in
new/yast2-firewall-2.21.2/configure.in
--- old/yast2-firewall-2.21.1/configure.in 2011-10-13 10:50:13.000000000
+0200
+++ new/yast2-firewall-2.21.2/configure.in 2011-11-04 14:33:54.000000000
+0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-firewall
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-firewall, 2.21.1, http://bugs.opensuse.org/, yast2-firewall)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.1/src/subdialogs.ycp
new/yast2-firewall-2.21.2/src/subdialogs.ycp
--- old/yast2-firewall-2.21.1/src/subdialogs.ycp 2011-10-13
10:49:31.000000000 +0200
+++ new/yast2-firewall-2.21.2/src/subdialogs.ycp 2011-11-04
15:51:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Configuration screens
* Authors: Lukas Ocilka <loci...@suse.cz>
*
- * $Id: subdialogs.ycp 66421 2011-10-13 08:49:30Z locilka $
+ * $Id: subdialogs.ycp 66702 2011-11-04 14:50:21Z locilka $
*
* Configuration dialogs divided into smaller logic groups.
* Both Expert and Simple.
@@ -75,9 +75,9 @@
),
`HBox (
// TRANSLATORS: push button
- `PushButton(`id("change_firewall_interface"),
_("&Change...")),
+ `PushButton(`id("change_firewall_interface"),
`opt(`key_F4), _("&Change...")),
// TRANSLATORS: push button
- `PushButton(`id("user_defined_firewall_interface"),
_("C&ustom...")),
+ `PushButton(`id("user_defined_firewall_interface"),
`opt(`key_F7), _("C&ustom...")),
`HStretch ()
)
)
@@ -225,14 +225,14 @@
),
`HSquash( `VBox (
`VSpacing( 1.1 ),
- `PushButton ( `id ( "add_allowed_service" ), `opt (
`hstretch ), " " + Label::AddButton() + " "),
+ `PushButton ( `id ( "add_allowed_service" ), `opt (
`hstretch, `key_F3 ), " " + Label::AddButton() + " "),
- `PushButton ( `id ( "remove_allowed_service" ), `opt (
`hstretch ), " " + Label::DeleteButton() + " "),
+ `PushButton ( `id ( "remove_allowed_service" ), `opt (
`hstretch, `key_F5 ), " " + Label::DeleteButton() + " "),
`Empty(`opt(`vstretch)),
// TRANSLATORS: push button
- `PushButton ( `id ( "advanced_allowed_service" ), `opt (
`hstretch ), " " + _("A&dvanced...") + " ")
+ `PushButton ( `id ( "advanced_allowed_service" ), `opt (
`hstretch, `key_F7 ), " " + _("A&dvanced...") + " ")
))
)
);
@@ -264,8 +264,8 @@
), []
),
`HBox (
- `PushButton(`id("add_redirect_to_masquerade"),
Label::AddButton()),
- `PushButton(`id("remove_redirect_to_masquerade"),
Label::DeleteButton()),
+ `PushButton(`id("add_redirect_to_masquerade"),
`opt(`key_F3), Label::AddButton()),
+ `PushButton(`id("remove_redirect_to_masquerade"),
`opt(`key_F5), Label::DeleteButton()),
`HStretch()
)
)
@@ -408,8 +408,8 @@
), []
),
`HBox (
- `PushButton(`id("add_redirect_to_masquerade"),
Label::AddButton()),
- `PushButton(`id("remove_redirect_to_masquerade"),
Label::DeleteButton()),
+ `PushButton(`id("add_redirect_to_masquerade"),
`opt(`key_F3), Label::AddButton()),
+ `PushButton(`id("remove_redirect_to_masquerade"),
`opt(`key_F5), Label::DeleteButton()),
`HStretch()
)
)
@@ -772,8 +772,8 @@
[]
),
`Left (`HBox (
- `PushButton (`id (`add_br), _("&Add...")),
- `PushButton (`id (`delete_br), _("&Delete"))
+ `PushButton (`id (`add_br), `opt(`key_F3), _("&Add...")),
+ `PushButton (`id (`delete_br), `opt(`key_F5), _("&Delete"))
))
);
@@ -909,8 +909,8 @@
[]
),
`HBox (
- `PushButton(`id("add_custom_rule"), Label::AddButton()),
- `PushButton(`id("remove_custom_rule"),
Label::DeleteButton()),
+ `PushButton(`id("add_custom_rule"), `opt(`key_F3),
Label::AddButton()),
+ `PushButton(`id("remove_custom_rule"), `opt(`key_F5),
Label::DeleteButton()),
`HStretch ()
)
)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
