From d3c94fe24dbd5dc7e7ce1c477cfa2bbb934c242e1cc86b9fec7ee62bd99fa4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 15 Feb 2017 09:59:47 +0000 Subject: [PATCH 1/4] Accepting request 457089 from home:badshah400:branches:openSUSE:Factory:Rings:2-TestDVD - Make sure to own %{_docdir}/%{name} and lower directories individually by using %doc/%dir wherever appropriate. OBS-URL: https://build.opensuse.org/request/show/457089 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=42 --- dia.changes | 6 ++++++ dia.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dia.changes b/dia.changes index 70efb0a..6e9a89f 100644 --- a/dia.changes +++ b/dia.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 11:14:17 UTC 2017 - badshah400@gmail.com + +- Make sure to own %{_docdir}/%{name} and lower directories + individually by using %doc/%dir wherever appropriate. + ------------------------------------------------------------------- Fri Feb 3 13:51:06 UTC 2017 - badshah400@gmail.com diff --git a/dia.spec b/dia.spec index 2b645f6..9dd1100 100644 --- a/dia.spec +++ b/dia.spec @@ -146,13 +146,18 @@ fi %{_datadir}/applications/*.desktop %{_datadir}/dia %{_datadir}/icons/hicolor/*/apps/dia.* +%dir %{_docdir}/%{name} +%dir %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html/en # EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en -%doc %{_docdir}/%{name}/*/examples/ +%doc %{_docdir}/%{name}/* +%doc %{_docdir}/%{name}/*/examples %doc %{_mandir}/man1/*.* %files lang -f %{name}.lang %defattr(-,root,root) +%dir %{_docdir}/%{name} +%dir %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html/* %doc %{_mandir}/fr/man1/*.* %exclude %{_docdir}/%{name}/html/en From cc4f3978023ccc579d2e99c81fb7de169117024fb0495b3836e29c51b2c98807 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Feb 2017 15:25:43 +0000 Subject: [PATCH 2/4] Accepting request 459478 from home:badshah400:branches:GNOME:Apps - Avoid double inclusion of the contents of the directory %{_docdir}/%{name}, by removing it from the file-list for main package. OBS-URL: https://build.opensuse.org/request/show/459478 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=43 --- dia.changes | 7 +++++++ dia.spec | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dia.changes b/dia.changes index 6e9a89f..c8863b7 100644 --- a/dia.changes +++ b/dia.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 21 10:57:57 UTC 2017 - badshah400@gmail.com + +- Avoid double inclusion of the contents of the directory + %{_docdir}/%{name}, by removing it from the file-list for + main package. + ------------------------------------------------------------------- Fri Feb 10 11:14:17 UTC 2017 - badshah400@gmail.com diff --git a/dia.spec b/dia.spec index 9dd1100..85e5f9d 100644 --- a/dia.spec +++ b/dia.spec @@ -150,7 +150,6 @@ fi %dir %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html/en # EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en -%doc %{_docdir}/%{name}/* %doc %{_docdir}/%{name}/*/examples %doc %{_mandir}/man1/*.* From 86304cc9d4db0c7be82239b31b587a494731369d4ec05413d527dd9b57bf27d9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 25 Feb 2017 13:21:30 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=44 --- dia.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dia.spec b/dia.spec index 85e5f9d..3765766 100644 --- a/dia.spec +++ b/dia.spec @@ -138,7 +138,7 @@ fi %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO samples/ font-test*dia +%doc AUTHORS COPYING ChangeLog KNOWN_BUGS NEWS README TODO %{_bindir}/* %{_libdir}/dia %dir %{_datadir}/appdata @@ -147,6 +147,7 @@ fi %{_datadir}/dia %{_datadir}/icons/hicolor/*/apps/dia.* %dir %{_docdir}/%{name} +%{_docdir}/%{name}/en/ %dir %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html/en # EXAMPLES FOR THE (eu,fr,pl) LANGS ARE ALL SYMLINKED TO en @@ -155,10 +156,14 @@ fi %files lang -f %{name}.lang %defattr(-,root,root) +%exclude %{_docdir}/%{name}/{AUTHORS,COPYING,ChangeLog,KNOWN_BUGS,NEWS,README,TODO} %dir %{_docdir}/%{name} %dir %{_docdir}/%{name}/html +%exclude %{_docdir}/%{name}/en +%doc %{_docdir}/%{name}/* +%exclude %{_docdir}/%{name}/html/en +%exclude %{_docdir}/%{name}/*/examples %doc %{_docdir}/%{name}/html/* %doc %{_mandir}/fr/man1/*.* -%exclude %{_docdir}/%{name}/html/en %changelog From 9ff3993def24d84deaa5c604497abb8acb256b9c96e8b34b63536f2cb5a489fc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 26 Feb 2017 11:46:05 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=45 --- dia.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dia.spec b/dia.spec index 3765766..7fd34bc 100644 --- a/dia.spec +++ b/dia.spec @@ -156,7 +156,13 @@ fi %files lang -f %{name}.lang %defattr(-,root,root) -%exclude %{_docdir}/%{name}/{AUTHORS,COPYING,ChangeLog,KNOWN_BUGS,NEWS,README,TODO} +%exclude %{_docdir}/%{name}/AUTHORS +%exclude %{_docdir}/%{name}/COPYING +%exclude %{_docdir}/%{name}/ChangeLog +%exclude %{_docdir}/%{name}/KNOWN_BUGS +%exclude %{_docdir}/%{name}/NEWS +%exclude %{_docdir}/%{name}/README +%exclude %{_docdir}/%{name}/TODO %dir %{_docdir}/%{name} %dir %{_docdir}/%{name}/html %exclude %{_docdir}/%{name}/en