This fix is for #212500 "y2controlcenter-gnome does not find AppArmor

icons" and its duplicate #297243 "Missing YaST icon: All app armor
icons".

The problem was that (a) the .desktop spec doesn't really allow having
path elements in the "Icon=" entry, and (b) that y2controlcenter-gnome
was looking in /usr/share/icons/hicolor/[size]/apps/ for the apparmor
icons, which weren't there.

management/yastui/Makefile

@@ -35,9 +35,9 @@ install:
 	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/48x48/apps
-	mkdir -p ${DESTDIR}/${THEMEDIR}/icons/32x32/apps/apparmor
+	mkdir -p ${DESTDIR}/${THEMEDIR}/icons/32x32/apps
-	mkdir -p ${DESTDIR}/${THEMEDIR}/icons/22x22/apps/apparmor
+	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 @@ install:
 	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/48x48/* ${DESTDIR}/${THEMEDIR}/icons/48x48/apps
-	cp -a src/icons/32x32/* ${DESTDIR}/${THEMEDIR}/icons/32x32/apps/apparmor
+	cp -a src/icons/32x32/* ${DESTDIR}/${THEMEDIR}/icons/32x32/apps
-	cp -a src/icons/22x22/* ${DESTDIR}/${THEMEDIR}/icons/22x22/apps/apparmor
+	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/

management/yastui/src/clients/SD_AddProfile.ycp

@@ -66,7 +66,7 @@ define any MainSequence() ``{
     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 ) {

management/yastui/src/clients/SD_DeleteProfile.ycp

@@ -53,7 +53,7 @@ define any MainSequence() ``{
     ];
 
     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");

management/yastui/src/clients/SD_EditProfile.ycp

@@ -29,7 +29,7 @@ define any MainSequence() ``{
    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 @@ define any MainSequence() ``{
     ];
 
     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");

management/yastui/src/clients/SD_Report.ycp

@@ -76,7 +76,7 @@ define any mainSequence() ``{
    ];
 
    Wizard::CreateDialog();
-   Wizard::SetTitleIcon("apparmor/view_profile");
+   Wizard::SetTitleIcon("apparmor_view_profile");
    any ret = Sequencer::Run(aliases, sequence);
    Wizard::CloseDialog();
    return ret;

management/yastui/src/desktop/SD_Reports.desktop

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 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

management/yastui/src/desktop/SD_add_profile.desktop

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 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

management/yastui/src/desktop/SD_control_panel.desktop

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 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

management/yastui/src/desktop/SD_delete_profile.desktop

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 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

management/yastui/src/desktop/SD_edit_profile.desktop

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 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

management/yastui/src/desktop/SD_genprof.desktop

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 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

management/yastui/src/desktop/SD_logprof.desktop

@@ -16,7 +16,7 @@ X-SuSE-YaST-Geometry=
 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

management/yastui/src/desktop/groups/apparmor.desktop

@@ -11,6 +11,6 @@ X-SuSE-YaST-Group=AppArmor
 X-SuSE-YaST-SortKey=50
 
 OnlyShowIn=X-SuSE-YaST;
-Icon=apparmor/app_armor
+Icon=apparmor_app_armor
 
 Name=Novell AppArmor

management/yastui/yast2-apparmor.spec.in

@@ -70,6 +70,21 @@ for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.des
     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 ../../../../YaST2/theme/current/icons/${dir}/apps/${icon} .
+    done
+done
+
 %clean 
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -84,6 +99,7 @@ done
 /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