Mailinglist Archive: opensuse-commit (771 mails)
| < Previous | Next > |
commit opensuse-manual_de
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 03 Jun 2008 01:01:49 +0200
- Message-id: <20080602230149.62B866780DE@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package opensuse-manual_de
checked in at Tue Jun 3 01:01:49 CEST 2008.
--------
--- opensuse-manual_de/opensuse-manual_de.changes 2008-01-13
20:45:06.000000000 +0100
+++ /mounts/work_src_done/NOARCH/opensuse-manual_de/opensuse-manual_de.changes
2008-06-02 14:53:57.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jun 2 14:52:47 CEST 2008 - ke@xxxxxxx
+
+- Update Start-Up Guide. In HTML, reuse English files for the
+ untranslated parts.
+- Drop the untranslated PDFs for the moment.
+
+-------------------------------------------------------------------
Old:
----
APPARMOR-admin_de-graphics.tar.bz2
APPARMOR-admin_de.pdf
APPARMOR-admin_de.tar.bz2
opensuse-gnomequick_de-graphics.tar.bz2
opensuse-gnomequick_de.pdf
opensuse-gnomequick_de.tar.bz2
opensuse-kdequick_de-graphics.tar.bz2
opensuse-kdequick_de.pdf
opensuse-kdequick_de.tar.bz2
opensuse-kdeuser_de-graphics.tar.bz2
opensuse-kdeuser_de.pdf
opensuse-kdeuser_de.tar.bz2
opensuse-reference_de-graphics.tar.bz2
opensuse-reference_de.pdf
opensuse-reference_de.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manual_de.spec ++++++
--- /var/tmp/diff_new_pack.Is8790/_old 2008-06-03 01:01:29.000000000 +0200
+++ /var/tmp/diff_new_pack.Is8790/_new 2008-06-03 01:01:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package opensuse-manual_de (Version 10.3)
+# spec file for package opensuse-manual_de (Version 11.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,44 +10,30 @@
# norootforbuild
+
Name: opensuse-manual_de
%define my_lang de
%define my_prov_obs suselinux-adminguide_%{my_lang}
suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang}
%define my_book opensuse-html
-Version: 10.3
-Release: 33
+Version: 11.0
+Release: 1
Obsoletes: %{my_prov_obs}
Provides: %{my_prov_obs}
Provides: locale(desktop-data-openSUSE:de)
-Obsoletes: suselinux-manual_de opensuse-quickstart_de
-Provides: suselinux-manual_de opensuse-quickstart_de
+Obsoletes: suselinux-manual_de opensuse-quickstart_de
opensuse-gnomeuser_de
+Provides: suselinux-manual_de opensuse-quickstart_de
opensuse-gnomeuser_de
#OBS
Source00: opensuse-html_de-html.tar.bz2
Source01: opensuse-html_de-desktop.tar.bz2
-Source10: opensuse-gnomequick_de.pdf
-Source11: opensuse-gnomequick_de-graphics.tar.bz2
-Source12: opensuse-gnomequick_de.tar.bz2
+Source10: opensuse-startup_de.pdf
+Source11: opensuse-startup_de-graphics.tar.bz2
+Source12: opensuse-startup_de.tar.bz2
Source13: LICENSE.txt
-Source20: opensuse-kdequick_de.pdf
-Source21: opensuse-kdequick_de-graphics.tar.bz2
-Source22: opensuse-kdequick_de.tar.bz2
-Source30: opensuse-kdeuser_de.pdf
-Source31: opensuse-kdeuser_de-graphics.tar.bz2
-Source32: opensuse-kdeuser_de.tar.bz2
-Source40: opensuse-reference_de.pdf
-Source41: opensuse-reference_de-graphics.tar.bz2
-Source42: opensuse-reference_de.tar.bz2
-Source50: opensuse-startup_de.pdf
-Source51: opensuse-startup_de-graphics.tar.bz2
-Source52: opensuse-startup_de.tar.bz2
-Source60: APPARMOR-admin_de.pdf
-Source61: APPARMOR-admin_de-graphics.tar.bz2
-Source62: APPARMOR-admin_de.tar.bz2
#SOURCES
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: update-desktop-files
-Group: Documentation/SuSE
+Group: Documentation/SUSE
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
Summary: openSUSE Manual (German)
%define _defaultdocdir %{_datadir}/doc/manual
@@ -62,12 +48,12 @@
%package pdf
-Group: Documentation/SuSE
+Group: Documentation/SUSE
License: GNU Free Documentation License, Version 1.2 (GFDL 1.2)
Summary: openSUSE Manual (German) as PDF
#Provides: locale(desktop-data-openSUSE:de)
-Obsoletes: suselinux-manual_de-pdf opensuse-quickstart_de-pdf
-Provides: suselinux-manual_de-pdf opensuse-quickstart_de-pdf
+Obsoletes: suselinux-manual_de-pdf opensuse-quickstart_de-pdf
opensuse-gnomeuser_de-pdf
+Provides: suselinux-manual_de-pdf opensuse-quickstart_de-pdf
opensuse-gnomeuser_de-pdf
#PDFOBS
%description pdf
@@ -81,16 +67,9 @@
#PREP
find -name '*.png' -o -name '*.svg' | xargs chmod 644
cp %{S:10} .
-cp %{S:20} .
-cp %{S:30} .
-cp %{S:40} .
-cp %{S:50} .
-cp %{S:60} .
#PDFPREP
%build
-find . -name CVS -o -name '.xvpics' -o -name '.cvsignore' \
- | xargs rm -fr
# make sure index.html exists
for f in $(find html -type f -name 'book.*'); do
pushd ${f%/*}
@@ -99,7 +78,6 @@
done
%install
-[ -d $RPM_BUILD_ROOT ] && rm -fvr $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}
# is set for sles or sled as /sles or /sled
%define my_desktopdir /usr/share/susehelp/meta
@@ -108,23 +86,21 @@
###
install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name}
# product is name without language code
-%if %suse_version < 1030
-%define gnome_dir /opt/gnome/share/gnome/help/opensuse-manual
-%else
%define gnome_dir %{_datadir}/gnome/help/opensuse-manual
-%endif
install -d $RPM_BUILD_ROOT%{gnome_dir}
#
if [ -d html/%my_book ]; then
mv html/%my_book html/manual
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_*')
@@ -174,27 +150,19 @@
sed -i 's:\(^DocPath.*/\).*:\1index.html:
s/^\(Name\|Comment\)\(.*\)/\1\2 (%{my_lang})/' $f
fi
+ # make sure to sort startup guide first
+ case %name in
+ sles-startup*)
+ [ $f = "./.directory" ] \
+ && sed -i "s|^\(X-DOC-Weight\).*|\1=-2000|" $f ;;
+ esac
done
-# # remove the dots from the file names
-# for f in $(find . -type f -name '*desktop'); do
-# d=${f%/*}
-# n=${f##*/}; n=${n/\.desktop}; n=${n//\./_}; n=${n}.desktop
-# [ $f = $d/$n ] || mv -v $f $d/$n
-# done
-# ren_dir () {
-# for d in $(find . -maxdepth $1 -mindepth $1 -type d); do
-# n=${d#*/}; n=${n//\./_}
-# [ $d = $n ] || mv -v $d $n
-# done
-# }
-# ren_dir 1
-# ren_dir 2
-# #
cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name}
+cp %{S:100} $RPM_BUILD_ROOT%{my_desktopdir}/.directory || :
popd
# Link it into the Gnome help system (must be found by calling
# susehelp help://suselinux-manual/
-pushd $RPM_BUILD_ROOT/%{gnome_dir}
+pushd $RPM_BUILD_ROOT%{gnome_dir}
if [ %{my_lang} = "en" ]; then
target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual
install -d $target
@@ -212,6 +180,9 @@
fi
%suse_update_desktop_file $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory
+%clean
+rm -fr ${RPM_BUILD_ROOT}
+
%files pdf
%defattr(-, root, root)
%dir %{_defaultdocdir}
@@ -223,51 +194,47 @@
%{my_desktopdir}
%dir %{_datadir}/susehelp
%{gnome_dir}
-%if %suse_version > 1020
%dir /usr/share/gnome
%dir /usr/share/gnome/help
-%else
-%dir /opt/gnome
-%dir /opt/gnome/share
-%dir /opt/gnome/share/gnome
-%dir /opt/gnome/share/gnome/help
-%endif
-
%changelog
-* Sun Jan 13 2008 - coolo@xxxxxxx
+* Mon Jun 02 2008 ke@xxxxxxx
+- Update Start-Up Guide. In HTML, reuse English files for the
+ untranslated parts.
+- Drop the untranslated PDFs for the moment.
+* Sun Jan 13 2008 coolo@xxxxxxx
- rename desktop-data-SuSE to -openSUSE
-* Wed Nov 07 2007 - ke@xxxxxxx
+* Wed Nov 07 2007 ke@xxxxxxx
- Correct X-DOC-Weight using better style-sheet support.
- Fixing support information; see bug [#339034].
-* Fri Sep 21 2007 - ke@xxxxxxx
+* Fri Sep 21 2007 ke@xxxxxxx
- Assign X-DOC-Weight manually (-3000) to make it show up right after
the release-notes.
-* Thu Sep 20 2007 - ke@xxxxxxx
+* Thu Sep 20 2007 ke@xxxxxxx
- Work around for sorting Quick* book chapters (KDE, GNOME, AppArmor);
[#] 326392.
-* Wed Sep 19 2007 - ke@xxxxxxx
+* Wed Sep 19 2007 ke@xxxxxxx
- Remove more X-DOC settings; reported by Stephan Binner [# 325691].
- Make X-DOC-Weight values positive; [# 326392].
-* Mon Sep 17 2007 - ke@xxxxxxx
+* Mon Sep 17 2007 ke@xxxxxxx
- Remove X-DOC-Identifier from *.desktop files; reported by Stephan
Binner [# 325691].
-* Fri Sep 14 2007 - ke@xxxxxxx
+* Fri Sep 14 2007 ke@xxxxxxx
- Update text and image files.
-* Thu Sep 06 2007 - coolo@xxxxxxx
+* Thu Sep 06 2007 coolo@xxxxxxx
- As discussed with Tanja and Jana: pdfs should not be installed by
default
-* Thu Aug 16 2007 - ke@xxxxxxx
+* Thu Aug 16 2007 ke@xxxxxxx
- Build preliminary package using the old translation files.
- Obsolete opensuse-quickstart_de, reported by Stephan Kulow; # 300538.
-* Wed Aug 15 2007 - coolo@xxxxxxx
+* Wed Aug 15 2007 coolo@xxxxxxx
- trigger installation on german desktop installations (#296873)
-* Mon Jun 04 2007 - dmueller@xxxxxxx
+* Mon Jun 04 2007 dmueller@xxxxxxx
- documentation shouldn't be executable
-* Wed Jan 31 2007 - ro@xxxxxxx
+* Wed Jan 31 2007 ro@xxxxxxx
- GNOME moved to /usr
-* Mon Nov 27 2006 - ke@xxxxxxx
+* Mon Nov 27 2006 ke@xxxxxxx
- Adjustments by Tanja Roth and Berthold Gunreben (XML and images).
-* Fri Nov 24 2006 - ke@xxxxxxx
+* Fri Nov 24 2006 ke@xxxxxxx
- 10.2 test package, translated Reference Guide included.
-* Sun Nov 19 2006 - ke@xxxxxxx
+* Sun Nov 19 2006 ke@xxxxxxx
- 10.2 test package. Stuart-Up Guide is translated.
++++++ LICENSE.txt ++++++
--- opensuse-manual_de/LICENSE.txt 2007-11-07 15:03:29.000000000 +0100
+++ /mounts/work_src_done/NOARCH/opensuse-manual_de/LICENSE.txt 2008-06-02
14:52:09.000000000 +0200
@@ -5,7 +5,7 @@
Es wird die Genehmigung erteilt, dieses Dokument unter den Bedingungen der
GNU Free Documentation License, Version 1.2 oder einer späteren Version,
veröffentlicht durch die Free Software Foundation, zu vervielfältigen, zu
verbreiten und/oder zu verändern; dies gilt ausschließlich der unveränderlichen
Abschnitte, der Texte auf dem vorderen Deckblatt und der Texte auf dem hinteren
Deckblatt. Eine Kopie dieser Lizenz finden Sie im Abschnitt GNU Free
Documentation License.
- SUSE®, openSUSE®, das openSUSE®-Logo, Novell®, das Novell®-Logo, das N®-Logo
sind eingetragene Marken von Novell, Inc. in den USA und anderen Ländern.
Linux* ist eine eingetragene Marke von Linus Torvalds. Alle anderen
Drittanbieter-Marken sind das Eigentum der jeweiligen Inhaber. Ein Markensymbol
(®, ™, usw.) kennzeichnet eine Marke von Novell; ein Stern (*) kennzeichnet
eine Drittanbieter-Marke.
+ SUSE®, openSUSE®, das openSUSE®-Logo, Novell®, das Novell®-Logo, das N®-Logo
sind eingetragene Marken von Novell, Inc. in den USA und anderen Ländern.
Linux* ist eine eingetragene Marke von Linus Torvalds. Alle anderen
Drittanbieter-Marken sind das Eigentum der jeweiligen Inhaber. Ein Markensymbol
(® , ™, usw.) kennzeichnet eine Marke von Novell; ein Stern (*) kennzeichnet
eine Drittanbieter-Marke.
Alle Informationen in diesem Buch wurden mit größter Sorgfalt
zusammengestellt. Doch auch dadurch kann hundertprozentige Richtigkeit nicht
gewährleistet werden. Weder Novell, Inc., noch die SUSE LINUX GmbH noch die
Autoren noch die Übersetzer können für mögliche Fehler und deren Folgen haftbar
gemacht werden.
++++++ opensuse-html_de-desktop.tar.bz2 ++++++
++++ 2769 lines of diff (skipped)
++++++ opensuse-html_de-html.tar.bz2 ++++++
opensuse-manual_de/opensuse-html_de-html.tar.bz2
/mounts/work_src_done/NOARCH/opensuse-manual_de/opensuse-html_de-html.tar.bz2
differ: byte 11, line 1
++++++ opensuse-startup_de-graphics.tar.bz2 ++++++
++++ 7493 lines of diff (skipped)
++++++ opensuse-startup_de.pdf ++++++
(binary differes)
++++++ opensuse-startup_de.tar.bz2 ++++++
++++ 19872 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |