Hello community, here is the log from the commit of package yast2-apparmor for openSUSE:Factory checked in at 2014-06-18 10:59:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-10 22:57:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-apparmor.new/yast2-apparmor.changes 2014-06-18 10:59:08.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 2 12:33:58 UTC 2014 - [email protected] + +- add translation for apparmor modes (bnc#878587) +- improvements of rpm spec file +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-apparmor-3.1.1.tar.bz2 New: ---- yast2-apparmor-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.2a053k/_old 2014-06-18 10:59:09.000000000 +0200 +++ /var/tmp/diff_new_pack.2a053k/_new 2014-06-18 10:59:09.000000000 +0200 @@ -17,20 +17,19 @@ Name: yast2-apparmor -Version: 3.1.1 +Version: 3.1.2 Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.bz2 - -Requires: yast2-ruby-bindings >= 1.0.0 - Summary: YaST2 - Plugins for AppArmor Profile Management License: GPL-2.0 Group: Productivity/Security - +Url: https://github.com/yast/yast-apparmor +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools >= 3.1.10 Requires: perl-TimeDate Requires: yast2 +Requires: yast2-ruby-bindings >= 1.0.0 Requires: perl(Data::Dumper) Requires: perl(Encode) Requires: perl(Getopt::Long) @@ -39,15 +38,10 @@ Requires: perl(Locale::gettext) Requires: perl(POSIX) Requires: perl(ycp) - -BuildArch: noarch Obsoletes: yast2-subdomain Provides: yast2-subdomain -BuildRequires: update-desktop-files - -BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.1.10 - +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if 0%{?suse_version} >= 1140 # openSUSE-11.4 or newer BuildRequires: perl-macros @@ -62,7 +56,7 @@ SubDomain. %prep -%setup -n %{name}-%{version} +%setup -q %build %yast_build @@ -72,7 +66,7 @@ %files %defattr(-,root,root) -/usr/bin/* +%{_bindir}/* %{yast_clientdir} %{yast_yncludedir}/apparmor %{yast_scrconfdir} @@ -81,9 +75,9 @@ %{yast_agentdir} %dir %{perl_vendorlib}/Immunix %{perl_vendorlib}/Immunix/Notify.pm -%dir %attr(-,root,root) /etc/apparmor -%config(noreplace) /etc/apparmor/reports.crontab -%config(noreplace) /etc/apparmor/reports.conf +%dir %{_sysconfdir}/apparmor +%config(noreplace) %{_sysconfdir}/apparmor/reports.crontab +%config(noreplace) %{_sysconfdir}/apparmor/reports.conf %doc %{yast_docdir} %changelog ++++++ yast2-apparmor-3.1.1.tar.bz2 -> yast2-apparmor-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-3.1.1/package/yast2-apparmor.changes new/yast2-apparmor-3.1.2/package/yast2-apparmor.changes --- old/yast2-apparmor-3.1.1/package/yast2-apparmor.changes 2014-05-09 16:05:43.000000000 +0200 +++ new/yast2-apparmor-3.1.2/package/yast2-apparmor.changes 2014-06-02 16:20:30.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 2 12:33:58 UTC 2014 - [email protected] + +- add translation for apparmor modes (bnc#878587) +- improvements of rpm spec file +- 3.1.2 + +------------------------------------------------------------------- Fri May 9 13:47:26 UTC 2014 - [email protected] - fix help text to match reality (bnc#876904) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-3.1.1/package/yast2-apparmor.spec new/yast2-apparmor-3.1.2/package/yast2-apparmor.spec --- old/yast2-apparmor-3.1.1/package/yast2-apparmor.spec 2014-05-09 16:05:43.000000000 +0200 +++ new/yast2-apparmor-3.1.2/package/yast2-apparmor.spec 2014-06-02 16:20:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-apparmor # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,38 +17,31 @@ Name: yast2-apparmor -Version: 3.1.1 +Version: 3.1.2 Release: 0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.bz2 - -Group: Productivity/Security +Summary: YaST2 - Plugins for AppArmor Profile Management +Url: https://github.com/yast/yast-apparmor License: GPL-2.0 - +Group: Productivity/Security +Source0: %{name}-%{version}.tar.bz2 +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools >= 3.1.10 +Requires: perl(Data::Dumper) +Requires: perl(Encode) +Requires: perl(Getopt::Long) +Requires: perl(Immunix::AppArmor) +Requires: perl(Immunix::Notify) +Requires: perl(Locale::gettext) +Requires: perl(POSIX) +Requires: perl(ycp) +Requires: perl-TimeDate +Requires: yast2 Requires: yast2-ruby-bindings >= 1.0.0 - -Summary: YaST2 - Plugins for AppArmor Profile Management - -Requires: yast2 -Requires: perl-TimeDate -Requires: perl(Data::Dumper) -Requires: perl(Encode) -Requires: perl(Getopt::Long) -Requires: perl(Immunix::AppArmor) -Requires: perl(Immunix::Notify) -Requires: perl(Locale::gettext) -Requires: perl(POSIX) -Requires: perl(ycp) - -BuildArch: noarch -Obsoletes: yast2-subdomain -Provides: yast2-subdomain -BuildRequires: update-desktop-files - -BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.1.10 - +Obsoletes: yast2-subdomain +Provides: yast2-subdomain +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if 0%{?suse_version} >= 1140 # openSUSE-11.4 or newer BuildRequires: perl-macros @@ -63,7 +56,7 @@ SubDomain. %prep -%setup -n %{name}-%{version} +%setup -q %build %yast_build @@ -72,9 +65,9 @@ %yast_install -%files +%files %defattr(-,root,root) -/usr/bin/* +%{_bindir}/* %{yast_clientdir} %{yast_yncludedir}/apparmor %{yast_scrconfdir} @@ -83,8 +76,8 @@ %{yast_agentdir} %dir %{perl_vendorlib}/Immunix %{perl_vendorlib}/Immunix/Notify.pm -%dir %attr(-,root,root) /etc/apparmor -%config(noreplace) /etc/apparmor/reports.crontab -%config(noreplace) /etc/apparmor/reports.conf +%dir %{_sysconfdir}/apparmor +%config(noreplace) %{_sysconfdir}/apparmor/reports.crontab +%config(noreplace) %{_sysconfdir}/apparmor/reports.conf %doc %{yast_docdir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-3.1.1/src/include/apparmor/config_complain.rb new/yast2-apparmor-3.1.2/src/include/apparmor/config_complain.rb --- old/yast2-apparmor-3.1.1/src/include/apparmor/config_complain.rb 2014-05-09 16:05:43.000000000 +0200 +++ new/yast2-apparmor-3.1.2/src/include/apparmor/config_complain.rb 2014-06-02 16:20:30.000000000 +0200 @@ -112,10 +112,16 @@ ) end + translation_mapping = { + # translators: string is value in table for mode of apparmor + "enforce" => _("enforce"), + "complain" => _("complain"), + } + Builtins.foreach(db) do |record| recList = Builtins.add( recList, - Item(Id(key), Ops.get(record, "name"), Ops.get(record, "mode")) + Item(Id(key), Ops.get(record, "name"), translation_mapping[record["mode"]]) ) key = Ops.add(key, 1) end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
