Hello community, here is the log from the commit of package yast2-apparmor for openSUSE:Factory checked in at 2013-07-16 16:28:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-apparmor (Old) and /work/SRC/openSUSE:Factory/.yast2-apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-apparmor" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-apparmor/yast2-apparmor.changes 2013-06-05 13:25:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-apparmor.new/yast2-apparmor.changes 2013-07-16 16:28:05.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 1 13:35:46 UTC 2013 - [email protected] + +- clean up include files - added missing imports, added missing + top level {} blocks (Y2R compatibility) +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-apparmor-2.22.2.tar.bz2 New: ---- yast2-apparmor-2.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.i8F93c/_old 2013-07-16 16:28:05.000000000 +0200 +++ /var/tmp/diff_new_pack.i8F93c/_new 2013-07-16 16:28:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-apparmor -Version: 2.22.2 +Version: 2.24.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-apparmor-2.22.2.tar.bz2 -> yast2-apparmor-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/Makefile.am new/yast2-apparmor-2.24.0/Makefile.am --- old/yast2-apparmor-2.22.2/Makefile.am 2013-05-28 14:04:25.000000000 +0200 +++ new/yast2-apparmor-2.24.0/Makefile.am 2013-07-11 18:26:47.000000000 +0200 @@ -158,14 +158,19 @@ TAGVERSION = $(Y2TOOL) tagversion -# 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) \ +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' ;\ fi check-tagversion: - cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ + @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; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/Makefile.am.common new/yast2-apparmor-2.24.0/Makefile.am.common --- old/yast2-apparmor-2.22.2/Makefile.am.common 2013-05-28 14:04:25.000000000 +0200 +++ new/yast2-apparmor-2.24.0/Makefile.am.common 2013-07-11 18:26:47.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(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-apparmor-2.22.2/Makefile.in new/yast2-apparmor-2.24.0/Makefile.in --- old/yast2-apparmor-2.22.2/Makefile.in 2013-05-28 14:04:29.000000000 +0200 +++ new/yast2-apparmor-2.24.0/Makefile.in 2013-07-11 18:26:52.000000000 +0200 @@ -981,14 +981,19 @@ package: check-up-to-date check-tagversion check-textdomain package-local -# 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) \ +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' ;\ fi check-tagversion: - cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ + @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; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/VERSION new/yast2-apparmor-2.24.0/VERSION --- old/yast2-apparmor-2.22.2/VERSION 2013-01-22 11:06:54.000000000 +0100 +++ new/yast2-apparmor-2.24.0/VERSION 2013-07-02 08:05:48.000000000 +0200 @@ -1 +1 @@ -2.22.2 +2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/configure new/yast2-apparmor-2.24.0/configure --- old/yast2-apparmor-2.22.2/configure 2013-05-28 14:04:28.000000000 +0200 +++ new/yast2-apparmor-2.24.0/configure 2013-07-11 18:26:51.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-apparmor 2.22.2. +# Generated by GNU Autoconf 2.69 for yast2-apparmor 2.24.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-apparmor' PACKAGE_TARNAME='yast2-apparmor' -PACKAGE_VERSION='2.22.2' -PACKAGE_STRING='yast2-apparmor 2.22.2' +PACKAGE_VERSION='2.24.0' +PACKAGE_STRING='yast2-apparmor 2.24.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1248,7 +1248,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-apparmor 2.22.2 to adapt to many kinds of systems. +\`configure' configures yast2-apparmor 2.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-apparmor 2.22.2:";; + short | recursive ) echo "Configuration of yast2-apparmor 2.24.0:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-apparmor configure 2.22.2 +yast2-apparmor configure 2.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,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-apparmor $as_me 2.22.2, which was +It was created by yast2-apparmor $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-apparmor' - VERSION='2.22.2' + VERSION='2.24.0' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.22.2" +VERSION="2.24.0" RPMNAME="yast2-apparmor" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -3407,7 +3407,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-apparmor $as_me 2.22.2, which was +This file was extended by yast2-apparmor $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3460,7 +3460,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-apparmor config.status 2.22.2 +yast2-apparmor config.status 2.24.0 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-apparmor-2.22.2/configure.in new/yast2-apparmor-2.24.0/configure.in --- old/yast2-apparmor-2.22.2/configure.in 2013-05-28 14:04:25.000000000 +0200 +++ new/yast2-apparmor-2.24.0/configure.in 2013-07-11 18:26:47.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-apparmor dnl -dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-apparmor, 2.22.2, http://bugs.opensuse.org/, yast2-apparmor) +AC_INIT(yast2-apparmor, 2.24.0, http://bugs.opensuse.org/, yast2-apparmor) 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.22.2" +VERSION="2.24.0" RPMNAME="yast2-apparmor" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/src/clients/Makefile.in new/yast2-apparmor-2.24.0/src/clients/Makefile.in --- old/yast2-apparmor-2.22.2/src/clients/Makefile.in 2013-05-28 14:04:29.000000000 +0200 +++ new/yast2-apparmor-2.24.0/src/clients/Makefile.in 2013-07-11 18:26:52.000000000 +0200 @@ -498,7 +498,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(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-apparmor-2.22.2/src/include/apparmor/aa-config.ycp new/yast2-apparmor-2.24.0/src/include/apparmor/aa-config.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/aa-config.ycp 2013-01-22 11:06:54.000000000 +0100 +++ new/yast2-apparmor-2.24.0/src/include/apparmor/aa-config.ycp 2013-07-02 08:05:48.000000000 +0200 @@ -26,6 +26,8 @@ textdomain "yast2-apparmor"; import "Label"; +import "Popup"; +import "Wizard"; define boolean changeAppArmorState(boolean aaEnabled) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_packages.ycp new/yast2-apparmor-2.24.0/src/include/apparmor/apparmor_packages.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_packages.ycp 2013-01-22 11:06:54.000000000 +0100 +++ new/yast2-apparmor-2.24.0/src/include/apparmor/apparmor_packages.ycp 2013-07-02 08:05:48.000000000 +0200 @@ -24,6 +24,8 @@ * whether they want optional packages like apparmor-docs, libapparmor, * apache2-mod-apparmor and * (eventually) pam-apparmor installed. */ +{ + import "PackageSystem"; list<string> __needed_packages = @@ -32,3 +34,5 @@ define boolean installAppArmorPackages () { return PackageSystem::CheckAndInstallPackagesInteractive (__needed_packages); } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_profile_check.ycp new/yast2-apparmor-2.24.0/src/include/apparmor/apparmor_profile_check.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_profile_check.ycp 2013-01-22 11:06:54.000000000 +0100 +++ new/yast2-apparmor-2.24.0/src/include/apparmor/apparmor_profile_check.ycp 2013-07-02 08:05:48.000000000 +0200 @@ -20,6 +20,7 @@ ****************************************************************************/ +{ import "Popup"; textdomain "yast2-apparmor"; @@ -50,3 +51,5 @@ } return( syntax_ok ); } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_ycp_utils.ycp new/yast2-apparmor-2.24.0/src/include/apparmor/apparmor_ycp_utils.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/apparmor_ycp_utils.ycp 2013-01-22 11:06:54.000000000 +0100 +++ new/yast2-apparmor-2.24.0/src/include/apparmor/apparmor_ycp_utils.ycp 2013-07-02 08:05:48.000000000 +0200 @@ -20,6 +20,7 @@ ****************************************************************************/ +{ import "Label"; import "Popup"; @@ -685,3 +686,5 @@ AppArmorDialogs::busy_dialog = nil; } } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/src/include/apparmor/config_complain.ycp new/yast2-apparmor-2.24.0/src/include/apparmor/config_complain.ycp --- old/yast2-apparmor-2.22.2/src/include/apparmor/config_complain.ycp 2013-01-22 11:06:54.000000000 +0100 +++ new/yast2-apparmor-2.24.0/src/include/apparmor/config_complain.ycp 2013-07-02 08:05:48.000000000 +0200 @@ -23,6 +23,8 @@ textdomain "yast2-apparmor"; import "Label"; +import "Popup"; +import "Wizard"; string modeHelp = _("<p><b>Profile Mode Configuration</b><br>This tool allows you to set AppArmor profiles to either complain or enforce mode.</p>") + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.22.2/src/modules/Makefile.in new/yast2-apparmor-2.24.0/src/modules/Makefile.in --- old/yast2-apparmor-2.22.2/src/modules/Makefile.in 2013-05-28 14:04:29.000000000 +0200 +++ new/yast2-apparmor-2.24.0/src/modules/Makefile.in 2013-07-11 18:26:53.000000000 +0200 @@ -491,7 +491,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ + @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
