diff options
Diffstat (limited to 'redhat/tdeaddons/tdeaddons-3.5.13.2.spec')
| -rw-r--r-- | redhat/tdeaddons/tdeaddons-3.5.13.2.spec | 63 |
1 files changed, 23 insertions, 40 deletions
diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec index c998a3b72..8266a566e 100644 --- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec +++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -19,7 +21,7 @@ Name: trinity-tdeaddons Summary: Trinity Desktop Environment - Plugins -Version: 3.5.13.2 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -41,13 +43,13 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 BuildRequires: qt3-devel >= 3.3.8d -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdebase-devel >= %{version} -BuildRequires: trinity-tdegames-devel >= %{version} -BuildRequires: trinity-tdemultimedia-devel >= %{version} -BuildRequires: trinity-tdepim-devel >= %{version} -BuildRequires: trinity-tqtinterface-devel >= %{version} +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: trinity-tdegames-devel >= %{tde_version} +BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} +BuildRequires: trinity-tdepim-devel >= %{tde_version} BuildRequires: SDL-devel BuildRequires: alsa-lib-devel @@ -73,8 +75,6 @@ BuildRequires: libdb-4_8-devel #BuildRequires: xmms-devel #%endif -#Requires: which - Requires: trinity-atlantikdesigner = %{version}-%{release} Requires: trinity-kaddressbook-plugins = %{version}-%{release} Requires: trinity-kate-plugins = %{version}-%{release} @@ -676,12 +676,6 @@ done %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# 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" - %__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" %__make -f "admin/Makefile.common" @@ -690,7 +684,6 @@ done %build unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" # Note about DB4: @@ -703,17 +696,21 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ + --enable-final \ --enable-closure \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ - --with-extra-includes=%{tde_includedir}/tqt:%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts:%{tde_includedir} \ + --enable-rpath \ + \ + --with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \ + \ %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \ --with-sdl \ %if 0%{?with_db4} --with-berkeley-db \ -%if 0%{?fedora} == 18 +%if 0%{?fedora} >= 18 --with-db-lib=db_cxx-4 \ %endif %endif @@ -727,29 +724,15 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# File lists for locale -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}/$HTML_DIR ]; then - for lang_dir in %{buildroot}/$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi - done -fi - %clean %__rm -rf %{buildroot} %changelog +* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 - Initial release for TDE 3.5.13.2 |