RPM Packaging: update packages for 3.5.13.2 under Fedora 19

1 files changed, 49 insertions, 39 deletions

diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
index a4a4488a9..68dac0e31 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
@@ -1,13 +1,12 @@
-# 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 specific building variables
+%define tde_version 3.5.13.2
+%define tde_prefix /usr
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
 Name:		trinity-dbus-tqt
-Version:	3.5.13.2
+Epoch:		1
+Version:	0.63
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Dbus TQT Interface
@@ -19,7 +18,7 @@ Packager:	Francois Andriot <francois.andriot@free.fr>
 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
 
 # [dbus-tqt] Fix build on RHEL 4
 Patch1:		dbus-tqt-3.5.13-fix_old_dbus_types.patch
@@ -32,31 +31,55 @@ BuildRequires:	dbus-devel
 %endif
 BuildRequires:	trinity-tqtinterface-devel >= %{version}
 
-# TDE 3.5.13 specific building variables
 BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
+BuildRequires:	qt3-devel >= 3.3.8d
+Requires:		qt3 >= 3.3.8d
 
-Requires:		qt3
-
-Obsoletes:		dbus-tqt < %{version}-%{release}
-Provides:		dbus-tqt = %{version}-%{release}
+Obsoletes:		dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
 Dbus TQT Interface
 
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_libdir}/libdbus-tqt-1.so.0
+%{tde_libdir}/libdbus-tqt-1.so.0.0.0
+
+##########
 
 %package devel
 Requires:		%{name}
 Summary:		%{name} - Development files
 Group:			Development/Libraries
 
-Obsoletes:		dbus-tqt-devel < %{version}-%{release}
-Provides:		dbus-tqt-devel = %{version}-%{release}
+Obsoletes:		dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development files for %{name}
 
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/dbus-1.0/*
+%{tde_libdir}/libdbus-tqt-1.so
+%{tde_libdir}/libdbus-tqt-1.la
+%{tde_libdir}/pkgconfig/dbus-tqt.pc
+
+##########
 
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
@@ -64,7 +87,7 @@ Development files for %{name}
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %if 0%{?rhel} == 4
 %patch1 -p1 -b .dbustypes
@@ -85,6 +108,12 @@ 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=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   ..
@@ -96,33 +125,14 @@ cd build
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
+
 %clean
 %__rm -rf %{?buildroot}
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libdbus-tqt-1.so.0
-%{tde_libdir}/libdbus-tqt-1.so.0.0.0
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/dbus-1.0/*
-%{tde_libdir}/libdbus-tqt-1.so
-%{tde_libdir}/libdbus-tqt-1.la
-%{tde_libdir}/pkgconfig/dbus-tqt.pc
 
 %changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.63-1
+- 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