commit suselinux-manual_fr

Hello community,

here is the log from the commit of package suselinux-manual_fr
checked in at Tue Apr 18 18:44:12 CEST 2006.

--------
--- suselinux-manual_fr/suselinux-manual_fr.changes	2006-04-11 13:12:54.000000000 +0200
+++ NOARCH/suselinux-manual_fr/suselinux-manual_fr.changes	2006-04-18 17:28:22.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 18 17:23:58 CEST 2006 - ke@suse.de
+
+- Install the AppArmor manual as AppArmor; reported by Christian Boltz
+  [# 166088]
+- Provide Name without language code for top level .directory file.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ suselinux-manual_fr.spec ++++++
--- /var/tmp/diff_new_pack.nHbhZ7/_old	2006-04-18 18:43:42.000000000 +0200
+++ /var/tmp/diff_new_pack.nHbhZ7/_new	2006-04-18 18:43:42.000000000 +0200
@@ -15,7 +15,7 @@
 %define my_prov_obs suselinux-adminguide_%{my_lang} suselinux-userguide_%{my_lang}
 %define my_supported_archs x86_64 %ix86 ia64
 Version:        10.1
-Release:        5
+Release:        7
 Source0:        SLPROF-html_%{my_lang}-html.tar.bz2
 # Source2:      %{name}-%{version}.pdf
 # Source3:      %{name}.desktop.in
@@ -86,7 +86,7 @@
 cp %{S:20} reference_%{my_lang}.pdf
 cp %{S:21} startup_%{my_lang}.pdf
 cp %{S:22} application_%{my_lang}.pdf
-cp %{S:22} apparmor-admin-guide_%{my_lang}.pdf
+cp %{S:23} apparmor-admin-guide_%{my_lang}.pdf
 
 %install
 [ -d $RPM_BUILD_ROOT ] && rm -fvr $RPM_BUILD_ROOT
@@ -114,7 +114,7 @@
 sed -i 's:^\(Name.*=\).*:\1SUSE Linux Documentation (fr):
 s:^\(Comment.*=\).*:\1SUSE Linux Documentation (fr):' desktop/.directory
 sed -i 's:^\(Name.*=\).*:\1Start-Up (fr):
-s:^\(Comment.*=\).*:\1Start-Up:' desktop/startup/.directory
+s:^\(Comment.*=\).*:\1Start-Up (fr):' desktop/startup/.directory
 sed -i 's:^\(Name.*=\).*:\1Reference (fr):
 s:^\(Comment.*=\).*:\1Reference (fr):' desktop/reference/.directory
 sed -i 's:^\(Name.*=\).*:\1Applications (fr):
@@ -178,10 +178,30 @@
   cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/${p}
   popd
 done
+if ! grep -q -e '^Name *=' desktop/.directory; then
+    # requiered if no "Name=" is present
+  sed -i "s|^Name\[.*\]\(=.*\)|Name\1\\
+&|" desktop/.directory
+fi
 sed "s|@PATH@|%{_defaultdocdir}/%{name}/manual|
 s/\[\]//
 s|@id@|$id|" desktop/.directory \
   >$RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory
+# Link it into the Gnome help system (must be found by calling
+# susehelp help://suselinux-manual/
+%define gnome_dir /opt/gnome/share/gnome/help/suselinux-manual
+install -d $RPM_BUILD_ROOT/%{gnome_dir}
+pushd $RPM_BUILD_ROOT/%{gnome_dir}
+if [ %{my_lang} = "en" ]; then
+  target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual
+  install -d $target
+  ln -sf %{_defaultdocdir}/%{name}/manual C
+else
+  target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual
+  install -d $target
+  ln -sf %{_defaultdocdir}/%{name}/manual %{my_lang}
+fi
+popd
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -196,8 +216,17 @@
 %doc html/manual
 %{my_desktopdir}
 %dir %{_datadir}/susehelp
+%{gnome_dir}
+%dir /opt/gnome
+%dir /opt/gnome/share
+%dir /opt/gnome/share/gnome
+%dir /opt/gnome/share/gnome/help
 
 %changelog -n suselinux-manual_fr
+* Tue Apr 18 2006 - ke@suse.de
+- Install the AppArmor manual as AppArmor; reported by Christian Boltz
+  [# 166088]
+- Provide Name without language code for top level .directory file.
 * Tue Apr 11 2006 - ke@suse.de
 - Adjust locale Provides [# 162525].
 * Thu Mar 02 2006 - ke@suse.de


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...