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 --- redhat/applications/dolphin/dolphin-3.5.13.2.spec | 90 +++++++++-------------- 1 file changed, 35 insertions(+), 55 deletions(-) (limited to 'redhat/applications/dolphin') diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec index 711989c20..5ba78e34d 100644 --- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec +++ b/redhat/applications/dolphin/dolphin-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define kdecomp dolphin +%define tde_pkg dolphin +%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 @@ -22,27 +23,29 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} -Summary: File manager for TDE focusing on usability -Version: 0.9.2 -Release: 7%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: File manager for TDE focusing on usability +Version: 0.9.2 +Release: %{?!preversion:8}%{?preversion:7_%{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: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{_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 @@ -58,13 +61,7 @@ interface for the task of file management. %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" @@ -74,7 +71,6 @@ interface for the task of file management. %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} \ @@ -84,8 +80,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --docdir=%{tde_tdedocdir} \ --libdir=%{tde_libdir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --enable-rpath %__make %{?_smp_mflags} @@ -95,33 +96,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop' -sed -i "%{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop" \ - -e "/^Name\[pa\].*/d" - -desktop-file-install --vendor "" \ - --delete-original \ - --dir %{buildroot}%{tde_datadir}/applications/ \ - %{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop - - -## File lists -# HTML (1.0) -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 # Makes 'media_safelyremove.desktop' an alternative %__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin @@ -131,11 +105,13 @@ fi %find_lang d3lphin + %clean %__rm -rf %{buildroot} %post +update-desktop-database %{tde_tdeappdir} -q &> /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : update-alternatives --install \ @@ -152,6 +128,7 @@ if [ $1 -eq 0 ]; then fi %postun +update-desktop-database %{tde_tdeappdir} -q &> /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : @@ -160,7 +137,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %{tde_bindir}/d3lphin -%{tde_datadir}/applications/d3lphin.desktop +%{tde_tdeappdir}/d3lphin.desktop %{tde_datadir}/apps/d3lphin/ %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ @@ -168,6 +145,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Fri Aug 16 2013 Francois Andriot - 0.9.2-8 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 0.9.2-7 - Initial release for TDE 3.5.13.2 -- cgit v1.2.3