RPM Packaging: update gwenview

1 files changed, 62 insertions, 27 deletions

diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview-14.0.0.spec
index 773511b00..0a4dadcc0 100644
--- a/redhat/applications/gwenview/gwenview-14.0.0.spec
+++ b/redhat/applications/gwenview/gwenview-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg gwenview
+#
+# spec file for package gwenview (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# 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
-
-# TDE specific building variables
+%define tde_pkg gwenview
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
 Name:			trinity-%{tde_pkg}
-Summary:		Gwenview is an image viewer for TDE.
+Epoch:			%{tde_epoch}
 Version:		1.4.2
-Release:		%{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		Gwenview is an image viewer for TDE.
 Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
 URL:			http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
-
 BuildRequires:	gettext
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
 # EXIV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}exiv2-devel
@@ -79,10 +104,14 @@ converting, and batch processing, HTML gallery and others are provided by the
 KIPI image framework.
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -95,7 +124,6 @@ KIPI image framework.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -126,6 +154,11 @@ export PATH="%{tde_bindir}:${PATH}"
 # Removes useless files (-devel ?)
 %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file gwenview RasterGraphics Viewer
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -164,7 +197,9 @@ done
 %{tde_tdelibdir}/libgvimagepart.so
 %{tde_tdeappdir}/gwenview.desktop
 %{tde_datadir}/apps/gwenview/
+%dir %{tde_datadir}/apps/gvdirpart
 %{tde_datadir}/apps/gvdirpart/gvdirpart.rc
+%dir %{tde_datadir}/apps/gvimagepart
 %{tde_datadir}/apps/gvimagepart/gvimagepart.rc
 %{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc
 %{tde_datadir}/apps/tdeconf_update/gwenview_1.4_osdformat.sh
@@ -191,5 +226,5 @@ done
 %lang(en) %{tde_tdedocdir}/HTML/en/gwenview/
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-12
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.4.2-1
 - Initial release for TDE 14.0.0