From 3981ced036cda6b6a52203f600990c360571d1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 17 Aug 2013 23:16:27 +0200 Subject: RPM Packaging: update packages for 3.5.13.2 under Fedora 19 --- .../twin-style-crystal-3.5.13.2.spec | 58 ++++++++++++---------- 1 file changed, 31 insertions(+), 27 deletions(-) (limited to 'redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec') diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec index d110e6813..79136634a 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp twin-style-crystal +%define tde_pkg twin-style-crystal +%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,27 +24,29 @@ %define _docdir %{tde_tdedocdir} -Name: trinity-%{tdecomp} -Summary: Semi transparant window decoration for Trinity. -Version: 1.0.5 -Release: 3%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: Semi transparant window decoration for Trinity. +Version: 1.0.5 +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} -License: GPLv2+ -Group: Applications/Utilities +License: GPLv2+ +Group: Applications/Utilities -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ -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 -BuildRequires: trinity-tqtinterface-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-kwin-style-crystal < %{version}-%{release} @@ -65,13 +68,7 @@ And it is of course nice to look at. Upstream says: %prep -%setup -q -n %{name}-3.5.13.2 - -# 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" @@ -81,7 +78,6 @@ And it is of course nice to look at. Upstream says: %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} \ @@ -91,8 +87,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} @@ -119,6 +120,9 @@ export PATH="%{tde_bindir}:${PATH}" %changelog +* Fri Aug 16 2013 Francois Andriot - 1.0.5-4 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 1.0.5-3 - Initial release for TDE 3.5.13.2 -- cgit v1.2.1