Hello community,
here is the log from the commit of package opensuse-manuals_en for
openSUSE:Factory checked in at 2012-05-16 21:08:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-08 12:28:31.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-manuals_en.new/opensuse-manuals_en.changes
2012-05-16 21:08:53.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 15 10:36:49 UTC 2012 - k...@suse.de
+
+- Update text and image files.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_en.spec ++++++
--- /var/tmp/diff_new_pack.DjrKeN/_old 2012-05-16 21:08:55.000000000 +0200
+++ /var/tmp/diff_new_pack.DjrKeN/_new 2012-05-16 21:08:55.000000000 +0200
@@ -142,16 +142,23 @@
cd %{my_all_dir}
daps -d DC-opensuse-html html --static
echo "$(daps -d DC-opensuse-html html-dir-name)" > %{name}.filelist
+# 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)
+sed -i "
+s|@PATH@|file://%{_docdir}/%{name}|
+s|^\(Name.*=.*\)|\1 (%{my_lang})|
+" $document_files_dir/index.html.document
mkdir yelp desktop
sed "
# remove useless comments and search settings
/^Comment/d
/^X-DOC-Search/d
/^Categories=/d
+/^DocPath=/d
/^Name *=/i\
DocPath=file://%{_defaultdocdir}/%{name}/index.html\n\
-# fore KDE(?)\n\
+# for KDE:\n\
X-DocPath=file://%{_docdir}/%{name}/index.html\n\
DocType=text/html\n\
DocLang=%{my_lang}\n\
@@ -194,36 +201,29 @@
%install
cd %{my_all_dir}
-mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}
+mkdir -p %{buildroot}%{_defaultdocdir}
# product is name without language code
%define gnome_dir %{_datadir}/gnome/help/opensuse-manuals
-install -d $RPM_BUILD_ROOT%{gnome_dir}
+install -d %{buildroot}%{gnome_dir}
#
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
+ %{buildroot}/%{_defaultdocdir}/%{name}
+mkdir -p %{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins
+mkdir %{buildroot}/%{_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
+ %{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins
%suse_update_desktop_file '%{name}'
-cp yelp/%{name}.document $RPM_BUILD_ROOT/%{_datadir}/help
+cp yelp/%{name}.document %{buildroot}/%{_datadir}/help
%if %{with PDF}
for f in *-pdf.filelist; do
- mkdir $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist}
+ mkdir %{buildroot}/%{_defaultdocdir}/${f%\.filelist}
cp -a --dereference $(head -n 1 $f) \
- $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist}
+ %{buildroot}/%{_defaultdocdir}/${f%\.filelist}
sed -i 1d $f
echo "%{_defaultdocdir}/${f%\.filelist}" >> $f
cp $(head -n 1 $f) \
- $RPM_BUILD_ROOT/%{_datadir}/help
+ %{buildroot}/%{_datadir}/help
sed -i 1d $f
echo "%{_datadir}/help/${f%\.filelist}.document" >> $f
done
@@ -236,9 +236,6 @@
%endif
-%clean
-rm -fr ${RPM_BUILD_ROOT}
-
#PDFXXX
%files -n opensuse-startup_en-pdf -f
%{my_book}/opensuse-startup_en-pdf.filelist
++++++ 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+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
