1 files changed, 30 insertions, 29 deletions
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index 6d7bfb862..9254f1700 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -1,5 +1,9 @@
+%if 0%{?fedora} >= 23
+%define _hardened_ldflags %nil
+%endif
+
 #
-# spec file for package libksquirrel (version R14.0.0)
+# spec file for package libksquirrel (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +16,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +25,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libksquirrel
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -34,18 +40,13 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 
 Name:		trinity-%{tde_pkg}
-Summary:	Trinity image viewer
-Group:		System/Libraries
 Epoch:		%{tde_epoch}
 Version:	0.8.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Trinity image viewer
+Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -61,6 +62,7 @@ Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -80,6 +82,10 @@ BuildRequires:	libtool-ltdl-devel
 # TRANSFIG support
 BuildRequires:	transfig
 
+# GHOSTSCRIPT support
+%define with_ghostscript 1
+BuildRequires:	ghostscript
+
 # GETTEXT support
 BuildRequires:	gettext
 BuildRequires:	gettext-devel
@@ -91,10 +97,9 @@ BuildRequires:	OpenEXR-devel
 BuildRequires:	libtiff-devel
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires:	giflib-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel}
+%else
 BuildRequires:	libungif-devel
 %endif
 
@@ -117,6 +122,9 @@ BuildRequires:	xmedcon-devel
 # RSVG support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_svg 1
+%if 0%{?rhel} == 5
+BuildRequires:	librsvg2-devel
+%endif
 %if 0%{?fedora} || 0%{?rhel} 
 BuildRequires:	librsvg2
 %endif
@@ -159,6 +167,9 @@ BuildRequires: freetype-devel
 # WMF support
 BuildRequires:	libwmf-devel
 
+# XML2 support
+BuildRequires:	libxml2-devel
+
 # NETPBM support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 BuildRequires:	netpbm
@@ -192,8 +203,10 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
 %endif
+%if 0%{?with_ghostscript}
 %{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0
+%endif
 %{tde_libdir}/ksquirrel-libs/libkls_fig.so.0
 %{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0
 %{tde_libdir}/ksquirrel-libs/libkls_fli.so.0
@@ -308,12 +321,6 @@ This package contains the runtime libraries for KSquirrel.
 %{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
 %{tde_datadir}/ksquirrel-libs/rgbmap
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
 ##########
 
 %package devel
@@ -352,8 +359,10 @@ This package contains the development libraries for KSquirrel.
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.la
 %{tde_libdir}/ksquirrel-libs/libkls_djvu.so
 %endif
+%if 0%{?with_ghostscript}
 %{tde_libdir}/ksquirrel-libs/libkls_eps.la
 %{tde_libdir}/ksquirrel-libs/libkls_eps.so
+%endif
 %{tde_libdir}/ksquirrel-libs/libkls_fig.la
 %{tde_libdir}/ksquirrel-libs/libkls_fig.so
 %{tde_libdir}/ksquirrel-libs/libkls_fli.la
@@ -459,12 +468,6 @@ This package contains the development libraries for KSquirrel.
 %{tde_libdir}/pkgconfig/ksquirrellibs.pc
 %{tde_docdir}/ksquirrel-libs/
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 ##########
 
 %package tools
@@ -519,7 +522,7 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then
 fi
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -558,6 +561,4 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2:0.8.0-1
-- Initial release for TDE 14.0.0
+%changelog