diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-02 10:35:47 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-02 10:35:47 +0200 |
| commit | 616fddeb651206bcb60751b2db71f858048c7837 (patch) | |
| tree | d75bfbdafd8a334cb2ed568ad2ac77335acd88a2 | |
| parent | b40fd32b5156a6f16f5da68d1fb5b2dcbd2a3cb9 (diff) | |
| download | tde-packaging-616fddeb651206bcb60751b2db71f858048c7837.tar.gz tde-packaging-616fddeb651206bcb60751b2db71f858048c7837.zip | |
RPM Packaging: update tdenetwork
| -rw-r--r-- | redhat/tdenetwork/tdenetwork-14.0.0.spec | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index edaa7d881..d447c51d3 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -6,7 +6,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 14.0.0 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -32,7 +34,7 @@ %endif Name: trinity-tdenetwork -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Summary: Trinity Desktop Environment - Network Applications @@ -263,7 +265,7 @@ Requires: trinity-kdict = %{version}-%{release} Requires: trinity-kopete = %{version}-%{release} Requires: trinity-ksirc = %{version}-%{release} Requires: trinity-librss = %{version}-%{release} -Requires: trinity-kdelibs-devel +Requires: trinity-tdelibs-devel >= %{tde_version} Obsoletes: trinity-kdenetwork-devel < %{version}-%{release} Provides: trinity-kdenetwork-devel = %{version}-%{release} @@ -493,7 +495,7 @@ update-desktop-database 2> /dev/null || : ########## %package -n trinity-kopete -Summary: instant gwenview-i18n/gwenview-i18n-14.0.0.spec:HTML_DIRmessenger for Trinity +Summary: instant messenger for Trinity Group: Applications/Internet URL: http://kopete.kde.org @@ -1077,7 +1079,7 @@ update-desktop-database 2> /dev/null || : %endif %build -unset QTDIRs +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" @@ -1094,10 +1096,18 @@ cd build %endif %cmake \ + -DCMAKE_BUILD_TYPE="" \ + -DCMAKE_C_FLAGS="-DNDEBUG" \ + -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + \ -DWITH_JINGLE=ON \ %{?with_speex:-DWITH_SPEEX=ON} \ -DWITH_WEBCAM=ON \ @@ -1143,11 +1153,6 @@ EOF # ktalk %__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk -# RHEL 5: Avoids conflict with 'kdenetwork' -%if 0%{?rhel} == 5 -%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde -%endif - # Avoids conflict with trinity-kvirc %__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/ |