From d9299fbb339aa8c3fb00a76cce6cafb60747884b28f812cf5ae1ccd7e711fd43 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 10 Jan 2011 09:38:22 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gnome-doc-utils revision 38.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-doc-utils?expand=0&rev=43970580550735ee560ba831cdc69aef --- gnome-doc-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-doc-utils.spec b/gnome-doc-utils.spec index 34a7af4..410f288 100644 --- a/gnome-doc-utils.spec +++ b/gnome-doc-utils.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-doc-utils (Version 0.20.3) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 From b49178b4ef8b167a6dcb26ac0ce6901998dcc0bd5867e26f5a62660030e0539f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 13 Feb 2011 20:41:37 +0000 Subject: [PATCH 2/2] Accepting request 60706 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60706 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-doc-utils?expand=0&rev=57 --- gnome-doc-utils.changes | 8 ++++++++ gnome-doc-utils.spec | 25 +++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/gnome-doc-utils.changes b/gnome-doc-utils.changes index 61d5c15..73923ff 100644 --- a/gnome-doc-utils.changes +++ b/gnome-doc-utils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Feb 13 21:10:14 CET 2011 - vuntz@opensuse.org + +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + ------------------------------------------------------------------- Tue Dec 21 10:21:23 CET 2010 - vuntz@opensuse.org diff --git a/gnome-doc-utils.spec b/gnome-doc-utils.spec index 410f288..158c09e 100644 --- a/gnome-doc-utils.spec +++ b/gnome-doc-utils.spec @@ -33,8 +33,8 @@ BuildRequires: libxslt-devel BuildRequires: pkg-config BuildRequires: python BuildRequires: translation-update-upstream -Recommends: %{name}-lang Requires: libxslt +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if %suse_version <= 1110 @@ -104,9 +104,9 @@ make %{?jobs:-j%jobs} pkgconfigdir=%{_datadir}/pkgconfig %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -%find_lang %{name} -%find_lang gnome-doc-make %{name}.lang -%find_lang gnome-doc-xslt %{name}.lang +%find_lang %{name} %{?no_lang_C} +%find_lang gnome-doc-make %{?no_lang_C} %{name}.lang +%find_lang gnome-doc-xslt %{?no_lang_C} %{name}.lang %fdupes %{buildroot} %clean @@ -115,6 +115,17 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ +%dir %{_datadir}/omf/ +%dir %{_datadir}/gnome/help/gnome-doc-make/ +%doc %{_datadir}/gnome/help/gnome-doc-make/C/ +%dir %{_datadir}/omf/gnome-doc-make/ +%doc %{_datadir}/omf/gnome-doc-make/gnome-doc-make-C.omf +%dir %{_datadir}/gnome/help/gnome-doc-xslt/ +%doc %{_datadir}/gnome/help/gnome-doc-xslt/C/ +%dir %{_datadir}/omf/gnome-doc-xslt/ +%doc %{_datadir}/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf %{_bindir}/gnome-doc-tool %dir %{_datadir}/gnome-doc-utils %{_datadir}/gnome-doc-utils/icons @@ -143,11 +154,5 @@ rm -rf %{buildroot} %{_datadir}/pkgconfig/xml2po.pc %files lang -f %{name}.lang -%defattr (-, root, root) -# Own these directories to not depend on gnome-common while building: -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help -# Own this directory to not depend on scrollkeeper -%dir %{_datadir}/omf %changelog