Mailinglist Archive: opensuse-commit (1187 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package suselinux-manual_zh_TW
checked in at Wed Apr 19 13:45:02 CEST 2006.

--------
--- suselinux-manual_zh_TW/suselinux-manual_zh_TW.changes	2006-04-11 13:13:19.000000000 +0200
+++ NOARCH/suselinux-manual_zh_TW/suselinux-manual_zh_TW.changes	2006-04-19 10:27:39.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 19 10:23:58 CEST 2006 - ke@xxxxxxx
+
+- Install the AppArmor manual as AppArmor; reported by Christian Boltz
+  [# 166088]
+- Provide Name without language code for top level .directory file.
+
+-------------------------------------------------------------------

New:
----
  APPARMOR-admin_zh_TW.tar.bz2
  book.apparmor.admin-online_zh_TW.pdf
  book.apparmor.admin_zh_TW-graphics.tar.bz2

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

Other differences:
------------------
++++++ suselinux-manual_zh_TW.spec ++++++
--- /var/tmp/diff_new_pack.78dmPn/_old	2006-04-19 13:44:49.000000000 +0200
+++ /var/tmp/diff_new_pack.78dmPn/_new	2006-04-19 13:44:49.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:        6
+Release:        8
 Source0:        SLPROF-html_%{my_lang}-html.tar.bz2
 # Source2:      %{name}-%{version}.pdf
 # Source3:      %{name}.desktop.in
@@ -23,12 +23,15 @@
 Source20:       book.slprof.online-online_%{my_lang}.pdf
 Source21:       book.slprof.print-online_%{my_lang}.pdf
 Source22:       book.slprof.appl-online_%{my_lang}.pdf
+Source23:       book.apparmor.admin-online_%{my_lang}.pdf
 Source30:       book.slprof.online_%{my_lang}-graphics.tar.bz2
 Source31:       book.slprof.print_%{my_lang}-graphics.tar.bz2
 Source32:       book.slprof.appl_%{my_lang}-graphics.tar.bz2
+Source33:       book.apparmor.admin_%{my_lang}-graphics.tar.bz2
 Source40:       SLPROF-online_%{my_lang}.tar.bz2
 Source41:       SLPROF-print_%{my_lang}.tar.bz2
 Source42:       SLPROF-appl_%{my_lang}.tar.bz2
+Source43:       APPARMOR-admin_%{my_lang}.tar.bz2
 Obsoletes:      %{my_prov_obs}
 Provides:       %{my_prov_obs}
 Provides:       locale(suselinux-manual_en:zh_TW)
@@ -83,12 +86,13 @@
 cp %{S:20} reference_%{my_lang}.pdf
 cp %{S:21} startup_%{my_lang}.pdf
 cp %{S:22} application_%{my_lang}.pdf
+cp %{S:23} apparmor-admin-guide_%{my_lang}.pdf
 
 %install
 [ -d $RPM_BUILD_ROOT ] && rm -fvr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}
 %define my_desktopdir /usr/share/susehelp/meta
-mkdir -p  desktop/{startup,reference,application}
+mkdir -p  desktop/{startup,reference,application,apparmor-admin-guide}
 # Startup
 mv desktop/bk01* desktop/startup
 # mv desktop/app* desktop/startup
@@ -103,15 +107,21 @@
 mv desktop/bk03* desktop/application
 mv desktop/preface.appl.desktop desktop/application
 cp desktop/.directory desktop/application
+# Apparmor
+cp desktop/bx* desktop/apparmor-admin-guide
+# mv desktop/preface.appl.desktop desktop/apparmor-admin-guide
+cp desktop/.directory desktop/apparmor-admin-guide
 sed -i 's:^\(Name.*=\).*:\1SUSE Linux Documentation (zh_TW):
 s:^\(Comment.*=\).*:\1SUSE Linux Documentation (zh_TW):' desktop/.directory
 sed -i 's:^\(Name.*=\).*:\1Start-Up (zh_TW):
-s:^\(Comment.*=\).*:\1Start-Up:' desktop/startup/.directory
+s:^\(Comment.*=\).*:\1Start-Up (zh_TW):' desktop/startup/.directory
 sed -i 's:^\(Name.*=\).*:\1Reference (zh_TW):
 s:^\(Comment.*=\).*:\1Reference (zh_TW):' desktop/reference/.directory
 sed -i 's:^\(Name.*=\).*:\1Applications (zh_TW):
 s:^\(Comment.*=\).*:\1Applications (zh_TW):' desktop/application/.directory
-for p in startup reference application; do
+sed -i 's:^\(Name.*=\).*:\1AppArmor (zh_TW):
+s:^\(Comment.*=\).*:\1AppArmor (zh_TW):' desktop/apparmor-admin-guide/.directory
+for p in startup reference application apparmor-admin-guide; do
   echo  ${p}
   mkdir -p $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/${p}
 # id=%{name}
@@ -155,6 +165,9 @@
       application)
         sed -i "s|index.html|book.slprof.appl.html|" $f
         ;;
+      apparmor-admin-guide)
+        sed -i "s|index.html|book.apparmor.admin.html|" $f
+        ;;
       *)
         ;;
     esac
@@ -165,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
@@ -183,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_zh_TW
+* Wed Apr 19 2006 - ke@xxxxxxx
+- 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@xxxxxxx
 - Adjust locale Provides [# 162525].
 * Mon Feb 27 2006 - ke@xxxxxxx


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



Remember to have fun...