[Tora-develop] spec-file changes

[Alexander B. <le...@st...>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi!

I did some small spec-file changes to allow RPM building on fedora core.
(Tested on FC1 and FC3.) (Attached.)

I hope you'll find them useful and some of the changes will make it into
the next release.

The changes are:

- -%define _prefix                /usr/X11R6
+%define _prefix                /usr
... in preparation for FC5 (/usr/X11R6 is deprecated in FC5)

+%if %{?_iconsdir:0}%{!?_iconsdir:1}
+%define _iconsdir      %{_datadir}/icons
+%endif
... I believe _iconsdir is Mandriva-specific. It is defined to
%{_datadir}/icons if missing.

- -%{__install} --owner root --group root --mode=644 help/*
"${RPM_BUILD_ROOT}%{_prefix}/lib/tora/help/"
- -%{__install} --owner root --group root --mode=644 help/images/*
"${RPM_BUILD_ROOT}%{_prefix}/lib/tora/help/images/"
+%{__install} --owner root --group root --mode=644 help/*.html
"${RPM_BUILD_ROOT}%{_prefix}/lib/tora/help/"
+%{__install} --owner root --group root --mode=644 help/images/*.png
"${RPM_BUILD_ROOT}%{_prefix}/lib/tora/help/images/"
... otherwise the help/* glob will match the images/ subdirectory and
install will fail because this is a directory.

- -%{__install} --owner root --group root --mode=644 icons/tora.xpm
"${RPM_BUILD_ROOT}%{_iconsdir}/hicolor/32x32/apps/tora.xpm"
- -%{__install} --owner root --group root --mode=644 icons/toramini.xpm
"${RPM_BUILD_ROOT}%{_iconsdir}/hicolor/16x16/apps/tora.xpm"
+%{__install} -D --owner root --group root --mode=644 icons/tora.xpm
"${RPM_BUILD_ROOT}%{_iconsdir}/hicolor/32x32/apps/tora.xpm"
+%{__install} -D --owner root --group root --mode=644 icons/toramini.xpm
"${RPM_BUILD_ROOT}%{_iconsdir}/hicolor/16x16/apps/tora.xpm"
... add -D to create the directories, if missing

+%{_prefix}/lib/libto*.so
+%{_prefix}/lib/libto*.la
+%{_prefix}/lib/libto*.a
... to fix the RPMs complaint about installed but unpackaged files

Cheers,
- --leo
- --
- -----------------------------------------------------------------------
Ale...@wu...                Fax: +43-1-31336-906050
Zentrum fuer Informatikdienste - Wirtschaftsuniversitaet Wien - Austria

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFEO7PmsYaksEkoAQMRAt9gAKCKI7ulU13aDQfI5dPBm4PBE6PEvQCfdWhO
n1f/BfSapz7XUc+HP+Nkae8=
=Jj6B
-----END PGP SIGNATURE-----