RPM Packaging: update lots of dependencies

pull/3/head
François Andriot 11 years ago
parent d27f007647
commit c6bdb99e72

@ -206,6 +206,7 @@ cd build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \

@ -23,7 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: gettext-devel BuildRequires: gettext-devel
@ -96,9 +95,6 @@ unset QTDIR QTINC QTLIB
%configure \ %configure \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--docdir=%{tde_docdir} \
--includedir=%{tde_includedir} \ --includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
\ \

@ -102,7 +102,7 @@ cd build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
\ \

@ -111,7 +111,7 @@ cd build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
\ \

@ -71,10 +71,14 @@ Provides: libcarddav-devel = %{version}-%{release}
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Fix empty ChangeLog cause invalid macro in 'configure.ac'
echo "%{name} (%{version})" >ChangeLog
./autogen.sh ./autogen.sh
%build %build
unset QTDIR QTINC QTLIB
# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 # 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 CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@ -129,10 +133,10 @@ fi
%Changelog %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 - 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' - Renames to 'trinity-libcarddav'
- Build on MGA2 - Build on MGA2

@ -38,7 +38,6 @@ BuildRequires: python-sip
%endif %endif
# TDE specific building variables # TDE specific building variables
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqt3-devel >= 3.5.0
Requires: trinity-tqt3 >= 3.5.0 Requires: trinity-tqt3 >= 3.5.0

@ -434,8 +434,10 @@ for the TQt 3 toolkit.
-e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \ -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \
-e "s|\$(QTDIR)|/usr|g" \ -e "s|\$(QTDIR)|/usr|g" \
-e "s|-lqt|-ltqt|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_STRIP =.*|QMAKE_STRIP =|" \
-e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" -e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" \
%build %build

@ -130,7 +130,7 @@ cd build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
\ \

Loading…
Cancel
Save