Accepting request 294956 from home:dimstar:Factory

- No longer package bibletime.xpm: there are perfectly good icons
  inside the tarball (even in scalable svg format).
- Fix the installation location of the icon: ensure the real file
  is located in /usr/share/icons/[..].

OBS-URL: https://build.opensuse.org/request/show/294956
OBS-URL: https://build.opensuse.org/package/show/Education/bibletime?expand=0&rev=41
This commit is contained in:
Atri Bhattacharya 2015-04-08 13:26:38 +00:00 committed by Git OBS Bridge
parent aca0050436
commit b30fe7832a
4 changed files with 16 additions and 9 deletions

2
.gitattributes vendored
View File

@ -21,5 +21,3 @@
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
bibletime.xpm filter=lfs diff=lfs merge=lfs -text

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Apr 8 12:09:48 UTC 2015 - dimstar@opensuse.org
- No longer package bibletime.xpm: there are perfectly good icons
inside the tarball (even in scalable svg format).
- Fix the installation location of the icon: ensure the real file
is located in /usr/share/icons/[..].
-------------------------------------------------------------------
Mon Jul 7 14:14:06 UTC 2014 - lars@linux-schulserver.de

View File

@ -1,7 +1,7 @@
#
# spec file for package bibletime
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012-2014 Lars Vogdt
#
# All modifications and additions to the file contributed by third parties
@ -25,7 +25,6 @@ License: GPL-2.0+
Group: Productivity/Scientific/Other
Url: http://www.bibletime.info/
Source0: %name-%version.tar.xz
Source1: %{name}.xpm
Source2: bibletime-rpmlintrc
BuildRequires: boost-devel
BuildRequires: cmake
@ -107,7 +106,13 @@ test -d %{buildroot}%kdeprefix/share/doc/HTML/pt-br && mv %{buildroot}%kdeprefix
# install manpages
install -Dm644 docs/manpages/bibletime.1 %{buildroot}%{_mandir}/man1/bibletime.1
install -Dm644 docs/manpages/bibletime.de.1 %{buildroot}%{_mandir}/de/man1/bibletime.1
install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
# move the icon to a valid place (/usr/share/icons is not valid... it has to be in a theme; hicolor as the usual falback)
# this is only a link pointing out of the icons
rm %{buildroot}%{_datadir}/icons/%{name}.svg
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
mv %{buildroot}%{_datadir}/%{name}/icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
# then link back the icon into the app directory
ln -sf %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{buildroot}%{_datadir}/%{name}/icons/%{name}.svg
%if 0%{?suse_version}
%fdupes -s %{buildroot}
sed -i "s|bibletime/handbook/index.html|bibletime/handbook/en/index.html|" %{buildroot}%{_datadir}/applications/%{name}.desktop
@ -128,7 +133,6 @@ rm -rf %{buildroot}
%dir %kdeprefix/share/bibletime
%kdeprefix/bin/*
%kdeprefix/share/icons/*
%kdeprefix/share/pixmaps/%{name}.xpm
%kdeprefix/share/applications/bibletime.desktop
%kdeprefix/share/bibletime/*

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f7ca03313511381472c4e3857a76e7c66e893e32efb0897d20c61df1b119990
size 11522