From d18e005df135f13157cda99f50a38fd9b84a64843c084007306dc85100180c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 4 Feb 2017 12:52:28 +0000 Subject: [PATCH] Accepting request 454436 from home:badshah400:branches:openSUSE:Factory:Rings:2-TestDVD - Fix building with rpm >= 4.13 by explicitly listing %{_docdir} files installed by make. Package the non-C lang documentation in the %{name}-lang package. The examples for all non-C locales are simply symlinks to the C locale example, so these need to be installed as part of the main package itself. - Move man for fr locale into lang package (instead of main package). OBS-URL: https://build.opensuse.org/request/show/454436 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=40 --- dia.changes | 11 +++++++++++ dia.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dia.changes b/dia.changes index 0abfad6..70efb0a 100644 --- a/dia.changes +++ b/dia.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Feb 3 13:51:06 UTC 2017 - badshah400@gmail.com + +- Fix building with rpm >= 4.13 by explicitly listing %{_docdir} + files installed by make. Package the non-C lang documentation + in the %{name}-lang package. The examples for all non-C locales + are simply symlinks to the C locale example, so these need to + be installed as part of the main package itself. +- Move man for fr locale into lang package (instead of main + package). + ------------------------------------------------------------------- Sat Jan 21 01:14:12 UTC 2017 - zaitor@opensuse.org diff --git a/dia.spec b/dia.spec index eccff93..2b645f6 100644 --- a/dia.spec +++ b/dia.spec @@ -146,10 +146,15 @@ fi %{_datadir}/applications/*.desktop %{_datadir}/dia %{_datadir}/icons/hicolor/*/apps/dia.* +%doc %{_docdir}/%{name}/html/en +# EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en +%doc %{_docdir}/%{name}/*/examples/ %doc %{_mandir}/man1/*.* -%doc %{_mandir}/fr/man1/*.* %files lang -f %{name}.lang %defattr(-,root,root) +%doc %{_docdir}/%{name}/html/* +%doc %{_mandir}/fr/man1/*.* +%exclude %{_docdir}/%{name}/html/en %changelog