From 5078e777854b9bbbe742d358ec20ef5a0ee41b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 3 Aug 2013 19:36:53 +0200 Subject: RPM Packaging: update dependencies --- .../dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec | 32 +++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'redhat/dependencies/dbus-1-tqt') diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index ecee40f36..73d7c838b 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -1,20 +1,20 @@ -# Always install under standard prefix -%define tde_prefix /usr +# TDE specific building variables %define tde_version 14.0.0 - +%define tde_prefix /usr %define tde_bindir %{tde_prefix}/bin %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} Name: trinity-dbus-1-tqt -Version: 14.0.0 +Epoch: 1 +Version: 0.9 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Dbus TQT Interface Group: System Environment/Libraries -Obsoletes: dbus-1-tqt < %{version}-%{release} -Provides: dbus-1-tqt = %{version}-%{release} +Obsoletes: dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release} Vendor: Trinity Project Packager: Francois Andriot @@ -22,7 +22,7 @@ Packager: Francois Andriot Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: gcc-c++ %if 0%{?suse_version} @@ -30,11 +30,10 @@ BuildRequires: dbus-1-devel %else BuildRequires: dbus-devel %endif -BuildRequires: trinity-tqtinterface-devel >= %{version} -# TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 BuildRequires: trinity-tqt3-devel >= 3.5.0 +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} Requires: trinity-tqt3 >= 3.5.0 @@ -60,8 +59,8 @@ Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries -Obsoletes: dbus-1-tqt-devel < %{version}-%{release} -Provides: dbus-1-tqt-devel = %{version}-%{release} +Obsoletes: dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development files for %{name} @@ -87,7 +86,7 @@ Development files for %{name} %prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build @@ -100,6 +99,13 @@ 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_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ @@ -118,5 +124,5 @@ cd build %changelog -* Fri Jul 05 2013 Francois Andriot - 14.0.0-1 +* Fri Jul 05 2013 Francois Andriot - 0.9-1 - Initial release for TDE R14.0.0 -- cgit v1.2.3