Hello community,
here is the log from the commit of package yast2-apparmor
checked in at Mon Aug 20 18:52:32 CEST 2007.
--------
--- yast2-apparmor/yast2-apparmor.changes 2007-07-30 05:07:23.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-apparmor/yast2-apparmor.changes 2007-08-20 17:58:30.409461000 +0200
@@ -1,0 +2,8 @@
+Mon Aug 20 17:57:15 CEST 2007 - dreynolds@suse.de
+
+- sbeattie@suse.de
+ Fix for #212500 "y2controlcenter-gnome does not find AppArmor
+ icons" and its duplicate #297243 "Missing YaST icon: All app armor
+ icons".
+
+-------------------------------------------------------------------
Old:
----
yast2-apparmor-2.0.2-857.tar.gz
New:
----
yast2-apparmor-2.1-909.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-apparmor.spec ++++++
--- /var/tmp/diff_new_pack.dS2240/_old 2007-08-20 18:52:14.000000000 +0200
+++ /var/tmp/diff_new_pack.dS2240/_new 2007-08-20 18:52:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-apparmor (Version 2.0.2)
+# spec file for package yast2-apparmor (Version 2.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,11 +11,11 @@
# norootforbuild
Name: yast2-apparmor
-Summary: Yast2 plugins for AppArmor profile management
-Version: 2.0.2
-Release: 8
+Summary: YaST2 - Plugins for AppArmor Profile Management
+Version: 2.1
+Release: 1
Group: Productivity/Security
-Source0: %{name}-%{version}-857.tar.gz
+Source0: %{name}-%{version}-909.tar.gz
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://forge.novell.com/modules/xfmod/project/?apparmor
@@ -24,14 +24,19 @@
Obsoletes: yast2-subdomain
Provides: yast2-subdomain
BuildRequires: update-desktop-files
+BuildRequires: yast2 yast2-devtools
%if %{suse_version} > 1010
-BuildRequires: yast2 yast2-devtools yast2-theme-openSUSE
+BuildRequires: yast2-theme-openSUSE
%define themedir /usr/share/YaST2/theme/openSUSE
%else
%if %{suse_version} > 1000
-BuildRequires: yast2 yast2-devtools yast2-theme-SuSELinux
-%define themedir /usr/share/YaST2/theme/SuSELinux
+ %if 0%{?sles_version} > 9
+BuildRequires: yast2-theme-NLD
+ %else
+BuildRequires: yast2-theme-SuSELinux
+ %endif
%endif
+%define themedir /usr/share/YaST2/theme/SuSELinux
%endif
%description
@@ -68,6 +73,20 @@
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
fi
done
+# make icons available to GNOME control center (hicolor theme)
+# (bug #212500)
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/22x22/apps
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/32x32/apps
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/48x48/apps
+cd $RPM_BUILD_ROOT/%{themedir}/icons
+for dir in 22x22 32x32 48x48; do
+ cd $RPM_BUILD_ROOT/%{themedir}/icons/${dir}/apps
+ icons=$(ls *.png)
+ cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/${dir}/apps
+ for icon in ${icons}; do
+ ln -s %{themedir}/icons/${dir}/apps/${icon} .
+ done
+done
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -83,6 +102,7 @@
/usr/lib/YaST2/servers_non_y2
/usr/lib/perl5/vendor_perl/*
%{themedir}/icons
+/usr/share/icons/hicolor/
%doc COPYING.LGPL
%dir %attr(-,root,root) /etc/apparmor
%config(noreplace) /etc/apparmor/reports.crontab
@@ -99,6 +119,11 @@
%preun
%changelog
+* Mon Aug 20 2007 - dreynolds@suse.de
+- sbeattie@suse.de
+ Fix for #212500 "y2controlcenter-gnome does not find AppArmor
+ icons" and its duplicate #297243 "Missing YaST icon: All app armor
+ icons".
* Mon Jul 30 2007 - dreynolds@suse.de
- Numerous fixes for repository integration
* Mon Jul 16 2007 - dreynolds@suse.de
++++++ yast2-apparmor-2.0.2-857.tar.gz -> yast2-apparmor-2.1-909.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/common/Make.rules new/yast2-apparmor-2.1/common/Make.rules
--- old/yast2-apparmor-2.0.2/common/Make.rules 2007-07-29 05:35:03.000000000 +0200
+++ new/yast2-apparmor-2.1/common/Make.rules 2007-08-20 03:05:12.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Make.rules 633 2007-04-26 22:20:02Z steve-beattie $
+# $Id: Make.rules 927 2007-08-16 23:11:01Z steve-beattie $
# ------------------------------------------------------------------
#
# Copyright (C) 2002-2005 Novell/SUSE
@@ -25,7 +25,7 @@
# directories
DISTRIBUTION=AppArmor
-VERSION=2.0.2
+VERSION=2.1
# OVERRIDABLE variables
# Set these variables before including Make.rules to change its behavior
@@ -140,8 +140,10 @@
$(TAR) -f $@ $(RELEASE_DIR)
rm -rf $(RELEASE_DIR)
+ifndef OVERRIDE_TARBALL
.PHONY: tarball
tarball: clean $(TARBALL)
+endif
.PHONY: dist
dist: clean $(SPECFILE)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/Makefile new/yast2-apparmor-2.1/Makefile
--- old/yast2-apparmor-2.0.2/Makefile 2007-07-30 05:01:03.000000000 +0200
+++ new/yast2-apparmor-2.1/Makefile 2007-08-20 18:09:31.000000000 +0200
@@ -35,9 +35,9 @@
mkdir -p ${DESTDIR}/usr/share/applications/YaST2/groups
mkdir -p ${DESTDIR}/usr/lib/YaST2/servers_non_y2
mkdir -p ${DESTDIR}/usr/lib/perl5/vendor_perl/Immunix
- mkdir -p ${DESTDIR}/${THEMEDIR}/icons/48x48/apps/apparmor
- mkdir -p ${DESTDIR}/${THEMEDIR}/icons/32x32/apps/apparmor
- mkdir -p ${DESTDIR}/${THEMEDIR}/icons/22x22/apps/apparmor
+ mkdir -p ${DESTDIR}/${THEMEDIR}/icons/48x48/apps
+ mkdir -p ${DESTDIR}/${THEMEDIR}/icons/32x32/apps
+ mkdir -p ${DESTDIR}/${THEMEDIR}/icons/22x22/apps
mkdir -p ${DESTDIR}/usr/bin
mkdir -p ${DESTDIR}/etc/apparmor
cp -a src/clients/* ${DESTDIR}/usr/share/YaST2/clients/
@@ -46,9 +46,9 @@
cp -a src/desktop/* ${DESTDIR}/usr/share/applications/YaST2/
cp -a src/desktop/groups/* ${DESTDIR}/usr/share/applications/YaST2/groups/
cp -a src/perl/* ${DESTDIR}/usr/lib/perl5/vendor_perl/Immunix
- cp -a src/icons/48x48/* ${DESTDIR}/${THEMEDIR}/icons/48x48/apps/apparmor
- cp -a src/icons/32x32/* ${DESTDIR}/${THEMEDIR}/icons/32x32/apps/apparmor
- cp -a src/icons/22x22/* ${DESTDIR}/${THEMEDIR}/icons/22x22/apps/apparmor
+ cp -a src/icons/48x48/* ${DESTDIR}/${THEMEDIR}/icons/48x48/apps
+ cp -a src/icons/32x32/* ${DESTDIR}/${THEMEDIR}/icons/32x32/apps
+ cp -a src/icons/22x22/* ${DESTDIR}/${THEMEDIR}/icons/22x22/apps
cp -a src/bin/* ${DESTDIR}/usr/bin
cp -a src/apparmor/* ${DESTDIR}/etc/apparmor
install -m 755 src/agents/* ${DESTDIR}/usr/lib/YaST2/servers_non_y2/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/clients/SD_AddProfile.ycp new/yast2-apparmor-2.1/src/clients/SD_AddProfile.ycp
--- old/yast2-apparmor-2.0.2/src/clients/SD_AddProfile.ycp 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/clients/SD_AddProfile.ycp 2007-08-20 18:09:35.000000000 +0200
@@ -66,7 +66,7 @@
map new_profile = (map) SCR::Read (.subdomain_profiles, Settings["CURRENT_PROFILE"]:"" );
Settings["PROFILE_MAP"] = new_profile;
Wizard::CreateDialog();
- Wizard::SetTitleIcon("apparmor/add_profile");
+ Wizard::SetTitleIcon("apparmor_add_profile");
any ret = Sequencer::Run(aliases, sequence);
Wizard::CloseDialog();
if ( ret == `abort ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/clients/SD_DeleteProfile.ycp new/yast2-apparmor-2.1/src/clients/SD_DeleteProfile.ycp
--- old/yast2-apparmor-2.0.2/src/clients/SD_DeleteProfile.ycp 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/clients/SD_DeleteProfile.ycp 2007-08-20 18:09:35.000000000 +0200
@@ -53,7 +53,7 @@
];
Wizard::CreateDialog();
- Wizard::SetTitleIcon("apparmor/delete_profile");
+ Wizard::SetTitleIcon("apparmor_delete_profile");
any ret = Sequencer::Run(aliases, sequence);
Wizard::CloseDialog();
Settings = remove( Settings, "CURRENT_PROFILE");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/clients/SD_EditProfile.ycp new/yast2-apparmor-2.1/src/clients/SD_EditProfile.ycp
--- old/yast2-apparmor-2.0.2/src/clients/SD_EditProfile.ycp 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/clients/SD_EditProfile.ycp 2007-08-20 18:09:35.000000000 +0200
@@ -29,7 +29,7 @@
map aliases = $[
"showProfile" : ``(DisplayProfileForm(Settings["CURRENT_PROFILE"]:"", false)),
"showHat" : ``(DisplayProfileForm(Settings["CURRENT_HAT"]:"", true)),
- "chooseProfile" : ``(SelectProfileForm(profiles, _("Please make a selection from the listed profiles and press Next to edit the profile."), _("Edit Profile - Choose profile to edit"), "apparmor/edit_profile" )),
+ "chooseProfile" : ``(SelectProfileForm(profiles, _("Please make a selection from the listed profiles and press Next to edit the profile."), _("Edit Profile - Choose profile to edit"), "apparmor_edit_profile" )),
];
@@ -54,7 +54,7 @@
];
Wizard::CreateDialog();
- Wizard::SetTitleIcon("apparmor/edit_profile");
+ Wizard::SetTitleIcon("apparmor_edit_profile");
any ret = Sequencer::Run(aliases, sequence);
Wizard::CloseDialog();
Settings = remove( Settings, "CURRENT_PROFILE");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/clients/SD_Report.ycp new/yast2-apparmor-2.1/src/clients/SD_Report.ycp
--- old/yast2-apparmor-2.0.2/src/clients/SD_Report.ycp 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/clients/SD_Report.ycp 2007-08-20 18:09:35.000000000 +0200
@@ -76,7 +76,7 @@
];
Wizard::CreateDialog();
- Wizard::SetTitleIcon("apparmor/view_profile");
+ Wizard::SetTitleIcon("apparmor_view_profile");
any ret = Sequencer::Run(aliases, sequence);
Wizard::CloseDialog();
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/groups/apparmor.desktop new/yast2-apparmor-2.1/src/desktop/groups/apparmor.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/groups/apparmor.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/groups/apparmor.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -11,6 +11,6 @@
X-SuSE-YaST-SortKey=50
OnlyShowIn=X-SuSE-YaST;
-Icon=apparmor/app_armor
+Icon=apparmor_app_armor
Name=Novell AppArmor
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/SD_add_profile.desktop new/yast2-apparmor-2.1/src/desktop/SD_add_profile.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/SD_add_profile.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/SD_add_profile.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstClonable=false
-Icon=apparmor/add_profile
+Icon=apparmor_add_profile
Exec=/sbin/yast2 SD_AddProfile
Name=Manually Add Profile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/SD_control_panel.desktop new/yast2-apparmor-2.1/src/desktop/SD_control_panel.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/SD_control_panel.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/SD_control_panel.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstClonable=false
-Icon=apparmor/control_panel
+Icon=apparmor_control_panel
Exec=/sbin/yast2 subdomain
Name=AppArmor Control Panel
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/SD_delete_profile.desktop new/yast2-apparmor-2.1/src/desktop/SD_delete_profile.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/SD_delete_profile.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/SD_delete_profile.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstClonable=false
-Icon=apparmor/delete_profile
+Icon=apparmor_delete_profile
Exec=/sbin/yast2 SD_DeleteProfile
Name=Delete Profile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/SD_edit_profile.desktop new/yast2-apparmor-2.1/src/desktop/SD_edit_profile.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/SD_edit_profile.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/SD_edit_profile.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstClonable=false
-Icon=apparmor/edit_profile
+Icon=apparmor_edit_profile
Exec=/sbin/yast2 SD_EditProfile
Name=Edit Profile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/SD_genprof.desktop new/yast2-apparmor-2.1/src/desktop/SD_genprof.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/SD_genprof.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/SD_genprof.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstClonable=false
-Icon=apparmor/creation_wizzard
+Icon=apparmor_creation_wizard
Exec=/sbin/yast2 GenProf
Name=Add Profile Wizard
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/SD_logprof.desktop new/yast2-apparmor-2.1/src/desktop/SD_logprof.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/SD_logprof.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/SD_logprof.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstClonable=false
-Icon=apparmor/update_wizzard
+Icon=apparmor_update_wizard
Exec=/sbin/yast2 LogProf
Name=Update Profile Wizard
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/src/desktop/SD_Reports.desktop new/yast2-apparmor-2.1/src/desktop/SD_Reports.desktop
--- old/yast2-apparmor-2.0.2/src/desktop/SD_Reports.desktop 2007-07-30 05:01:02.000000000 +0200
+++ new/yast2-apparmor-2.1/src/desktop/SD_Reports.desktop 2007-08-20 18:09:36.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstClonable=false
-Icon=apparmor/view_profile
+Icon=apparmor_view_profile
Exec=/sbin/yast2 SD_Report
Name=AppArmor Reports
Files old/yast2-apparmor-2.0.2/src/icons/22x22/add_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/add_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/apparmor_add_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/apparmor_add_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/apparmor_control_panel.png and new/yast2-apparmor-2.1/src/icons/22x22/apparmor_control_panel.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/apparmor_creation_wizard.png and new/yast2-apparmor-2.1/src/icons/22x22/apparmor_creation_wizard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/apparmor_delete_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/apparmor_delete_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/apparmor_edit_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/apparmor_edit_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/apparmor_update_wizard.png and new/yast2-apparmor-2.1/src/icons/22x22/apparmor_update_wizard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/apparmor_view_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/apparmor_view_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/control_panel.png and new/yast2-apparmor-2.1/src/icons/22x22/control_panel.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/creation_wizzard.png and new/yast2-apparmor-2.1/src/icons/22x22/creation_wizzard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/delete_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/delete_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/edit_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/edit_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/update_wizzard.png and new/yast2-apparmor-2.1/src/icons/22x22/update_wizzard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/22x22/view_profile.png and new/yast2-apparmor-2.1/src/icons/22x22/view_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/add_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/add_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_add_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_add_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_app_armor.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_app_armor.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_control_panel.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_control_panel.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_creation_wizard.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_creation_wizard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_delete_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_delete_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_edit_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_edit_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/app_armor.png and new/yast2-apparmor-2.1/src/icons/32x32/app_armor.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_update_wizard.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_update_wizard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/apparmor_view_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/apparmor_view_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/control_panel.png and new/yast2-apparmor-2.1/src/icons/32x32/control_panel.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/creation_wizzard.png and new/yast2-apparmor-2.1/src/icons/32x32/creation_wizzard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/delete_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/delete_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/edit_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/edit_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/update_wizzard.png and new/yast2-apparmor-2.1/src/icons/32x32/update_wizzard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/32x32/view_profile.png and new/yast2-apparmor-2.1/src/icons/32x32/view_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/add_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/add_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_add_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_add_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_app_armor.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_app_armor.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_control_panel.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_control_panel.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_creation_wizard.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_creation_wizard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_delete_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_delete_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_edit_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_edit_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/app_armor.png and new/yast2-apparmor-2.1/src/icons/48x48/app_armor.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_update_wizard.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_update_wizard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/apparmor_view_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/apparmor_view_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/control_panel.png and new/yast2-apparmor-2.1/src/icons/48x48/control_panel.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/creation_wizzard.png and new/yast2-apparmor-2.1/src/icons/48x48/creation_wizzard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/delete_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/delete_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/edit_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/edit_profile.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/update_wizzard.png and new/yast2-apparmor-2.1/src/icons/48x48/update_wizzard.png differ
Files old/yast2-apparmor-2.0.2/src/icons/48x48/view_profile.png and new/yast2-apparmor-2.1/src/icons/48x48/view_profile.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-apparmor-2.0.2/yast2-apparmor.spec new/yast2-apparmor-2.1/yast2-apparmor.spec
--- old/yast2-apparmor-2.0.2/yast2-apparmor.spec 2007-07-30 05:04:31.000000000 +0200
+++ new/yast2-apparmor-2.1/yast2-apparmor.spec 2007-08-20 18:09:42.000000000 +0200
@@ -16,10 +16,10 @@
#
Summary: Yast2 plugins for AppArmor management
Name: yast2-apparmor
-Version: 2.0.2
-Release: 857
+Version: 2.1
+Release: 909
Group: Productivity/Security
-Source0: %{name}-%{version}-857.tar.gz
+Source0: %{name}-%{version}-909.tar.gz
License: GPL and LGPL
BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build
Url: http://forge.novell.com/modules/xfmod/project/?apparmor
@@ -29,14 +29,19 @@
Provides: yast2-subdomain
BuildRequires: update-desktop-files
+BuildRequires: yast2 yast2-devtools
%if %{suse_version} > 1010
-BuildRequires: yast2 yast2-devtools yast2-theme-openSUSE
+BuildRequires: yast2-theme-openSUSE
%define themedir /usr/share/YaST2/theme/openSUSE
%else
%if %{suse_version} > 1000
-BuildRequires: yast2 yast2-devtools yast2-theme-SuSELinux
-%define themedir /usr/share/YaST2/theme/SuSELinux
+ %if 0%{?sles_version} > 9
+BuildRequires: yast2-theme-NLD
+ %else
+BuildRequires: yast2-theme-SuSELinux
+ %endif
%endif
+%define themedir /usr/share/YaST2/theme/SuSELinux
%endif
%description
@@ -65,6 +70,21 @@
fi
done
+# make icons available to GNOME control center (hicolor theme)
+# (bug #212500)
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/22x22/apps
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/32x32/apps
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/48x48/apps
+cd $RPM_BUILD_ROOT/%{themedir}/icons
+for dir in 22x22 32x32 48x48; do
+ cd $RPM_BUILD_ROOT/%{themedir}/icons/${dir}/apps
+ icons=$(ls *.png)
+ cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/${dir}/apps
+ for icon in ${icons}; do
+ ln -s %{themedir}/icons/${dir}/apps/${icon} .
+ done
+done
+
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -79,6 +99,7 @@
/usr/lib/YaST2/servers_non_y2
/usr/lib/perl5/vendor_perl/*
%{themedir}/icons
+/usr/share/icons/hicolor/
%doc COPYING.LGPL
%dir %attr(-,root,root) /etc/apparmor
%config(noreplace) /etc/apparmor/reports.crontab
@@ -95,6 +116,8 @@
%preun
%changelog
+* Tue Aug 14 2007 - sbeattie@suse.de
+- Make icons display under yast-gnome (#212500, #297243)
* Mon Nov 13 2006 David Drewelow