Hello community,
here is the log from the commit of package opensuse-manuals_de for
openSUSE:Factory checked in at 2012-08-22 12:14:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_de (Old)
and /work/SRC/openSUSE:Factory/.opensuse-manuals_de.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-manuals_de", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/opensuse-manuals_de/opensuse-manuals_de.changes
2012-07-09 09:58:33.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-manuals_de.new/opensuse-manuals_de.changes
2012-08-22 12:15:27.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Aug 20 09:09:11 UTC 2012 - k...@suse.de
+
+- Fix some locale related build issues.
+
+-------------------------------------------------------------------
+Fri Aug 17 09:24:14 UTC 2012 - k...@suse.de
+
+- Update text and image files.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_de.spec ++++++
--- /var/tmp/diff_new_pack.JnvTnP/_old 2012-08-22 12:15:38.000000000 +0200
+++ /var/tmp/diff_new_pack.JnvTnP/_new 2012-08-22 12:15:38.000000000 +0200
@@ -182,17 +182,19 @@
pdfname=$(daps --envfile DC-${1} pdf-color-name | sed /^Hint.*/d)
echo "$pdfname" > ${1}_de-pdf.filelist
daps --envfile DC-${1} document-files-pdf
+### NEW - use %%my_lang!
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##*/}
+DocPath=file://%{_defaultdocdir}/${1}_de-pdf/${pdfname##*/}
" $(daps --envfile DC-$1 document-files-dir-name | sed
/^Hint.*/d)/${1}_de-pdf.document \
> yelp/${1}_de-pdf.document
echo yelp/${1}_de-pdf.document >> ${1}_de-pdf.filelist
- # echo /usr/share/help/${1}_de-pdf.document >> ${1}_de-pdf.filelist
+ # debugging
+ cat ${1}_de-pdf.filelist
%else
: say build --with PDF
%endif
@@ -209,45 +211,32 @@
#
cp -a --dereference $(head -n 1 %{name}.filelist) \
%{buildroot}/%{_defaultdocdir}/%{name}
-sed -i 1d %{name}.filelist
-echo %{buildroot}/%{_defaultdocdir}/%{name} >> %{name}.filelist
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}'
-if [ %my_lang = "en" ]; then
- mkdir %{buildroot}/%{_datadir}/help
+### NEW
+if [ %{my_lang} = en ]; then
cp yelp/%{name}.document %{buildroot}/%{_datadir}/help
else
- mkdir -p %{buildroot}/%{_datadir}/help/LOCALE/%my_lang
- # cp yelp/%{name}.document %{buildroot}/%{_datadir}/help
- cp $(head -n 1 %{name}.filelist) \
- %{buildroot}/%{_datadir}/help/LOCALE/%my_lang/%{name}.document
+ locale_dir=%{buildroot}/%{_datadir}/help/LOCALE/%{my_lang}
+ mkdir -p $locale_dir
+ cp yelp/%{name}.document $locale_dir
fi
-rm -f %{name}.filelist
%if %{with PDF}
for f in *-pdf.filelist; do
mkdir %{buildroot}/%{_defaultdocdir}/${f%\.filelist}
cp -a --dereference $(head -n 1 $f) \
%{buildroot}/%{_defaultdocdir}/${f%\.filelist}
- ls -l %{buildroot}/%{_defaultdocdir}/${f%\.filelist}
sed -i 1d $f
echo "%{_defaultdocdir}/${f%\.filelist}" >> $f
- # echo "%{_defaultdocdir}/${f%\.filelist}/*" >> $f
- if [ %my_lang = "en" ]; then
cp $(head -n 1 $f) \
%{buildroot}/%{_datadir}/help
sed -i 1d $f
echo "%{_datadir}/help/${f%\.filelist}.document" >> $f
- else
- mkdir -p %{buildroot}/%{_datadir}/help/LOCALE/%my_lang
- cp $(head -n 1 $f) \
- %{buildroot}/%{_datadir}/help/LOCALE/%my_lang
- sed -i 1d $f
- echo "%{_datadir}/help/LOCALE/%my_lang/${f%\.filelist}.document" >> $f
- fi
- echo '***********'
+ # debugging
cat $f
done
%endif
@@ -327,6 +316,7 @@
%dir %{_datadir}/help/LOCALE
%dir %{_datadir}/help/LOCALE/de
%{_datadir}/help/LOCALE/de/%{name}.document
+### NEW
#KDE4
%dir %{_datadir}/kde4/apps/khelpcenter/plugins
%dir %{_datadir}/kde4/apps/khelpcenter
++++++ attributes ++++++
--- /var/tmp/diff_new_pack.JnvTnP/_old 2012-08-22 12:15:38.000000000 +0200
+++ /var/tmp/diff_new_pack.JnvTnP/_new 2012-08-22 12:15:38.000000000 +0200
@@ -107,3 +107,15 @@
+description.opensuse-installquick_de-pdf
A quick start guide providing a walk-through to the default installation.
-description.opensuse-installquick_de-pdf
+group.opensuse-kvm_en Documentation/SUSE
+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 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.
+-description.opensuse-tuning_en-pdf
++++++ opensuse-html_de.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/opensuse-manuals_de/opensuse-html_de.tar.bz2
/work/SRC/openSUSE:Factory/.opensuse-manuals_de.new/opensuse-html_de.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
