summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-08-06 22:48:33 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-08-06 22:48:33 +0200
commitc6bdb99e724f5ee234ecf263b0417bbd5e1af044 (patch)
treea012ac761c38aa5f3aa848cf9e8cb295fefb67e3
parentd27f0076471e9f60e546dae988c35cf827f4255f (diff)
downloadtde-packaging-c6bdb99e724f5ee234ecf263b0417bbd5e1af044.tar.gz
tde-packaging-c6bdb99e724f5ee234ecf263b0417bbd5e1af044.zip
RPM Packaging: update lots of dependencies
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec1
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec4
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec2
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec2
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.0.spec8
-rw-r--r--redhat/dependencies/python-tqt/python-tqt-14.0.0.spec1
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec4
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec2
8 files changed, 13 insertions, 11 deletions
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index ac21dbb82..7168e69cb 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -206,6 +206,7 @@ cd build
-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 \
-DWITH_GCC_VISIBILITY=ON \
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 5bbcec5a0..13085962b 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -23,7 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: gcc-c++
-BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: gettext-devel
@@ -96,9 +95,6 @@ unset QTDIR QTINC QTLIB
%configure \
--exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --docdir=%{tde_docdir} \
--includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \
\
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 73d7c838b..2ffa3b19c 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
@@ -102,7 +102,7 @@ cd build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \
\
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 6e7f8944b..583eac275 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -111,7 +111,7 @@ cd build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \
\
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index 6e4c9e329..a4837cd4b 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -71,10 +71,14 @@ Provides: libcarddav-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+# Fix empty ChangeLog cause invalid macro in 'configure.ac'
+echo "%{name} (%{version})" >ChangeLog
./autogen.sh
%build
+unset QTDIR QTINC QTLIB
+
# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -129,10 +133,10 @@ fi
%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.3-4
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4
- Initial release for TDE R14.0.0
-* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3
+* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3
- Renames to 'trinity-libcarddav'
- Build on MGA2
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index 645d7df82..81d48d0a5 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -38,7 +38,6 @@ BuildRequires: python-sip
%endif
# TDE specific building variables
-BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0
Requires: trinity-tqt3 >= 3.5.0
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index eb277a818..44fffcf34 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -434,8 +434,10 @@ for the TQt 3 toolkit.
-e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \
-e "s|\$(QTDIR)|/usr|g" \
-e "s|-lqt|-ltqt|g" \
+ -e "s|^QMAKE_INCDIR =.*|QMAKE_INCDIR = %{_includedir}|" \
+ -e "s|^QMAKE_LIBDIR =.*|QMAKE_LIBDIR = %{_libdir}|" \
-e "s|^QMAKE_STRIP =.*|QMAKE_STRIP =|" \
- -e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|"
+ -e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" \
%build
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 7c7480418..060b89b04 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -130,7 +130,7 @@ cd build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \
\