Hello community, here is the log from the commit of package opensuse-manuals_de for openSUSE:Factory checked in at Tue Feb 22 20:33:49 CET 2011.
-------- --- opensuse-manuals_de/opensuse-manuals_de.changes 2010-09-22 14:52:20.000000000 +0200 +++ opensuse-manuals_de/opensuse-manuals_de.changes 2011-02-22 14:32:30.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 22 14:29:28 CET 2011 - [email protected] + +- Update translation according to the opensuse-manuals_en original. +- Restructure Start-up Guide. +- Add Tuning and KVM Guide. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- opensuse-gnomequick_de-pdf-yelp.tar.bz2 opensuse-gnomequick_de.pdf opensuse-html_de-desktop.tar.bz2 opensuse-html_de-html.tar.bz2 opensuse-installquick_de-pdf-yelp.tar.bz2 opensuse-installquick_de.pdf opensuse-kdequick_de-pdf-yelp.tar.bz2 opensuse-kdequick_de.pdf opensuse-reference_de-pdf-yelp.tar.bz2 opensuse-reference_de.pdf opensuse-startup_de-pdf-yelp.tar.bz2 opensuse-startup_de.pdf New: ---- opensuse-kvm_de-graphics.tar.bz2 opensuse-kvm_de.tar.bz2 opensuse-reference_de-graphics.tar.bz2 opensuse-reference_de.tar.bz2 opensuse-security_de-graphics.tar.bz2 opensuse-security_de.tar.bz2 opensuse-startup_de-graphics.tar.bz2 opensuse-startup_de.tar.bz2 opensuse-tuning_de-graphics.tar.bz2 opensuse-tuning_de.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_de.spec ++++++ --- /var/tmp/diff_new_pack.t4cw32/_old 2011-02-22 20:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.t4cw32/_new 2011-02-22 20:33:26.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package opensuse-manuals_de (Version 11.3) +# spec file for package opensuse-manuals_de # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,52 +21,30 @@ Name: opensuse-manuals_de %define my_lang de %define my_book opensuse-html -Version: 11.3 +Version: 11.4 Release: 1 +#BREQ Provides: locale(desktop-data-openSUSE:de) -Obsoletes: opensuse-manual_de < 11.2 opensuse-kdequick_de < 11.1 opensuse-gnomequick_de < 11.1 opensuse-gnomeuser_de < 11.1 opensuse-kdeuser_de < 11. opensuse-kde3user_de < 11.1 apparmor-admin_de < 11.1 -Provides: opensuse-manual_de = %{version}-%{release} opensuse-kdequick_de = %{version}-%{release} opensuse-gnomequick_de = %{version}-%{release} opensuse-gnomeuser_de = %{version}-%{release} opensuse-kdeuser_de = %{version}-%{release} opensuse-kde3user_de = %{version}-%{release} apparmor-admin_de = %{version}-%{release} -Obsoletes: opensuse-manual_de-pdf < 11.2 opensuse-kde3user_de-pdf < 11.1 opensuse-manuals_de-pdf < 11.3 -Provides: opensuse-manual_de-pdf = %{version}-%{release} opensuse-kde3user_de-pdf = %{version}-%{release} opensuse-manuals_de-pdf = %{version}-%{release} -Obsoletes: opensuse-apparmor-admin_de-pdf < 11.2 -Obsoletes: opensuse-apps_de-pdf < 11.3 -Obsoletes: opensuse-gnomeuser_de-pdf < 11.3 -Obsoletes: opensuse-kdeuser_de-pdf < 11.3 -Obsoletes: opensuse-security_de-pdf < 11.3 -Provides: opensuse-apparmor-admin_de-pdf = %{version}-%{release} -Provides: opensuse-apps_de-pdf = %{version}-%{release} -Provides: opensuse-gnomeuser_de-pdf = %{version}-%{release} -Provides: opensuse-kdeuser_de-pdf = %{version}-%{release} -Provides: opensuse-security_de-pdf = %{version}-%{release} - #OBS -Source00: opensuse-html_de-html.tar.bz2 -Source01: opensuse-html_de-desktop.tar.bz2 -Source02: opensuse-html_de-graphics.tar.bz2 -Source03: opensuse-html_de.tar.bz2 -Source10: opensuse-installquick_de.pdf -#Source11: opensuse-installquick_de-graphics.tar.bz2 -#Source12: opensuse-installquick_de.tar.bz2 -Source13: opensuse-installquick_de-pdf-yelp.tar.bz2 -Source20: opensuse-gnomequick_de.pdf -#Source21: opensuse-gnomequick_de-graphics.tar.bz2 -#Source22: opensuse-gnomequick_de.tar.bz2 -Source23: opensuse-gnomequick_de-pdf-yelp.tar.bz2 -Source30: opensuse-kdequick_de.pdf -#Source31: opensuse-kdequick_de-graphics.tar.bz2 -#Source32: opensuse-kdequick_de.tar.bz2 -Source33: opensuse-kdequick_de-pdf-yelp.tar.bz2 -Source40: opensuse-reference_de.pdf -#Source41: opensuse-reference_de-graphics.tar.bz2 -#Source42: opensuse-reference_de.tar.bz2 -Source43: opensuse-reference_de-pdf-yelp.tar.bz2 -Source50: opensuse-startup_de.pdf -#Source51: opensuse-startup_de-graphics.tar.bz2 -#Source52: opensuse-startup_de.tar.bz2 -Source53: opensuse-startup_de-pdf-yelp.tar.bz2 +Source00: opensuse-html_de.tar.bz2 +Source01: opensuse-html_de-graphics.tar.bz2 +Source10: opensuse-startup_de.tar.bz2 +Source11: opensuse-startup_de-graphics.tar.bz2 +Source20: opensuse-reference_de.tar.bz2 +Source21: opensuse-reference_de-graphics.tar.bz2 +Source30: opensuse-security_de.tar.bz2 +Source31: opensuse-security_de-graphics.tar.bz2 +Source40: opensuse-kvm_de.tar.bz2 +Source41: opensuse-kvm_de-graphics.tar.bz2 +Source50: opensuse-tuning_de.tar.bz2 +Source51: opensuse-tuning_de-graphics.tar.bz2 #SOURCES Source901: doc_pre_checkin.sh Source903: attributes +BuildRequires: susedoc +# Also buildrequire tools that susedoc does not pull in automatically ATM +BuildRequires: poppler-tools python-lxml xerces-j2 +BuildRequires: xmlgraphics-fop BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Group: Documentation/SUSE @@ -80,55 +58,29 @@ format. It can be accessed via the Desktop's help centers. The following manuals are included: -* Installation Quick Start - * Start-Up -* GNOME Quick Start - -* GNOME User Guide (English) - -* KDE Quick Start - -* KDE User Guide (English) - -* Application Guide (English) - * Reference * Security Guide (English) -* AppArmor Quick Start (English) +* Tuning Guide (English) -%package -n opensuse-installquick_de-pdf -Group: Documentation/SUSE -License: GFDLv1.2 -Summary: openSUSE manual: Installation Quick Start (PDF, German) -#Provides: locale(desktop-data-openSUSE:de) -###PDFOBS - -%description -n opensuse-installquick_de-pdf -A quick start guide providing a walk-through to the default installation. +* KVM Guide (English) -%package -n opensuse-gnomequick_de-pdf -Group: Documentation/SUSE -License: GFDLv1.2 -Summary: openSUSE manual: GNOME Quick Start (PDF, German) -#Provides: locale(desktop-data-openSUSE:de) -###PDFOBS - -%description -n opensuse-gnomequick_de-pdf -A quick start guide to the GNOME desktop. - -%package -n opensuse-kdequick_de-pdf +%package -n opensuse-startup_de-pdf Group: Documentation/SUSE License: GFDLv1.2 -Summary: openSUSE manual: KDE Quick Start (PDF, German) +Summary: openSUSE manual: Start-Up (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS -%description -n opensuse-kdequick_de-pdf -A quick start guide to the KDE desktop. +%description -n opensuse-startup_de-pdf +Guides you through the installation and basic configuration of your +system. For newcomers, the manual also introduces basic Linux concepts +such as the file system, the user concept and access permissions and +gives an overview of the features the system offers to support +mobile computing. Provides help and advice in troubleshooting. %package -n opensuse-reference_de-pdf Group: Documentation/SUSE @@ -146,42 +98,116 @@ the interaction of key system components and the set-up of various network and file services. -%package -n opensuse-startup_de-pdf +%package -n opensuse-security_de-pdf Group: Documentation/SUSE License: GFDLv1.2 -Summary: openSUSE manual: Start-Up (PDF, German) +Summary: openSUSE manual: Security Guide (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS -%description -n opensuse-startup_de-pdf -Guides you through the installation and basic configuration of your -system. For newcomers, the manual also introduces basic Linux concepts -such as the file system, the user concept and access permissions and -gives an overview of the features the system offers to support -mobile computing. Provides help and advice in troubleshooting. +%description -n opensuse-security_de-pdf +This guide introduces basic concepts of system security, covering +both local and network security aspects. Shows how to make use of +the product inherent security software like AppArmor (which lets +you specify per program which files the program may read, write, +and execute) or the auditing system that reliably collects +information about any security-relevant events. + +%package -n opensuse-kvm_de-pdf +Group: Documentation/SUSE +License: - +Summary: - +#Provides: locale(desktop-data-openSUSE:de) +###PDFOBS + +%description -n opensuse-kvm_de-pdf +- + +%package -n opensuse-tuning_de-pdf +Group: Documentation/SUSE +License: - +Summary: - +#Provides: locale(desktop-data-openSUSE:de) +###PDFOBS + +%description -n opensuse-tuning_de-pdf +- + +#PDFSUB %prep -#%setup -c -q -%setup -c -q -a 01 -#echo "This PDF package is empty. Find the PDFs in sub-packages." >README-pdf +#%%setup -c -q +%setup -c -q -n %{name}-%{version}/opensuse-html -a 01 +%setup -c -q -T -n %{name}-%{version}/opensuse-startup -a 10 -a 11 +%setup -c -q -T -n %{name}-%{version}/opensuse-reference -a 20 -a 21 +%setup -c -q -T -n %{name}-%{version}/opensuse-security -a 30 -a 31 +%setup -c -q -T -n %{name}-%{version}/opensuse-kvm -a 40 -a 41 +%setup -c -q -T -n %{name}-%{version}/opensuse-tuning -a 50 -a 51 #PREP +%setup -c -q -T -D -n %{name}-%{version} find -name '*.png' -o -name '*.svg' | xargs chmod 644 || : -tar xvf %{S:13} -tar xvf %{S:23} -tar xvf %{S:33} -tar xvf %{S:43} -tar xvf %{S:53} #PDFPREP %build -# 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 +export XEP_LICENSE=/etc/xep/license.xml +export XEP_HOME=/usr/share/xep +export FOP=fop +%define my_all_dir %{_builddir}/%{name}-%{version}/opensuse-html +cd %{my_all_dir} +. ENV-opensuse-html +make validate +make %{?jobs:-j%jobs} html +make %{?jobs:-j%jobs} unpacked-desktop-files +pushd %{my_all_dir} +cp %{_builddir}/%{name}-%{version}/opensuse-startup/ENV-opensuse-startup . +. ENV-opensuse-startup +# # this causes trouble with file names, thus use make package-pdf... +# make validate +# make %%{?jobs:-j%%jobs} color-pdf +# make %%{?jobs:-j%%jobs} unpacked-document-files-pdf +make package-pdf +popd +pushd %{my_all_dir} +cp %{_builddir}/%{name}-%{version}/opensuse-reference/ENV-opensuse-reference . +. ENV-opensuse-reference +# # this causes trouble with file names, thus use make package-pdf... +# make validate +# make %%{?jobs:-j%%jobs} color-pdf +# make %%{?jobs:-j%%jobs} unpacked-document-files-pdf +make package-pdf +popd +pushd %{my_all_dir} +cp %{_builddir}/%{name}-%{version}/opensuse-security/ENV-opensuse-security . +. ENV-opensuse-security +# # this causes trouble with file names, thus use make package-pdf... +# make validate +# make %%{?jobs:-j%%jobs} color-pdf +# make %%{?jobs:-j%%jobs} unpacked-document-files-pdf +make package-pdf +popd +pushd %{my_all_dir} +cp %{_builddir}/%{name}-%{version}/opensuse-kvm/ENV-opensuse-kvm . +. ENV-opensuse-kvm +# # this causes trouble with file names, thus use make package-pdf... +# make validate +# make %%{?jobs:-j%%jobs} color-pdf +# make %%{?jobs:-j%%jobs} unpacked-document-files-pdf +make package-pdf +popd +pushd %{my_all_dir} +cp %{_builddir}/%{name}-%{version}/opensuse-tuning/ENV-opensuse-tuning . +. ENV-opensuse-tuning +# # this causes trouble with file names, thus use make package-pdf... +# make validate +# make %%{?jobs:-j%%jobs} color-pdf +# make %%{?jobs:-j%%jobs} unpacked-document-files-pdf +make package-pdf +popd +#MAKE_DOC %install +cd %{my_all_dir} +for f in */*yelp.tar.bz2; do tar xvf $f; done mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} # is set for sles or sled as /sles or /sled # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} @@ -192,6 +218,8 @@ # if [ -d html/%my_book ]; then mv html/%my_book html/manual +mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +cp -a --dereference html/manual $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} ### handle desktop files pushd desktop # problem writing desktop files on 10.3 @@ -290,13 +318,13 @@ s|^Categories=.*|Categories=System;Core;Translation;Documentation| s|^\(Name.*\)|\1 (PDF)|" $f done + popd fi -popd if [ %{my_lang} = "en" ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/help - for f in yelp/*.document; do + for f in *.document yelp/*.document; do file=$(echo $f | tr [:upper:] [:lower:]) - cp $f $RPM_BUILD_ROOT%{_datadir}/help/${file#*/} + [ -f "$f" ] && cp $f $RPM_BUILD_ROOT%{_datadir}/help/${file#*/} done sed "s/Documentation *\(Documentation\)/\1/" %{name}.document \ > $RPM_BUILD_ROOT%{_datadir}/help/%{name}.document @@ -319,40 +347,11 @@ sed "s/Documentation *\(Documentation\)/\1/" %{name}.document \ > $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document fi -# old stuff -# Link it into the Gnome help system (must be found by calling -# susehelp help://suselinux-manual/ -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 else # PDF only books install -d html/manual echo PDF only > html/manual/%{name} fi -cp %{S:10} . -mkdir opensuse-installquick - -cp %{S:20} . -mkdir opensuse-gnomequick - -cp %{S:30} . -mkdir opensuse-kdequick - -cp %{S:40} . -mkdir opensuse-reference - -cp %{S:50} . -mkdir opensuse-startup - #PDFINST %clean @@ -360,46 +359,41 @@ #PDFXXX -%files -n opensuse-installquick_de-pdf +%files -n opensuse-startup_de-pdf %defattr(-, root, root) -%doc opensuse-installquick_de.pdf -%{_datadir}/help/LOCALE/de/opensuse-installquick_de-pdf.document +%doc */package-pdf-opensuse-startup/opensuse-startup_de.pdf +%{_datadir}/help/LOCALE/de/opensuse-startup_de-pdf.document -%files -n opensuse-gnomequick_de-pdf +%files -n opensuse-reference_de-pdf %defattr(-, root, root) -%doc opensuse-gnomequick_de.pdf -%{_datadir}/help/LOCALE/de/opensuse-gnomequick_de-pdf.document +%doc */package-pdf-opensuse-reference/opensuse-reference_de.pdf +%{_datadir}/help/LOCALE/de/opensuse-reference_de-pdf.document -%files -n opensuse-kdequick_de-pdf +%files -n opensuse-security_de-pdf %defattr(-, root, root) -%doc opensuse-kdequick_de.pdf -%{_datadir}/help/LOCALE/de/opensuse-kdequick_de-pdf.document +%doc */package-pdf-opensuse-security/opensuse-security_de.pdf +%{_datadir}/help/LOCALE/de/opensuse-security_de-pdf.document -%files -n opensuse-reference_de-pdf +%files -n opensuse-kvm_de-pdf %defattr(-, root, root) -%doc opensuse-reference_de.pdf -%{_datadir}/help/LOCALE/de/opensuse-reference_de-pdf.document +%doc */package-pdf-opensuse-kvm/opensuse-kvm_de.pdf +%{_datadir}/help/LOCALE/de/opensuse-kvm_de-pdf.document -%files -n opensuse-startup_de-pdf +%files -n opensuse-tuning_de-pdf %defattr(-, root, root) -%doc opensuse-startup_de.pdf -%{_datadir}/help/LOCALE/de/opensuse-startup_de-pdf.document +%doc */package-pdf-opensuse-tuning/opensuse-tuning_de.pdf +%{_datadir}/help/LOCALE/de/opensuse-tuning_de-pdf.document #PDFFILES %files %defattr(-, root, root) %dir %{_defaultdocdir} -%doc html/manual -#GNOME -- probably obsolete now -%{gnome_dir} -%dir /usr/share/gnome -%dir /usr/share/gnome/help -#recent GNOME +%{_defaultdocdir}/%{name} +#GNOME %dir %{_datadir}/help %dir %{_datadir}/help/LOCALE %dir %{_datadir}/help/LOCALE/de %{_datadir}/help/LOCALE/de/%{name}.document #KDE4 - %changelog ++++++ attributes ++++++ --- /var/tmp/diff_new_pack.t4cw32/_old 2011-02-22 20:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.t4cw32/_new 2011-02-22 20:33:26.000000000 +0100 @@ -6,25 +6,15 @@ format. It can be accessed via the Desktop's help centers. The following manuals are included: -* Installation Quick Start - * Start-Up -* GNOME Quick Start - -* GNOME User Guide (English) - -* KDE Quick Start - -* KDE User Guide (English) - -* Application Guide (English) - * Reference * Security Guide (English) -* AppArmor Quick Start (English) +* Tuning Guide (English) + +* KVM Guide (English) -description.opensuse-manuals_de group.opensuse-gnomequick_de-pdf Documentation/SUSE license.opensuse-gnomequick_de-pdf GFDL v1.2 ++++++ opensuse-html_de-graphics.tar.bz2 ++++++ opensuse-manuals_de/opensuse-html_de-graphics.tar.bz2 opensuse-manuals_de/opensuse-html_de-graphics.tar.bz2 differ: char 11, line 1 ++++++ opensuse-html_de.tar.bz2 ++++++ ++++ 112967 lines of diff (skipped) ++++++ opensuse-reference_de-pdf-yelp.tar.bz2 -> opensuse-reference_de.tar.bz2 ++++++ ++++ 46177 lines of diff (skipped) ++++++ opensuse-startup_de-pdf-yelp.tar.bz2 -> opensuse-startup_de.tar.bz2 ++++++ ++++ 8185 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
