Mailinglist Archive: opensuse-commit (2092 mails)
| < Previous | Next > |
commit apparmor-admin_en
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 20 Aug 2007 17:17:39 +0200
- Message-id: <20070820151740.1A2F2678331@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package apparmor-admin_en
checked in at Mon Aug 20 17:17:39 CEST 2007.
--------
--- apparmor-admin_en/apparmor-admin_en.changes 2007-02-27 14:05:23.000000000 +0100
+++ /mounts/work_src_done/NOARCH/apparmor-admin_en/apparmor-admin_en.changes 2007-08-20 12:58:37.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 20 12:57:40 CEST 2007 - ke@xxxxxxx
+
+- Update current texts as a stand-alone package.
+- Use new desktop files.
+
+-------------------------------------------------------------------
Old:
----
apparmor-admin_en-desktop.tar.bz2
apparmor-admin_en-graphics.tar.bz2
apparmor-admin_en-html.tar.bz2
apparmor-admin_en.tar.bz2
apparmor-admin-online_en.pdf
New:
----
APPARMOR-admin_en-desktop.tar.bz2
APPARMOR-admin_en-graphics.tar.bz2
APPARMOR-admin_en-html.tar.bz2
APPARMOR-admin_en.pdf
APPARMOR-admin_en.tar.bz2
LICENSE.txt
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apparmor-admin_en.spec ++++++
--- /var/tmp/diff_new_pack.U29807/_old 2007-08-20 17:17:30.000000000 +0200
+++ /var/tmp/diff_new_pack.U29807/_new 2007-08-20 17:17:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package apparmor-admin_en (Version 10)
+# spec file for package apparmor-admin_en (Version 10.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,19 +12,24 @@
Name: apparmor-admin_en
%define my_lang en
-Version: 10
-Release: 33
-Source0: apparmor-admin_%{my_lang}-html.tar.bz2
-Source10: apparmor-admin_%{my_lang}-desktop.tar.bz2
-Source20: apparmor-admin-online_%{my_lang}.pdf
-Source30: apparmor-admin_%{my_lang}-graphics.tar.bz2
-Source40: apparmor-admin_%{my_lang}.tar.bz2
+%define my_book APPARMOR-admin
+Version: 10.3
+Release: 1
+Provides: locale(en)
+#OBS
+Source0: APPARMOR-admin_en-html.tar.bz2
+Source1: APPARMOR-admin_en-desktop.tar.bz2
+Source2: APPARMOR-admin_en.pdf
+Source3: APPARMOR-admin_en-graphics.tar.bz2
+Source4: APPARMOR-admin_en.tar.bz2
+Source5: LICENSE.txt
+#SOURCES
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArchitectures: noarch
+BuildRequires: update-desktop-files
Group: Documentation/SuSE
-License: GNU Free Documentation License, Version 1.1 (GFDL)
+License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
Summary: AppArmor Admin Guide (English)
-PreReq: /bin/rm /bin/ln
%define _defaultdocdir %{_datadir}/doc/manual
%define _docdir %{_datadir}/doc/manual
%define PDFDOC %{_defaultdocdir}/%{name}-pdf
@@ -34,115 +39,167 @@
+%package pdf
+Group: Documentation/SuSE
+License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
+Summary: AppArmor Admin Guide (English)
+Provides: locale(en)
+#PDFOBS
+
+%description pdf
+AppArmor Administration Guide (English).
+
+
+
%prep
-#make dist-html
-#make pdf-color
-ke_prep_pack () {
- pushd html
- # ln -sf book.* index.html
- # box: SLPROF-html
- mv $(find -maxdepth 1 -type d -name '[[:alnum:]]*') $1
- popd
- #mv desktop ${1}_desktop
-}
-%setup -c -q -a 10
-# ke_prep_pack manual
+#%setup -c -q
+%setup -c -q -a 1
+#PREP
+find -name '*.png' -o -name '*.svg' | xargs chmod 644
+cp %{S:2} .
+#PDFPREP
%build
find . -name CVS -o -name '.xvpics' -o -name '.cvsignore' \
| xargs rm -fr
-cp %{S:20} apparmor-admin_%{my_lang}.pdf
+# make sure index.html exists
+for f in $(find html -type f -name 'book.*'); do
+ pushd ${f%/*}
+ [ -f index.html -o -L index.html ] || ln -sf ${f##*/} index.html
+ popd
+done
%install
[ -d $RPM_BUILD_ROOT ] && rm -fvr $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}
-%define bookdir %(echo %name | sed 's/-//')
-%define my_desktopdir /usr/share/susehelp/meta//%bookdir
-%define myy_desktopdir %(echo %my_desktopdir | sed 's|//|/|')
-# add language info
-sed -i 's:^\(Name.*=\)\(.*\):\1\2 (en):
-s:^\(Comment.*=\)\(.*\):\1\2 (en):' desktop/.directory
-mkdir -p $RPM_BUILD_ROOT%{myy_desktopdir}
-if ! grep -q -e '^Name *=' desktop/.directory; then
- # requiered if no "Name=" is present
- sed -i "s|^Name\[.*\]\(=.*\)|Name\1\\
-&|" desktop/.directory
-fi
-id=%{name}
-id=${id//_}
-sed -i "s|@PATH@|%{_defaultdocdir}/%{name}|
-s|@id@|$id|" desktop/.directory # >$RPM_BUILD_ROOT%{myy_desktopdir}/.directory
+# is set for sles or sled as /sles or /sled
+%define my_desktopdir /usr/share/susehelp/meta
+echo %{my_desktopdir} | sed 's:\(\|xyzy\)::' >filelist
+# mkdir -p desktop/{startup,reference,application,apparmor-admin-guide}
+###
+install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name}
+# product is name without language code
+%if %suse_version < 1030
+%define gnome_dir /opt/gnome/share/gnome/help/apparmor-admin
+%else
+%define gnome_dir %{_datadir}/gnome/help/apparmor-admin
+%endif
+install -d $RPM_BUILD_ROOT%{gnome_dir}
+#
+if [ -d html/%my_book ]; then
+mv html/%my_book html/manual
pushd desktop
-for f in $(find . -name '*desktop'); do
-# # /usr/share/doc/manual/suselinux-manual_en/manual
- sed -i "s|@PATH@|%{_defaultdocdir}/%{name}|
-#remove [] without language code
+# problem writing desktop files on 10.3
+if [ -d index.desktop ]; then
+ for f in $(find index.desktop -mindepth 1 -maxdepth 1); do
+ mv $f .
+ done
+ rmdir index.desktop
+fi
+if [ ! -f .directory ]; then
+ # stand-alone book, hidden in sub-directory
+ dir=$(find . -maxdepth 1 -type d -name 'book_*')
+ if [ -n "$dir" ]; then
+ for f in $(find $dir -mindepth 1 -maxdepth 1); do
+ mv $f .
+ done
+ rmdir $dir
+ fi
+fi
+for f in $(find . -type f -name '*desktop'); do
+ # /usr/share/doc/manual/suselinux-manual_en/manual
+ sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual|
s/\[\]//" $f
if ! grep -q -e '^Name *=' $f; then
# requiered if no "Name=" is present
sed -i "s|^Name\[.*\]\(=.*\)|Name\1\\
&|" $f
fi
-# file name must end with .desktop
- n=${f//\./_}
- n=${n/_/.}
- n=${n%_desktop}.desktop
- [ $f != $n ] && mv $f $n
done
-for f in $(find . -name '.directory'); do
- sed -i "s|@PATH@|%{_defaultdocdir}/%{name}|
+for d in $(find . -maxdepth 1 -type d -name 'book*'); do
+ id=${d//\./}
+ id=${id//\//}%{my_lang}
+ pushd $d
+ for f in $(find . -name '.directory'); do
+ sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual|
s/\[\]//
s|@id@|$id|" $f
- if ! grep -q -e '^Name *=' $f; then
- # requiered if no "Name=" is present
- sed -i "s|^Name\[.*\]\(=.*\)|Name\1\\
-&|" $f
+ case $d in
+ *_startup)
+ [ $f = "./.directory" ] \
+ && sed -i "s|^\(X-DOC-Weight\).*|\1=-10000|" $f ;;
+ esac
+ done
+ popd
+done
+# Probably useful for stand-alone books
+for f in $(find . -maxdepth 1 -name '*.directory'); do
+ id=%{name}
+ id=${id//_/}
+ sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual|
+s/\[\]//
+s|@id@|$id|" $f
+ # Fix the index.html reference
+ if [ $f = ./.directory ]; then
+ sed -i 's:\(^DocPath.*/\).*:\1index.html:
+s/^\(Name\|Comment\)\(.*\)/\1\2 (%{my_lang})/' $f
fi
-sed -i "s|index.html|book.apparmor.admin.html|" $f
done
-book_file=$(find ../html -name 'book.*' -o -name 'index.*' | head -n 1)
-charset=$(tr '<' '\n' < "$book_file" | sed -n 's:.*charset=\(.*\)".*:\1:p')
-title=$(tr '<' '\n' < "$book_file" | sed -n 's:^title>::p;' | iconv -f $charset -t UTF-8)
-sed -i "s|$title $title|$title |" .directory
-cp -a . $RPM_BUILD_ROOT%{myy_desktopdir}
+# # remove the dots from the file names
+# for f in $(find . -type f -name '*desktop'); do
+# d=${f%/*}
+# n=${f##*/}; n=${n/\.desktop}; n=${n//\./_}; n=${n}.desktop
+# [ $f = $d/$n ] || mv -v $f $d/$n
+# done
+# ren_dir () {
+# for d in $(find . -maxdepth $1 -mindepth $1 -type d); do
+# n=${d#*/}; n=${n//\./_}
+# [ $d = $n ] || mv -v $d $n
+# done
+# }
+# ren_dir 1
+# ren_dir 2
+# #
+cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name}
popd
-# sed "s|@PATH@|%{_defaultdocdir}/%{name}/manual|
-# s/\[\]//
-# s|@id@|$id|" desktop/.directory \
-# >$RPM_BUILD_ROOT%{myy_desktopdir}/%{name}/.directory
# Link it into the Gnome help system (must be found by calling
# susehelp help://suselinux-manual/
-%define gnome_dir /usr/share/gnome/help/apparmor-admin
-install -d $RPM_BUILD_ROOT/%{gnome_dir}
pushd $RPM_BUILD_ROOT/%{gnome_dir}
if [ %{my_lang} = "en" ]; then
- target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
+ target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual
install -d $target
- ln -sf %{_defaultdocdir}/%{name} C
+ ln -sf %{_defaultdocdir}/%{name}/manual C
else
- target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
+ target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual
install -d $target
- ln -sf %{_defaultdocdir}/%{name} %{my_lang}
+ ln -sf %{_defaultdocdir}/%{name}/manual %{my_lang}
fi
popd
+else
+# PDF only books
+install -d html/manual
+echo PDF only > html/manual/%{name}
+fi
+%suse_update_desktop_file $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory
-%clean
-rm -fr $RPM_BUILD_ROOT
-
-%files
+%files pdf
%defattr(-, root, root)
%dir %{_defaultdocdir}
%doc *.pdf
-#
-%doc html/APPARMOR-admin/*
-%{myy_desktopdir}
-%dir %{_datadir}/susehelp/meta
+
+%files
+%defattr(-, root, root)
+%doc html/manual
+%{my_desktopdir}
%dir %{_datadir}/susehelp
%{gnome_dir}
%dir /usr/share/gnome
%dir /usr/share/gnome/help
%changelog
+* Mon Aug 20 2007 - ke@xxxxxxx
+- Update current texts as a stand-alone package.
+- Use new desktop files.
* Tue Feb 27 2007 - ke@xxxxxxx
- /opt/gnome -> /usr .
* Fri Jun 02 2006 - ke@xxxxxxx
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |