Hello community,
here is the log from the commit of package opensuse-manuals_en for
openSUSE:Factory checked in at 2012-08-31 09:54:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2012-06-29 14:05:14.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-manuals_en.new/opensuse-manuals_en.changes
2012-08-31 09:54:34.000000000 +0200
@@ -1,0 +2,27 @@
+Wed Aug 22 13:34:06 UTC 2012 - [email protected]
+
+- Update text and image files; final(?) update for 12.2.
+
+-------------------------------------------------------------------
+Tue Aug 21 12:03:05 UTC 2012 - [email protected]
+
+- Update text and image files.
+
+-------------------------------------------------------------------
+Tue Aug 21 08:53:54 UTC 2012 - [email protected]
+
+- Prepare mallard files (.page) for gnome-help.
+- Update text and image files.
+
+-------------------------------------------------------------------
+Wed Aug 15 11:36:52 UTC 2012 - [email protected]
+
+- Update text and image files.
+- New chapters about grub2 and systemd.
+
+-------------------------------------------------------------------
+Tue Aug 7 14:16:44 UTC 2012 - [email protected]
+
+- Update text and image files.
+
+-------------------------------------------------------------------
New:
----
docbook.xsl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_en.spec ++++++
--- /var/tmp/diff_new_pack.ZqWRpH/_old 2012-08-31 09:54:36.000000000 +0200
+++ /var/tmp/diff_new_pack.ZqWRpH/_new 2012-08-31 09:54:36.000000000 +0200
@@ -18,7 +18,7 @@
Name: opensuse-manuals_en
%define my_lang en
%define my_book opensuse-html
-Version: 12.1
+Version: 12.2
Release: 0
#BREQ
Provides: apparmor-admin_en = %{version}
@@ -29,6 +29,7 @@
#SOURCES
Source901: doc_pre_checkin.sh
Source903: attributes
+Source999: docbook.xsl
BuildRequires: daps
BuildRequires: fdupes
BuildRequires: suse-xsl-stylesheets
@@ -142,6 +143,12 @@
cd %{my_all_dir}
daps -d DC-opensuse-html html --static
echo "$(daps -d DC-opensuse-html html-dir-name)" > %{name}.filelist
+# guess directory with profiled sources
+profiled_dir=$(ls -d build/.profiled/*)
+. DC-opensuse-html
+xsltproc -xinclude --stringparam packagename opensuse-html %{S:999} \
+ $profiled_dir/$MAIN > %{name}.page
+# /usr/share/help/C/gnome-help/opensuse-manuals.page
# Produce .document files for HTML
daps -d DC-opensuse-html document-files-html
document_files_dir=$(daps -d DC-opensuse-html document-files-dir-name | sed
/^Hint.*/d)
@@ -210,11 +217,34 @@
cp -a --dereference $(head -n 1 %{name}.filelist) \
%{buildroot}/%{_defaultdocdir}/%{name}
mkdir -p %{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins
-mkdir %{buildroot}/%{_datadir}/help
cp desktop/%{name}.desktop \
%{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins
%suse_update_desktop_file '%{name}'
-cp yelp/%{name}.document %{buildroot}/%{_datadir}/help
+if [ %{my_lang} = en ]; then
+ yelp_document_dir=%{_datadir}/help
+ gnome_help_dir=%{_datadir}/help/C/gnome-help
+ {
+ echo "%dir $yelp_document_dir"
+ echo "%dir $gnome_help_dir"
+ } > %name.filelist
+else
+ yelp_document_dir=%{_datadir}/help/LOCALE/%{my_lang}
+ gnome_help_dir=%{_datadir}/help/LOCALE/%{my_lang}/gnome-help
+ {
+ echo "%dir %{_datadir}/help/LOCALE"
+ echo "%dir %{_datadir}/help/LOCALE/%{my_lang}"
+ echo "%dir $yelp_document_dir"
+ echo "%dir $gnome_help_dir"
+ } > %name.filelist
+fi
+mkdir -p %{buildroot}$yelp_document_dir
+cp yelp/%{name}.document %{buildroot}$yelp_document_dir
+mkdir -p %{buildroot}$gnome_help_dir
+cp %name.page %{buildroot}$gnome_help_dir/%name.page
+{
+ echo "$yelp_document_dir/%{name}.document"
+ echo "$gnome_help_dir/%name.page"
+} >> %name.filelist
%if %{with PDF}
for f in *-pdf.filelist; do
@@ -241,68 +271,26 @@
%files -n opensuse-startup_en-pdf -f
%{my_book}/opensuse-startup_en-pdf.filelist
%defattr(-, root, root)
-### %%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 -f
%{my_book}/opensuse-reference_en-pdf.filelist
%defattr(-, root, root)
-### %%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 -f
%{my_book}/opensuse-security_en-pdf.filelist
%defattr(-, root, root)
-### %%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 -f %{my_book}/opensuse-kvm_en-pdf.filelist
%defattr(-, root, root)
-### %%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 -f %{my_book}/opensuse-tuning_en-pdf.filelist
%defattr(-, root, root)
-### %%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
-%files
+%files -f %{my_book}/%{name}.filelist
%defattr(-, root, root)
%dir %{_defaultdocdir}
%{_defaultdocdir}/%{name}
#GNOME
-%dir %{_datadir}/help
-%{_datadir}/help/%{name}.document
#KDE4
%dir %{_datadir}/kde4/apps/khelpcenter/plugins
%dir %{_datadir}/kde4/apps/khelpcenter
++++++ 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: [email protected]
For additional commands, e-mail: [email protected]
