RPM Packaging: add kplayer, kxmleditor, qalculate, tastymenu, tde-style-baghira, tde-style-domino, tde-style-ia-ora, update tdelibs, tdebase

1 files changed, 35 insertions, 39 deletions

diff --git a/redhat/applications/tde-style-ia-ora/style-ia-ora-14.0.0.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
index cc7ab27cc..86d89d720 100644
--- a/redhat/applications/tde-style-ia-ora/style-ia-ora-14.0.0.spec
+++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package style-ia-ora (version R14)
+# spec file for package tde-style-ia-ora (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -15,45 +15,47 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
-# Default version for this component
-%define tde_pkg style-ia-ora
+# TDE variables
+%define tde_epoch 2
 %if "%{?tde_version}" == ""
 %define tde_version 14.0.0
 %endif
-
-# TDE specific building variables
+%define tde_pkg tde-style-ia-ora
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %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}
+Epoch:		%{tde_epoch}
+Version:	1.0.8
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Mandriva theme for TDE - Widget design
+Group:		Environment/Desktop
+URL:		http://www.trinitydesktop.org/
 
-Name:			trinity-%{tde_pkg}
-Summary:        Mandriva theme for TDE - Widget design
-Version:        1.0.8
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License:        GPL
-Group:          Environment/Desktop
-URL:            http://www.mandrivalinux.com/
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Source0:        %{tde_pkg}-%{tde_version}.tar.gz
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Prefix:		%{_prefix}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -63,13 +65,13 @@ Requires:	trinity-twin
 %description
 Mandriva theme for Trinity
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
 
 %prep
-%setup -q -n ia_ora-kde-%{version}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -83,17 +85,19 @@ export PATH="%{tde_bindir}:${PATH}"
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
   --datadir=%{tde_datadir} \
   --includedir=%{tde_tdeincludedir} \
   --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
   \
-  --enable-rpath \
-  --enable-closure \
   --disable-dependency-tracking \
+  --disable-debug \
   --enable-new-ldflags \
   --enable-final \
-  --enable-shared \
-  --disable-static
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility
 
 %__make %{?_smp_mflags}
 
@@ -102,10 +106,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{?buildroot}
 
-# Removes useless files
-%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a
-%__rm -f %{?buildroot}%{tde_tdelibdir}/plugins/styles/*.a
-
 
 %clean
 %__rm -rf %{buildroot}
@@ -113,18 +113,14 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
+%{tde_tdelibdir}/plugins/styles/ia_ora.la
+%{tde_tdelibdir}/plugins/styles/ia_ora.so
 %{tde_tdelibdir}/twin3_iaora.la
 %{tde_tdelibdir}/twin3_iaora.so
 %{tde_tdelibdir}/twin_iaora_config.la
 %{tde_tdelibdir}/twin_iaora_config.so
-%{tde_tdelibdir}/plugins/styles/ia_ora.la
-%{tde_tdelibdir}/plugins/styles/ia_ora.so
-%{tde_datadir}/apps/kstyle/themes/ia_ora.themerc
+%{tde_datadir}/apps/tdestyle/themes/ia_ora.themerc
 %{tde_datadir}/apps/twin/iaora.desktop
 
 
-
-
 %changelog
-* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.8-4
-- Initial release for TDE 14.0.0