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 --- .../tdeio-locate/tdeio-locate-3.5.13.2.spec | 68 ++++++++++------------ 1 file changed, 32 insertions(+), 36 deletions(-) (limited to 'redhat/applications/tdeio-locate') diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec index fe83d5815..d413e41f1 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec @@ -1,12 +1,13 @@ # Default version for this component -%define tdecomp tdeio-locate +%define tde_pkg tdeio-locate +%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,26 +24,27 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tdecomp} -Summary: kio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: 4%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Summary: kio-slave for the locate command [Trinity] +Version: 0.4.5 +Release: %{?!preversion:5}%{?preversion:4_%{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: cmake >= 2.8 @@ -51,7 +53,7 @@ Obsoletes: trinity-kio-locate < %{version}-%{release} Provides: trinity-kio-locate = %{version}-%{release} %description -Adds support for the "locate:" and "locater:" +Adds support for the "locate" and "locater:" protocols to Konqueror and other TDE applications. This enables you to perform locate searches as you @@ -65,42 +67,33 @@ as a directory. %prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside SCONS files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "admin/kde.py" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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}" -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %__mkdir_p build cd build %endif - %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ + \ -DBUILD_ALL=ON \ .. @@ -132,6 +125,9 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/services/searchproviders/locate.desktop %changelog +* Fri Aug 16 2013 Francois Andriot - 0.4.5-5 +- Build for Fedora 19 + * Mon Jun 03 2013 Francois Andriot - 0.4.5-4 - Initial release for TDE 3.5.13.2 -- cgit v1.2.1