diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:43 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:43 +0200 |
| commit | be9f9f70d960e0789e024c8285dc681302c3c3f1 (patch) | |
| tree | bc4c568eb13a62af120ba51f9145337541b35be3 /redhat/dependencies/dbus-1-tqt | |
| parent | 1f76bf54b70463addf27bc503bb58af60dc8ae58 (diff) | |
| download | tde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.tar.gz tde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.zip | |
RHEL/Fedora: adds support for Mandriva 2011 in packaging
Diffstat (limited to 'redhat/dependencies/dbus-1-tqt')
| -rw-r--r-- | redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec index fbbb1c381..38fff184a 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec @@ -1,11 +1,11 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt %endif -%define tde_bindir %{_prefix}/bin -%define tde_includedir %{_prefix}/include -%define tde_libdir %{_prefix}/%{_lib} +%define tde_bindir %{tde_prefix}/bin +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} Name: dbus-1-tqt Version: 3.5.13 @@ -17,14 +17,14 @@ Group: System Environment/Libraries Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: dbus-devel -BuildRequires: tqtinterface-devel +BuildRequires: tqtinterface-devel >= 3.5.13 # TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 @@ -52,8 +52,13 @@ Development files for %{name} unset QTDIR || : ; . /etc/profile.d/qt.sh export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -%{?!mgaversion:%__mkdir build; cd build} +%if 0%{?rhel} || 0%{?fedora} +%__mkdir_p build +cd build +%endif + %cmake \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ .. @@ -63,7 +68,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" %install %__rm -rf %{?buildroot} -%__mkdir_p %{?buildroot}%{_includedir} %__make install DESTDIR=%{?buildroot} -C build %clean |