Mailinglist Archive: opensuse-commit (1248 mails)
| < Previous | Next > |
commit opensuse-manuals_en for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 01 Apr 2010 15:32:19 +0200
- Message-id: <20100401133220.1590C2025B@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package opensuse-manuals_en for
openSUSE:Factory
checked in at Thu Apr 1 15:32:19 CEST 2010.
--------
--- opensuse-manuals_en/opensuse-manuals_en.changes 2009-12-10
14:25:54.000000000 +0100
+++
/mounts/work_src_done/STABLE/opensuse-manuals_en/opensuse-manuals_en.changes
2010-04-01 14:30:53.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 1 12:30:29 UTC 2010 - ke@xxxxxxx
+
+- Update text and image files.
+
+-------------------------------------------------------------------
+Wed Mar 31 10:36:56 CEST 2010 - ke@xxxxxxx
+
+- Update using new build script coming with the susedoc package.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_en.spec ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:58.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:58.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package opensuse-manuals_en (Version 11.2)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -23,7 +23,7 @@
%define my_prov_obs suselinux-adminguide_%{my_lang}
suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang}
%define my_book opensuse-html
Version: 11.2
-Release: 4
+Release: 5
Obsoletes: %{my_prov_obs}
Provides: %{my_prov_obs}
Provides: locale(desktop-data-openSUSE:en)
@@ -205,6 +205,16 @@
%description -n opensuse-security_en-pdf
PDF of the openSUSE Security Guide (English).
+%package pdf
+Group: Documentation/SuSE
+License: GFDLv1.2
+Summary: openSUSE Manual (English) as PDF
+Provides: locale(desktop-data-openSUSE:en)
+#PDFOBS
+
+%description pdf
+openSUSE Manual (English) as PDF.
+
%prep
#%setup -c -q
%setup -c -q -a 01
@@ -293,6 +303,7 @@
done
popd
done
+
# Probably useful for stand-alone books
for f in $(find . -name '*.directory'); do
id=%{name}
@@ -304,6 +315,7 @@
if [ $f = ./.directory ]; then
sed -i 's:\(^DocPath.*/\).*:\1index.html:
s/^\(Name\|Comment\)\(.*\)/\1\2 (%{my_lang})/' $f
+
# write yelp / rarian file
sed "
# remove useless comments and search settings
@@ -346,6 +358,7 @@
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
@@ -354,13 +367,30 @@
popd
if [ %{my_lang} = "en" ]; then
mkdir -p $RPM_BUILD_ROOT%{_datadir}/help
- cp yelp/*.document $RPM_BUILD_ROOT%{_datadir}/help
- cp %{name}.document $RPM_BUILD_ROOT%{_datadir}/help/%{name}.document
+ for f in yelp/*.document; do
+ file=$(echo $f | tr [:upper:] [:lower:])
+ 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
- ### FIXME: add PDF yelp files
mkdir -p $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}
- cp %{name}.document \
- $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document
+ 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
# old stuff
# Link it into the Gnome help system (must be found by calling
@@ -387,43 +417,54 @@
cp %{S:10} .
mkdir opensuse-installquick
cp %{S:14} opensuse-installquick/LICENSE.txt
+
cp %{S:20} .
mkdir opensuse-gnomequick
cp %{S:24} opensuse-gnomequick/LICENSE.txt
+
cp %{S:30} .
mkdir opensuse-kdequick
cp %{S:34} opensuse-kdequick/LICENSE.txt
+
cp %{S:40} .
mkdir opensuse-kdeuser
cp %{S:44} opensuse-kdeuser/LICENSE.txt
+
cp %{S:50} .
mkdir opensuse-gnomeuser
cp %{S:54} opensuse-gnomeuser/LICENSE.txt
+
cp %{S:60} .
mkdir opensuse-apps
cp %{S:64} opensuse-apps/LICENSE.txt
+
cp %{S:70} .
mkdir opensuse-reference
cp %{S:74} opensuse-reference/LICENSE.txt
+
cp %{S:80} .
mkdir opensuse-startup
cp %{S:84} opensuse-startup/LICENSE.txt
+
cp %{S:90} .
mkdir opensuse-apparmor-quick
cp %{S:94} opensuse-apparmor-quick/LICENSE.txt
+
cp %{S:100} .
mkdir opensuse-security
cp %{S:104} opensuse-security/LICENSE.txt
+
#PDFINST
%clean
rm -fr ${RPM_BUILD_ROOT}
-# %files pdf
-# %defattr(-, root, root)
-# %dir %{_defaultdocdir}
-# # we ship opensuse-manual_$LL-pdf just because of the provides/obsoletes
-# %doc LICENSE.txt
-# # %doc *.pdf
+
+%files pdf
+%defattr(-, root, root)
+%dir %{_defaultdocdir}
+# we ship opensuse-manual_$LL-pdf just because of the provides/obsoletes
+%doc LICENSE.txt
+# %doc *.pdf
#PDFXXX
%files -n opensuse-installquick_en-pdf
@@ -431,60 +472,111 @@
%doc opensuse-installquick_en.pdf
%doc opensuse-installquick/LICENSE.txt
/usr/share/help/opensuse-installquick_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-installquick_en-pdf.desktop
%files -n opensuse-gnomequick_en-pdf
%defattr(-, root, root)
%doc opensuse-gnomequick_en.pdf
%doc opensuse-gnomequick/LICENSE.txt
/usr/share/help/opensuse-gnomequick_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-gnomequick_en-pdf.desktop
%files -n opensuse-kdequick_en-pdf
%defattr(-, root, root)
%doc opensuse-kdequick_en.pdf
%doc opensuse-kdequick/LICENSE.txt
/usr/share/help/opensuse-kdequick_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-kdequick_en-pdf.desktop
%files -n opensuse-kdeuser_en-pdf
%defattr(-, root, root)
%doc opensuse-kdeuser_en.pdf
%doc opensuse-kdeuser/LICENSE.txt
/usr/share/help/opensuse-kdeuser_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-kdeuser_en-pdf.desktop
%files -n opensuse-gnomeuser_en-pdf
%defattr(-, root, root)
%doc opensuse-gnomeuser_en.pdf
%doc opensuse-gnomeuser/LICENSE.txt
/usr/share/help/opensuse-gnomeuser_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-gnomeuser_en-pdf.desktop
%files -n opensuse-apps_en-pdf
%defattr(-, root, root)
%doc opensuse-apps_en.pdf
%doc opensuse-apps/LICENSE.txt
/usr/share/help/opensuse-apps_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-apps_en-pdf.desktop
%files -n opensuse-reference_en-pdf
%defattr(-, root, root)
%doc opensuse-reference_en.pdf
%doc opensuse-reference/LICENSE.txt
/usr/share/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-startup_en-pdf
%defattr(-, root, root)
%doc opensuse-startup_en.pdf
%doc opensuse-startup/LICENSE.txt
/usr/share/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-apparmor-quick_en-pdf
%defattr(-, root, root)
%doc opensuse-apparmor-quick_en.pdf
%doc opensuse-apparmor-quick/LICENSE.txt
/usr/share/help/opensuse-apparmor-quick_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-apparmor-quick_en-pdf.desktop
%files -n opensuse-security_en-pdf
%defattr(-, root, root)
%doc opensuse-security_en.pdf
%doc opensuse-security/LICENSE.txt
/usr/share/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
+
#PDFFILES
%files
@@ -492,11 +584,20 @@
%dir %{_defaultdocdir}
%doc html/manual
%{my_desktopdir}
+#KDE3 -- probably obsolete now
%dir %{_datadir}/susehelp
%dir %{_datadir}/susehelp/meta
+#GNOME -- probably obsolete now
%{gnome_dir}
%dir /usr/share/gnome
%dir /usr/share/gnome/help
+#recent GNOME
%dir %{_datadir}/help
%{_datadir}/help/%{name}.document
+#KDE4
+%dir %{_datadir}/kde4/apps/khelpcenter/plugins
+%dir %{_datadir}/kde4/apps/khelpcenter
+%dir %{_datadir}/kde4/apps
+%dir %{_datadir}/kde4
+%{_datadir}/kde4/apps/khelpcenter/plugins/%{name}.desktop
%changelog
++++++ LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:58.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:58.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-apparmor-quick-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:58.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:58.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-apparmor-quick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-apparmor-quick_en.pdf ++++++
(binary differes)
++++++ opensuse-apps-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:58.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:58.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-apps_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-apps_en.pdf ++++++
(binary differes)
++++++ opensuse-gnomequick-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:58.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:58.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-gnomequick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-gnomequick_en.pdf ++++++
(binary differes)
++++++ opensuse-gnomeuser-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:58.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:58.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-gnomeuser_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-gnomeuser_en.pdf ++++++
(binary differes)
++++++ opensuse-html_en-desktop.tar.bz2 ++++++
++++ 2010 lines of diff (skipped)
++++++ opensuse-html_en-graphics.tar.bz2 ++++++
opensuse-manuals_en/opensuse-html_en-graphics.tar.bz2
/mounts/work_src_done/STABLE/opensuse-manuals_en/opensuse-html_en-graphics.tar.bz2
differ: char 20187797, line 78238
++++++ opensuse-html_en-html.tar.bz2 ++++++
opensuse-manuals_en/opensuse-html_en-html.tar.bz2
/mounts/work_src_done/STABLE/opensuse-manuals_en/opensuse-html_en-html.tar.bz2
differ: char 11, line 1
++++++ opensuse-html_en.tar.bz2 ++++++
++++ 4467 lines of diff (skipped)
++++++ opensuse-installquick-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:59.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:59.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-installquick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-installquick_en.pdf ++++++
(binary differes)
++++++ opensuse-kdequick-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:59.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:59.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-kdequick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-kdequick_en.pdf ++++++
(binary differes)
++++++ opensuse-kdeuser-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:59.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:59.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-kdeuser_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-kdeuser_en.pdf ++++++
(binary differes)
++++++ opensuse-reference-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:59.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:59.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-reference_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-reference_en.pdf ++++++
(binary differes)
++++++ opensuse-security-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:59.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:59.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-security_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-security_en.pdf ++++++
(binary differes)
++++++ opensuse-startup-LICENSE.txt ++++++
--- /var/tmp/diff_new_pack.rqEf6i/_old 2010-04-01 15:31:59.000000000 +0200
+++ /var/tmp/diff_new_pack.rqEf6i/_new 2010-04-01 15:31:59.000000000 +0200
@@ -1,6 +1,6 @@
- Copyright © 2006-2009
+ Copyright © 2006-2010
Novell, Inc.
++++++ opensuse-startup_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-startup_en.pdf ++++++
(binary differes)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |