Attachment 836848 Details for Bug 1001277 – proposed spec changes/fixes

[patch] proposed spec changes/fixes

crrcsim.spec.diff (text/plain), 2.73 KB, created by Michael Schwendt on 2013-12-14 21:44:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Schwendt

Created: 2013-12-14 21:44:54 UTC

Size: 2.73 KB

patch

obsolete

>diff --git a/crrcsim.spec b/crrcsim.spec
>index c0bc733..b8cbb6f 100644
>--- a/crrcsim.spec
>+++ b/crrcsim.spec
>@@ -1,6 +1,6 @@
> Name:          crrcsim
> Version:       0.9.12
>-Release:       7%{?dist}
>+Release:       8%{?dist}
> Group:         Amusements/Games
> Summary:       Model-Airplane Flight Simulation Program
> License:       GPLv2
>@@ -47,7 +47,6 @@ such as joystick, mouse, keyboard.
> %package doc
> Group:         Documentation
> Summary:       Documentation for %{name}
>-Requires:      %{name} = %{version}-%{release}
> BuildArch:     noarch
> 
> 
>@@ -118,9 +117,13 @@ desktop-file-install \
>     --dir=%{buildroot}%{_datadir}/applications \
>     %{the_desktop_file}
> rm -f %{buildroot}%{_datadir}/%{name}/icons/%{name}.{ico,xpm}
>-%find_lang %{name}
> %find_lang %{name} --with-man
> 
>+# adding to installed docs in order to avoid using %%doc magic
>+for f in AUTHORS COPYING HISTORY ; do
>+    cp -p $f %{buildroot}%{_docdir}/%{name}/${f}
>+done
>+
> 
> %post
> /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
>@@ -138,43 +141,27 @@ fi
> 
> 
> %files -f %{name}.lang
>-%doc AUTHORS COPYING HISTORY
> %{_bindir}/crrcsim
> %{_datadir}/applications/CRRCsim.desktop
>-%dir %{_datadir}/%{name}
>-%dir %{_datadir}/%{name}/icons
>-%{_datadir}/%{name}/icons/%{name}.png
>-%dir %{_datadir}/%{name}/models
>-%{_datadir}/%{name}/models/*.xml
>-%dir %{_datadir}/%{name}/models/battery
>-%{_datadir}/%{name}/models/battery/*.xml
>-%dir %{_datadir}/%{name}/models/engine
>-%{_datadir}/%{name}/models/engine/*.xml
>-%dir %{_datadir}/%{name}/objects
>-%{_datadir}/%{name}/objects/*.ac
>-%{_datadir}/%{name}/objects/*.3ds
>-%dir %{_datadir}/%{name}/scenery
>-%{_datadir}/%{name}/scenery/*.xml
>-%dir %{_datadir}/%{name}/sounds
>-%{_datadir}/%{name}/sounds/*.wav
>-%dir %{_datadir}/%{name}/sounds/f3f
>-%dir %{_datadir}/%{name}/sounds/f3f/default
>-%{_datadir}/%{name}/sounds/f3f/default/*.wav
>-%dir %{_datadir}/%{name}/sounds/f3f/sport
>-%{_datadir}/%{name}/sounds/f3f/sport/*.wav
>-%dir %{_datadir}/%{name}/textures
>-%{_datadir}/%{name}/textures/*.bw
>-%{_datadir}/%{name}/textures/*.jpg
>-%{_datadir}/%{name}/textures/*.rgb
>-%{_datadir}/%{name}/textures/*.txf
>+%{_datadir}/%{name}/
> %{_mandir}/man1/%{name}.1*
>+%dir %{_docdir}/%{name}/
>+%{_docdir}/%{name}/AUTHORS
>+%{_docdir}/%{name}/COPYING
>+%{_docdir}/%{name}/HISTORY
> 
> 
> %files doc
>-%doc %{_defaultdocdir}/%{name}
>+# all documentation in this package (including the license)
>+%{_docdir}/%{name}/
> 
> 
> %changelog
>+* Sat Dec 14 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 0.9.12-8
>+- Fix duplicate documentation (#1001277)
>+- Simplify the %%files list
>+- Drop base package dependency from -doc subpackage
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.12-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1001277: 836848