diff options
Diffstat (limited to 'redhat/applications/tdmtheme')
| -rw-r--r-- | redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec index c653973f1..8df2bce99 100644 --- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec +++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tdmtheme +%define tde_pkg tdmtheme +%define tde_version 3.5.13.2 # 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 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -23,31 +24,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: theme manager for TDM [Trinity] -Version: 1.2.2 -Release: 5%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: theme manager for TDM [Trinity] +Version: 1.2.2 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://beta.smileaf.org/projects -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-3.5.13.2.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# [tdmtheme] Fix tdmtheme crash. This resolves Bug 1544 -Patch1: tdmtheme-3.5.13.2-fix_segv.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +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 Obsoletes: trinity-kdmtheme < %{version}-%{release} @@ -66,14 +65,7 @@ that allows you to easily install, remove and change your KDM themes. %prep -%setup -q -n %{name}-3.5.13.2 -%patch1 -p1 -b .segv - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -83,7 +75,6 @@ that allows you to easily install, remove and change your KDM themes. %build unset QTDIR; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -93,8 +84,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -126,6 +122,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-6 +- Build for Fedora 19 + * Thu Jun 27 2013 Francois Andriot <francois.andriot@free.fr> - 1.2.2-5 - Fix tdmtheme crash. This resolves Bug 1544 |