Accepting request 60897 from GNOME:Factory

Accepted submit request 60897 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/60897
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-doc-utils?expand=0&rev=39
This commit is contained in:
Ruediger Oertel 2011-02-14 00:02:55 +00:00 committed by Git OBS Bridge
commit 77c4bc4c10
2 changed files with 23 additions and 10 deletions

View File

@ -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

View File

@ -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