commit opensuse-manuals_ru for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
12 Aug
2013
12 Aug
'13
12:28
Hello community, here is the log from the commit of package opensuse-manuals_ru for openSUSE:Factory checked in at 2013-08-12 14:28:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_ru (Old) and /work/SRC/openSUSE:Factory/.opensuse-manuals_ru.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opensuse-manuals_ru" Changes: -------- --- /work/SRC/openSUSE:Factory/opensuse-manuals_ru/opensuse-manuals_ru.changes 2013-02-05 15:44:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-manuals_ru.new/opensuse-manuals_ru.changes 2013-08-12 14:28:02.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 12 02:06:15 CEST 2013 - ro@suse.de + +- fix build on factory: newer rpm does not allow to mark + non-directories as dir anymore (like symlinks in this case) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_ru.spec ++++++ --- /var/tmp/diff_new_pack.UPkAxW/_old 2013-08-12 14:28:03.000000000 +0200 +++ /var/tmp/diff_new_pack.UPkAxW/_new 2013-08-12 14:28:03.000000000 +0200 @@ -20,9 +20,10 @@ Name: opensuse-manuals_ru %define my_lang ru %define my_book opensuse-html -Version: 12.2 +Version: 13.1 Release: 0 #BREQ +Provides: apparmor-admin_ru = %{version} Provides: locale(desktop-data-openSUSE:ru) #OBS Source: opensuse-html_ru_src_set.tar.bz2 @@ -31,18 +32,18 @@ Source903: attributes BuildRequires: daps BuildRequires: fdupes -BuildRequires: suse-xsl-stylesheets +BuildRequires: suse-xsl-stylesheets >= 1.9.18 # Also buildrequire tools that susedoc does not pull in automatically ATM -BuildRequires: poppler-tools -BuildRequires: python-lxml -BuildRequires: python-xml +# BuildRequires: python-xml +# BuildRequires: python-lxml +# BuildRequires: poppler-tools BuildRequires: update-desktop-files -BuildRequires: xerces-j2 -%if 0%{?suse_version} >= 1140 -BuildRequires: xmlgraphics-fop -%else -BuildRequires: fop -%endif +# BuildRequires: xerces-j2 +# %%if 0%%{?suse_version} >= 1140 +# BuildRequires: xmlgraphics-fop +# %%else +# BuildRequires: fop +# %%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Summary: Complete set of openSUSE Manuals (HTML, Russian) @@ -52,6 +53,8 @@ %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual +Obsoletes: apparmor-admin_ru < 12.2 + %description Contains the complete official openSUSE documentation in HTML format. It can be accessed via the Desktop's help centers. @@ -138,13 +141,13 @@ %build %define my_all_dir %{_builddir}/%{name}-%{version}/opensuse-html cd %{my_all_dir} -daps -v -d DC-opensuse-html html --static -echo "$(daps -d DC-opensuse-html html-dir-name)" > %{name}.filelist # e.g., /usr/share/help/C/gnome-help/opensuse-manuals.page # Produce .document files for HTML -daps -d DC-opensuse-html package-html --documentfiles --pagefiles -ls -l build/%my_book/package -document_files_dir=build/%my_book/package +package_dir=$(daps -d DC-opensuse-html package-html --documentfiles --pagefiles) +tar xvf $package_dir/opensuse-html_%{my_lang}-html.tar.bz2 +echo opensuse-html > %{name}.filelist +# ls -l build/%my_book/package +document_files_dir=$package_dir # copy .page file cp $document_files_dir/*.page %name.page sed -i " @@ -169,6 +172,7 @@ s/^X-DOC-Identifier=/DocIdentifier=com.suse./ s/^X-DOC-Weight/DocWeight/ " $document_files_dir/index.html.document > desktop/%{name}.desktop +# FIXME: check whether it is still needed (move to daps?) sed "s/^[Desktop Entry]/[Document]/" desktop/%{name}.desktop \ > yelp/%{name}.document { echo desktop/%{name}.desktop; echo yelp/%{name}.document; } >> %{name}.filelist @@ -249,7 +253,7 @@ { echo "%dir $yelp_document_dir" echo "%dir $yelp_link_dir" - echo "%dir $yelp_link_dir/%my_book" + echo "$yelp_link_dir/%my_book" echo "%dir $gnome_help_dir" } > %name.filelist else @@ -260,7 +264,7 @@ echo "%dir %{_datadir}/help/LOCALE" echo "%dir %{_datadir}/help/LOCALE/%{my_lang}" echo "%dir $yelp_document_dir" - echo "%dir $yelp_link_dir/%my_book" + echo "$yelp_link_dir/%my_book" echo "%dir $gnome_help_dir" } > %name.filelist fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
3969
Age (days ago)
3969
Last active (days ago)
0 comments
1 participants
participants (1)
-
root@hilbert.suse.de