Hello community,
here is the log from the commit of package yast2-firewall for openSUSE:Factory
checked in at 2013-04-24 11:58:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old)
and /work/SRC/openSUSE:Factory/.yast2-firewall.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firewall", Maintainer is "yast2-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes
2013-02-28 10:24:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-firewall.new/yast2-firewall.changes
2013-04-24 11:58:43.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 15 15:37:01 CEST 2013 - loci...@suse.cz
+
+- Fixed checking for running firewall service (bnc#812606)
+- 2.21.4
+
+-------------------------------------------------------------------
Old:
----
yast2-firewall-2.21.3.tar.bz2
New:
----
yast2-firewall-2.21.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firewall.spec ++++++
--- /var/tmp/diff_new_pack.01Yow7/_old 2013-04-24 11:58:48.000000000 +0200
+++ /var/tmp/diff_new_pack.01Yow7/_new 2013-04-24 11:58:48.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-firewall
-Version: 2.21.3
+Version: 2.21.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-firewall-2.21.3.tar.bz2 -> yast2-firewall-2.21.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/Makefile.am
new/yast2-firewall-2.21.4/Makefile.am
--- old/yast2-firewall-2.21.3/Makefile.am 2013-02-22 10:51:25.000000000
+0100
+++ new/yast2-firewall-2.21.4/Makefile.am 2013-04-16 09:41:38.000000000
+0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/Makefile.am.common
new/yast2-firewall-2.21.4/Makefile.am.common
--- old/yast2-firewall-2.21.3/Makefile.am.common 2013-02-22
10:51:25.000000000 +0100
+++ new/yast2-firewall-2.21.4/Makefile.am.common 2013-04-16
09:41:38.000000000 +0200
@@ -31,7 +31,7 @@
CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/Makefile.in
new/yast2-firewall-2.21.4/Makefile.in
--- old/yast2-firewall-2.21.3/Makefile.in 2013-02-22 10:51:35.000000000
+0100
+++ new/yast2-firewall-2.21.4/Makefile.in 2013-04-16 09:41:44.000000000
+0200
@@ -980,19 +980,14 @@
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 \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/VERSION
new/yast2-firewall-2.21.4/VERSION
--- old/yast2-firewall-2.21.3/VERSION 2013-01-22 11:19:16.000000000 +0100
+++ new/yast2-firewall-2.21.4/VERSION 2013-04-16 09:41:31.000000000 +0200
@@ -1 +1 @@
-2.21.3
+2.21.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/configure
new/yast2-firewall-2.21.4/configure
--- old/yast2-firewall-2.21.3/configure 2013-02-22 10:51:33.000000000 +0100
+++ new/yast2-firewall-2.21.4/configure 2013-04-16 09:41:43.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-firewall 2.21.3.
+# Generated by GNU Autoconf 2.69 for yast2-firewall 2.21.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-firewall'
PACKAGE_TARNAME='yast2-firewall'
-PACKAGE_VERSION='2.21.3'
-PACKAGE_STRING='yast2-firewall 2.21.3'
+PACKAGE_VERSION='2.21.4'
+PACKAGE_STRING='yast2-firewall 2.21.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,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-firewall 2.21.3 to adapt to many kinds of
systems.
+\`configure' configures yast2-firewall 2.21.4 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1318,7 +1318,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-firewall 2.21.3:";;
+ short | recursive ) echo "Configuration of yast2-firewall 2.21.4:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1398,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-firewall configure 2.21.3
+yast2-firewall configure 2.21.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1415,7 +1415,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-firewall $as_me 2.21.3, which was
+It was created by yast2-firewall $as_me 2.21.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2354,7 +2354,7 @@
# Define the identity of the package.
PACKAGE='yast2-firewall'
- VERSION='2.21.3'
+ VERSION='2.21.4'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2477,7 @@
-VERSION="2.21.3"
+VERSION="2.21.4"
RPMNAME="yast2-firewall"
MAINTAINER="YaST2 Maintainers <yast2-maintain...@suse.de>"
@@ -3403,7 +3403,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-firewall $as_me 2.21.3, which was
+This file was extended by yast2-firewall $as_me 2.21.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3456,7 +3456,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-firewall config.status 2.21.3
+yast2-firewall config.status 2.21.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/configure.in
new/yast2-firewall-2.21.4/configure.in
--- old/yast2-firewall-2.21.3/configure.in 2013-02-22 10:51:25.000000000
+0100
+++ new/yast2-firewall-2.21.4/configure.in 2013-04-16 09:41:38.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-firewall
dnl
-dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-firewall, 2.21.3, http://bugs.opensuse.org/, yast2-firewall)
+AC_INIT(yast2-firewall, 2.21.4, http://bugs.opensuse.org/, yast2-firewall)
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.3"
+VERSION="2.21.4"
RPMNAME="yast2-firewall"
MAINTAINER="YaST2 Maintainers <yast2-maintain...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/src/Makefile.in
new/yast2-firewall-2.21.4/src/Makefile.in
--- old/yast2-firewall-2.21.3/src/Makefile.in 2013-02-22 10:51:35.000000000
+0100
+++ new/yast2-firewall-2.21.4/src/Makefile.in 2013-04-16 09:41:44.000000000
+0200
@@ -583,7 +583,7 @@
dist-hook: check-syntax
check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
- @if test "$(client_DATA)"; then \
+ @if test "$(filter %.ycp,client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
echo "Checking syntax of $${TO_CHECK}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firewall-2.21.3/src/dialogs.ycp
new/yast2-firewall-2.21.4/src/dialogs.ycp
--- old/yast2-firewall-2.21.3/src/dialogs.ycp 2013-01-22 11:19:16.000000000
+0100
+++ new/yast2-firewall-2.21.4/src/dialogs.ycp 2013-04-16 09:41:31.000000000
+0200
@@ -68,7 +68,7 @@
)
]),
"start_stop" : CWMServiceStart::CreateStartStopWidget ($[
- "service_id" : "SuSEfirewall2_setup",
+ "service_id" : "SuSEfirewall2",
// TRANSLATORS: status information
"service_running_label" : _("Firewall is running"),
// TRANSLATORS: status information
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
