Hello community, here is the log from the commit of package opensuse-manuals_en for openSUSE:Factory checked in at 2012-05-08 12:28:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_en (Old) and /work/SRC/openSUSE:Factory/.opensuse-manuals_en.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opensuse-manuals_en", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/opensuse-manuals_en/opensuse-manuals_en.changes 2011-09-23 12:20:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opensuse-manuals_en.new/opensuse-manuals_en.changes 2012-05-08 12:28:31.000000000 +0200 @@ -1,0 +2,73 @@ +Fri May 4 11:54:20 UTC 2012 - ke@suse.de + +- Update text and image files. +- Re-add apparmor-admin_en obsoletion info. + +------------------------------------------------------------------- +Mon Apr 30 17:43:52 UTC 2012 - giecrilj@stegny.2a.pl + +- Fix integration with KDE +- Single out PDF as a build switch +- Remove apparmor-admin_en obsoletion info (wrong version) + +------------------------------------------------------------------- +Fri Mar 30 10:56:19 UTC 2012 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Mon Mar 19 13:22:42 UTC 2012 - ke@suse.de + +- attributes: Add apparmor-admin_en obsoletes/provides info. + +------------------------------------------------------------------- +Wed Dec 7 09:30:39 UTC 2011 - coolo@suse.com + +- fix license to spdx format + +------------------------------------------------------------------- +Fri Nov 11 14:29:39 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Nov 11 13:59:12 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Nov 11 13:57:21 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Nov 11 13:22:13 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Nov 11 13:18:27 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Fri Nov 11 13:11:43 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Thu Nov 10 10:05:10 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Wed Sep 28 09:46:47 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- +Wed Sep 28 08:38:47 UTC 2011 - ke@suse.de + +- Update text and image files. + +------------------------------------------------------------------- Old: ---- opensuse-html_en-graphics.tar.bz2 opensuse-kvm_en-graphics.tar.bz2 opensuse-kvm_en.tar.bz2 opensuse-reference_en-graphics.tar.bz2 opensuse-reference_en.tar.bz2 opensuse-security_en-graphics.tar.bz2 opensuse-security_en.tar.bz2 opensuse-startup_en-graphics.tar.bz2 opensuse-startup_en.tar.bz2 opensuse-tuning_en-graphics.tar.bz2 opensuse-tuning_en.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_en.spec ++++++ --- /var/tmp/diff_new_pack.PkZ5IP/_old 2012-05-08 12:28:35.000000000 +0200 +++ /var/tmp/diff_new_pack.PkZ5IP/_new 2012-05-08 12:28:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package opensuse-manuals_en # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -14,47 +14,46 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild - - +%bcond_without PDF Name: opensuse-manuals_en %define my_lang en %define my_book opensuse-html -Version: 11.4 -Release: 9 +Version: 12.1 +Release: 0 #BREQ +Provides: apparmor-admin_en = %{version} Provides: locale(desktop-data-openSUSE:en) #OBS -Source00: opensuse-html_en.tar.bz2 -Source01: opensuse-html_en-graphics.tar.bz2 -Source10: opensuse-startup_en.tar.bz2 -Source11: opensuse-startup_en-graphics.tar.bz2 -Source20: opensuse-reference_en.tar.bz2 -Source21: opensuse-reference_en-graphics.tar.bz2 -Source30: opensuse-security_en.tar.bz2 -Source31: opensuse-security_en-graphics.tar.bz2 -Source40: opensuse-kvm_en.tar.bz2 -Source41: opensuse-kvm_en-graphics.tar.bz2 -Source50: opensuse-tuning_en.tar.bz2 -Source51: opensuse-tuning_en-graphics.tar.bz2 +Source: opensuse-html_en.tar.bz2 +#Source01: opensuse-html_en-graphics.tar.bz2 #SOURCES Source901: doc_pre_checkin.sh Source903: attributes -BuildRequires: susedoc -BuildRequires: fam -BuildRequires: python-xml +BuildRequires: daps +BuildRequires: fdupes +BuildRequires: suse-xsl-stylesheets # Also buildrequire tools that susedoc does not pull in automatically ATM -BuildRequires: poppler-tools python-lxml xerces-j2 +BuildRequires: python-xml +BuildRequires: python-lxml +BuildRequires: poppler-tools +BuildRequires: update-desktop-files +BuildRequires: xerces-j2 +%if 0%{?suse_version} >= 1140 BuildRequires: xmlgraphics-fop +%else +BuildRequires: fop +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Group: Documentation/SUSE -License: GFDLv1.2 Summary: Complete set of openSUSE Manuals (HTML, English) +License: GFDL-1.2 +Group: Documentation/SUSE +Url: http://doc.opensuse.org %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual +Obsoletes: apparmor-admin_en < 12.2 + %description Contains the complete official openSUSE documentation in HTML format. It can be accessed via the Desktop's help centers. @@ -71,9 +70,8 @@ * KVM Guide %package -n opensuse-startup_en-pdf -Group: Documentation/SUSE -License: GFDLv1.2 Summary: openSUSE manual: Start-Up (PDF, English) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:en) ###PDFOBS @@ -85,9 +83,8 @@ mobile computing. Provides help and advice in troubleshooting. %package -n opensuse-reference_en-pdf -Group: Documentation/SUSE -License: GFDLv1.2 Summary: openSUSE manual: Reference (PDF, English) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:en) ###PDFOBS @@ -101,9 +98,8 @@ various network and file services. %package -n opensuse-security_en-pdf -Group: Documentation/SUSE -License: GFDLv1.2 Summary: openSUSE manual: Security Guide (PDF, English) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:en) ###PDFOBS @@ -116,9 +112,8 @@ information about any security-relevant events. %package -n opensuse-kvm_en-pdf -Group: Documentation/SUSE -License: GFDLv1.2 Summary: openSUSE manual: KVM Guide (PDF, English) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:en) ###PDFOBS @@ -126,9 +121,8 @@ This guide introduces basic concepts of virtualization with KVM. %package -n opensuse-tuning_en-pdf -Group: Documentation/SUSE -License: GFDLv1.2 Summary: openSUSE manual: Tuning Guide (PDF, English) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:en) ###PDFOBS @@ -137,277 +131,170 @@ %prep #%%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 +%setup -c -q -n %{name}-%{version}/opensuse-html #PREP %setup -c -q -T -D -n %{name}-%{version} find -name '*.png' -o -name '*.svg' | xargs chmod 644 || : #PDFPREP %build -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 +daps -d DC-opensuse-html html --static +echo "$(daps -d DC-opensuse-html html-dir-name)" > %{name}.filelist +daps -d DC-opensuse-html document-files-html +mkdir yelp desktop +sed " +# remove useless comments and search settings +/^Comment/d +/^X-DOC-Search/d +/^Categories=/d +/^Name *=/i\ +DocPath=file://%{_defaultdocdir}/%{name}/index.html\n\ +# fore KDE(?)\n\ +X-DocPath=file://%{_docdir}/%{name}/index.html\n\ +DocType=text/html\n\ +DocLang=%{my_lang}\n\ +Icon=document2\n\ +Categories=System;Core;Translation;Documentation +s/^X-DOC-Identifier=/DocIdentifier=com.suse./ +s/^X-DOC-Weight/DocWeight/ +" $(daps -d DC-opensuse-html document-files-dir-name | sed /^Hint.*/d)/index.html.document \ + > desktop/%{name}.desktop +sed "s/^[Desktop Entry]/[Document]/" desktop/%{name}.desktop \ + > yelp/%{name}.document +{ echo desktop/%{name}.desktop; echo yelp/%{name}.document; } >> %{name}.filelist + #MAKE_DOC +export XEP_LICENSE=/etc/xep/license.xml +export XEP_HOME=/usr/share/xep +# export FOP=fop +build_pdf () { +%if %{with PDF} + daps --envfile DC-${1} pdf-color + pdfname=$(daps --envfile DC-${1} pdf-color-name | sed /^Hint.*/d) + echo "$pdfname" > ${1}_en-pdf.filelist + daps --envfile DC-${1} document-files-pdf + sed " +# remove useless comments and search settings +/^Categories=/d +/^DocPath=/d +/^Name *=/i\ +Categories=System;Core;Translation;Documentation\n\ +DocPath=file://%{_defaultdocdir}/${1}_en-pdf/${pdfname##*/} +" $(daps --envfile DC-$1 document-files-dir-name | sed /^Hint.*/d)/${1}_en-pdf.document \ + > yelp/${1}_en-pdf.document + echo yelp/${1}_en-pdf.document >> ${1}_en-pdf.filelist +%else +: say build --with PDF +%endif +} +all_pdf_docs=" opensuse-startup opensuse-reference opensuse-security opensuse-kvm opensuse-tuning" +[ -n "$all_pdf_docs" ] && for b in $all_pdf_docs; do build_pdf $b; done %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} -### # product is name without language code %define gnome_dir %{_datadir}/gnome/help/opensuse-manuals install -d $RPM_BUILD_ROOT%{gnome_dir} # -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 -### CHECKIT: still necessary on 11.0? -if [ -d index.desktop ]; then - for f in $(find index.desktop -mindepth 1 -maxdepth 1); do - mv $f . - done - rmdir index.desktop -fi -### CHECKIT: can we fix this for 11.0? Just avoid the subdir... -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 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 - case $d in - *_startup) - [ $f = "./.directory" ] \ - && sed -i "s|^\(X-DOC-Weight\).*|\1=-10000|" $f ;; - esac - done - popd +cp -a --dereference $(head -n 1 %{name}.filelist) \ + $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/kde4/apps/khelpcenter/plugins +mkdir $RPM_BUILD_ROOT/%{_datadir}/help +cp desktop/%{name}.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/kde4/apps/khelpcenter/plugins +## giecrilj proposed instead: +## FIXME I guess we probably need the X-DocPath setting +# cat <<'#EOF' >'%{buildroot}%{_datadir}/kde4/apps/khelpcenter/plugins/%{name}.desktop' +# [Desktop Entry] +# X-DocPath=file://%{_docdir}/%{name}/index.html +# Name=openSUSE Documentation +# #EOF +%suse_update_desktop_file '%{name}' +cp yelp/%{name}.document $RPM_BUILD_ROOT/%{_datadir}/help + +%if %{with PDF} +for f in *-pdf.filelist; do + mkdir $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist} + cp -a --dereference $(head -n 1 $f) \ + $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist} + sed -i 1d $f + echo "%{_defaultdocdir}/${f%\.filelist}" >> $f + cp $(head -n 1 $f) \ + $RPM_BUILD_ROOT/%{_datadir}/help + sed -i 1d $f + echo "%{_datadir}/help/${f%\.filelist}.document" >> $f done -### remove it, only keep yelp and kde4 -- they depend on top-level -### .directory files... -# Probably useful for stand-alone books -for f in $(find . -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 +%endif - # write yelp / rarian file - sed " -# remove useless comments and search settings -/^Comment/d -/^X-DOC-Search/d -s/^\[Desktop Entry\]/[Document]/ -/^Name *=/i\ -DocPath=file://%{_defaultdocdir}/%{name}/manual/index.html\n\ -DocType=text/html\n\ -DocLang=%{my_lang}\n\ -Icon=document2\n\ -Categories=System;Core;Translation;Documentation -s/^X-DOC-Identifier=/DocIdentifier=com.novell./ -s/^X-DOC-Weight/DocWeight/ -" $f > ../%{name}.document -# %{summary} is unreliable -# my_title=$(echo "%{summary}" \ -# | sed 's/\(as \)*[Pp][Dd][Ff]//;s/ *(.*)//') -# #if grep -s -q '^Name *= *$' ../%{name}.document; then -# sed -i " -# s/^\(Name.*\)=\(.*\)/\1=$my_title \2/" ../%{name}.document - # fi - # if Name contains just "Documentation", add product info - # FIXME: check this properly - if ! grep -s -q '^Name *= *openSUSE' ../%{name}.document; then - sed -i " -s/^\(Name.*\)=\(.*\)/\1=openSUSE \2/" ../%{name}.document - fi - fi - # make sure to sort sles-startup guide first - case %name in - sles-startup*) - [ $f = "./.directory" ] \ - && sed -i "s|^\(X-DOC-Weight\).*|\1=-2000|" $f ;; - esac -done -popd -if [ -d yelp ]; then - pushd yelp - for f in *.document; do - dir=${f%.document} - pdf_file=${dir/-pdf/.pdf} - dir=$(echo $dir | tr [:upper:] [:lower:]) - sed -i "s|^\(DocPath=\).*|\1/usr/share/doc/manual/$dir/$pdf_file| -s|^Categories=.*|Categories=System;Core;Translation;Documentation| -s|^\(Name.*\)|\1 (PDF)|" $f - done - popd -fi -if [ %{my_lang} = "en" ]; then - mkdir -p $RPM_BUILD_ROOT%{_datadir}/help - for f in *.document yelp/*.document; do - file=$(echo $f | tr [:upper:] [:lower:]) - [ -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 - # KDE4 - %define kdedir %{_datadir}/kde4/apps/khelpcenter/plugins - mkdir -p $RPM_BUILD_ROOT/%kdedir - pushd $RPM_BUILD_ROOT%{_datadir}/help - for doc in *.document; do - sed "\ -s/\[Document\]/[Desktop Entry]/ -" $doc >$RPM_BUILD_ROOT/%kdedir/${doc%\.document}.desktop - done - popd -else - mkdir -p $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang} - for f in yelp/*.document; do - file=$(echo $f | tr [:upper:] [:lower:]) - cp $f $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/${file#*/} - done - sed "s/Documentation *\(Documentation\)/\1/" %{name}.document \ - > $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document -fi -else -# PDF only books -install -d html/manual -echo PDF only > html/manual/%{name} -fi +%fdupes '%{buildroot}%{_docdir}' + +%if %{with PDF} #PDFINST +%endif + %clean rm -fr ${RPM_BUILD_ROOT} #PDFXXX -%files -n opensuse-startup_en-pdf +%files -n opensuse-startup_en-pdf -f %{my_book}/opensuse-startup_en-pdf.filelist %defattr(-, root, root) -%doc */package-pdf-opensuse-startup/opensuse-startup_en.pdf -%{_datadir}/help/opensuse-startup_en-pdf.document -%dir %{_datadir}/kde4/apps/khelpcenter/plugins -%dir %{_datadir}/kde4/apps/khelpcenter -%dir %{_datadir}/kde4/apps -%dir %{_datadir}/kde4 -%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-startup_en-pdf.desktop +### %%doc build/opensuse-startup/package/pdf/opensuse-startup_en.pdf +### %%{_datadir}/help/opensuse-startup_en-pdf.document +### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins +### %%dir %%{_datadir}/kde4/apps/khelpcenter +### %%dir %%{_datadir}/kde4/apps +### %%dir %%{_datadir}/kde4 +### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-startup_en-pdf.desktop +### -%files -n opensuse-reference_en-pdf +%files -n opensuse-reference_en-pdf -f %{my_book}/opensuse-reference_en-pdf.filelist %defattr(-, root, root) -%doc */package-pdf-opensuse-reference/opensuse-reference_en.pdf -%{_datadir}/help/opensuse-reference_en-pdf.document -%dir %{_datadir}/kde4/apps/khelpcenter/plugins -%dir %{_datadir}/kde4/apps/khelpcenter -%dir %{_datadir}/kde4/apps -%dir %{_datadir}/kde4 -%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-reference_en-pdf.desktop +### %%doc build/opensuse-reference/package/pdf/opensuse-reference_en.pdf +### %%{_datadir}/help/opensuse-reference_en-pdf.document +### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins +### %%dir %%{_datadir}/kde4/apps/khelpcenter +### %%dir %%{_datadir}/kde4/apps +### %%dir %%{_datadir}/kde4 +### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-reference_en-pdf.desktop +### -%files -n opensuse-security_en-pdf +%files -n opensuse-security_en-pdf -f %{my_book}/opensuse-security_en-pdf.filelist %defattr(-, root, root) -%doc */package-pdf-opensuse-security/opensuse-security_en.pdf -%{_datadir}/help/opensuse-security_en-pdf.document -%dir %{_datadir}/kde4/apps/khelpcenter/plugins -%dir %{_datadir}/kde4/apps/khelpcenter -%dir %{_datadir}/kde4/apps -%dir %{_datadir}/kde4 -%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-security_en-pdf.desktop +### %%doc build/opensuse-security/package/pdf/opensuse-security_en.pdf +### %%{_datadir}/help/opensuse-security_en-pdf.document +### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins +### %%dir %%{_datadir}/kde4/apps/khelpcenter +### %%dir %%{_datadir}/kde4/apps +### %%dir %%{_datadir}/kde4 +### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-security_en-pdf.desktop +### -%files -n opensuse-kvm_en-pdf +%files -n opensuse-kvm_en-pdf -f %{my_book}/opensuse-kvm_en-pdf.filelist %defattr(-, root, root) -%doc */package-pdf-opensuse-kvm/opensuse-kvm_en.pdf -%{_datadir}/help/opensuse-kvm_en-pdf.document -%dir %{_datadir}/kde4/apps/khelpcenter/plugins -%dir %{_datadir}/kde4/apps/khelpcenter -%dir %{_datadir}/kde4/apps -%dir %{_datadir}/kde4 -%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-kvm_en-pdf.desktop +### %%doc build/opensuse-kvm/package/pdf/opensuse-kvm_en.pdf +### %%{_datadir}/help/opensuse-kvm_en-pdf.document +### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins +### %%dir %%{_datadir}/kde4/apps/khelpcenter +### %%dir %%{_datadir}/kde4/apps +### %%dir %%{_datadir}/kde4 +### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-kvm_en-pdf.desktop +### -%files -n opensuse-tuning_en-pdf +%files -n opensuse-tuning_en-pdf -f %{my_book}/opensuse-tuning_en-pdf.filelist %defattr(-, root, root) -%doc */package-pdf-opensuse-tuning/opensuse-tuning_en.pdf -%{_datadir}/help/opensuse-tuning_en-pdf.document -%dir %{_datadir}/kde4/apps/khelpcenter/plugins -%dir %{_datadir}/kde4/apps/khelpcenter -%dir %{_datadir}/kde4/apps -%dir %{_datadir}/kde4 -%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-tuning_en-pdf.desktop +### %%doc build/opensuse-tuning/package/pdf/opensuse-tuning_en.pdf +### %%{_datadir}/help/opensuse-tuning_en-pdf.document +### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins +### %%dir %%{_datadir}/kde4/apps/khelpcenter +### %%dir %%{_datadir}/kde4/apps +### %%dir %%{_datadir}/kde4 +### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-tuning_en-pdf.desktop +### #PDFFILES ++++++ attributes ++++++ --- /var/tmp/diff_new_pack.PkZ5IP/_old 2012-05-08 12:28:35.000000000 +0200 +++ /var/tmp/diff_new_pack.PkZ5IP/_new 2012-05-08 12:28:35.000000000 +0200 @@ -1,5 +1,5 @@ group.opensuse-manuals_en Documentation/SUSE -license.opensuse-manuals_en GFDLv1.2 +license.opensuse-manuals_en GFDL-1.2 summary.opensuse-manuals_en Complete set of openSUSE Manuals (HTML, English) +description.opensuse-manuals_en Contains the complete official openSUSE documentation in HTML @@ -16,20 +16,22 @@ * KVM Guide -description.opensuse-manuals_en +obsoletes.opensuse-manuals_en apparmor-admin_en < 12.2 +provides.opensuse-manuals_en apparmor-admin_en = %{version} group.opensuse-gnomequick_en-pdf Documentation/SUSE -license.opensuse-gnomequick_en-pdf GFDLv1.2 +license.opensuse-gnomequick_en-pdf GFDL-1.2 summary.opensuse-gnomequick_en-pdf openSUSE manual: GNOME Quick Start (PDF, English) +description.opensuse-gnomequick_en-pdf A quick start guide to the GNOME desktop. -description.opensuse-gnomequick_en-pdf group.opensuse-kdequick_en-pdf Documentation/SUSE -license.opensuse-kdequick_en-pdf GFDLv1.2 +license.opensuse-kdequick_en-pdf GFDL-1.2 summary.opensuse-kdequick_en-pdf openSUSE manual: KDE Quick Start (PDF, English) +description.opensuse-kdequick_en-pdf A quick start guide to the KDE desktop. -description.opensuse-kdequick_en-pdf group.opensuse-kdeuser_en-pdf Documentation/SUSE -license.opensuse-kdeuser_en-pdf GFDLv1.2 +license.opensuse-kdeuser_en-pdf GFDL-1.2 summary.opensuse-kdeuser_en-pdf openSUSE manual KDE User Guide (PDF, English) +description.opensuse-kdeuser_en-pdf This manual introduces the KDE desktop. It guides you through @@ -38,7 +40,7 @@ efficient use of KDE as their default desktop. -description.opensuse-kdeuser_en-pdf group.opensuse-gnomeuser_en-pdf Documentation/SUSE -license.opensuse-gnomeuser_en-pdf GFDLv1.2 +license.opensuse-gnomeuser_en-pdf GFDL-1.2 summary.opensuse-gnomeuser_en-pdf openSUSE manual: GNOME User Guide (PDF, English) +description.opensuse-gnomeuser_en-pdf This manual introduces the GNOME desktop. It guides you through @@ -47,7 +49,7 @@ of GNOME desktop as their default desktop. -description.opensuse-gnomeuser_en-pdf group.opensuse-apps_en-pdf Documentation/SUSE -license.opensuse-apps_en-pdf GFDLv1.2 +license.opensuse-apps_en-pdf GFDL-1.2 summary.opensuse-apps_en-pdf openSUSE manual: Application Guide (PDF, English) +description.opensuse-apps_en-pdf Learn how to use and configure key desktop applications. This @@ -56,7 +58,7 @@ and multimedia applications. -description.opensuse-apps_en-pdf group.opensuse-reference_en-pdf Documentation/SUSE -license.opensuse-reference_en-pdf GFDLv1.2 +license.opensuse-reference_en-pdf GFDL-1.2 summary.opensuse-reference_en-pdf openSUSE manual: Reference (PDF, English) +description.opensuse-reference_en-pdf This guide gives you a general understanding of your system and @@ -68,7 +70,7 @@ various network and file services. -description.opensuse-reference_en-pdf group.opensuse-startup_en-pdf Documentation/SUSE -license.opensuse-startup_en-pdf GFDLv1.2 +license.opensuse-startup_en-pdf GFDL-1.2 summary.opensuse-startup_en-pdf openSUSE manual: Start-Up (PDF, English) obsoletes.opensuse-startup_en-pdf opensuse-apparmor-quick_en-pdf < 11.4 obsoletes.opensuse-startup_en-pdf opensuse-gnomequick_en-pdf < 11.4 @@ -86,20 +88,20 @@ mobile computing. Provides help and advice in troubleshooting. -description.opensuse-startup_en-pdf group.opensuse-apparmor-quick_en-pdf Documentation/SUSE -license.opensuse-apparmor-quick_en-pdf GFDLv1.2 +license.opensuse-apparmor-quick_en-pdf GFDL-1.2 summary.opensuse-apparmor-quick_en-pdf openSUSE manual: AppArmor Quick Start (PDF, English) +description.opensuse-apparmor-quick_en-pdf A quick start guide to AppArmor, a security software. -description.opensuse-apparmor-quick_en-pdf group.opensuse-manuals_en-pdf Documentation/SUSE -license.opensuse-manuals_en-pdf GFDLv1.2 +license.opensuse-manuals_en-pdf GFDL-1.2 summary.opensuse-manuals_en-pdf ?????????????????? +description.opensuse-manuals_en-pdf ?????????????????????????????????????? -description.opensuse-manuals_en-pdf group.opensuse-security_en Documentation/SUSE -license.opensuse-security_en-pdf GFDLv1.2 +license.opensuse-security_en-pdf GFDL-1.2 summary.opensuse-security_en-pdf openSUSE manual: Security Guide (PDF, English) +description.opensuse-security_en-pdf This guide introduces basic concepts of system security, covering @@ -109,20 +111,22 @@ and execute) or the auditing system that reliably collects information about any security-relevant events. -description.opensuse-security_en-pdf +obsoletes.opensuse-security_en-pdf apparmor-admin_en-pdf < 12.2 +provides.opensuse-security_en-pdf apparmor-admin_en-pdf = %{version} group.opensuse-installquick_en-pdf Documentation/SUSE -license.opensuse-installquick_en-pdf GFDLv1.2 +license.opensuse-installquick_en-pdf GFDL-1.2 summary.opensuse-installquick_en-pdf openSUSE manual: Installation Quick Start (PDF, English) +description.opensuse-installquick_en-pdf A quick start guide providing a walk-through to the default installation. -description.opensuse-installquick_en-pdf group.opensuse-kvm_en Documentation/SUSE -license.opensuse-kvm_en-pdf GFDLv1.2 +license.opensuse-kvm_en-pdf GFDL-1.2 summary.opensuse-kvm_en-pdf openSUSE manual: KVM Guide (PDF, English) +description.opensuse-kvm_en-pdf This guide introduces basic concepts of virtualization with KVM. -description.opensuse-kvm_en-pdf group.opensuse-tuning_en Documentation/SUSE -license.opensuse-tuning_en-pdf GFDLv1.2 +license.opensuse-tuning_en-pdf GFDL-1.2 summary.opensuse-tuning_en-pdf openSUSE manual: Tuning Guide (PDF, English) +description.opensuse-tuning_en-pdf This guide introduces basic concepts of system tuning. ++++++ opensuse-html_en.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/opensuse-manuals_en/opensuse-html_en.tar.bz2 /work/SRC/openSUSE:Factory/.opensuse-manuals_en.new/opensuse-html_en.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org