Author: glen Date: Sun Feb 17 22:17:45 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- rel 2; enable libjingle
- install shortcut
---- Files affected:
SPECS:
kdenetwork.spec (1.212.2.38 -> 1.212.2.39)
---- Diffs:
================================================================
Index: SPECS/kdenetwork.spec
diff -u SPECS/kdenetwork.spec:1.212.2.38 SPECS/kdenetwork.spec:1.212.2.39
--- SPECS/kdenetwork.spec:1.212.2.38 Fri Feb 15 23:36:36 2008
+++ SPECS/kdenetwork.spec Sun Feb 17 23:17:40 2008
@@ -20,7 +20,7 @@
Summary(pt_BR.UTF-8): K Desktop Environment - aplicações de rede
Name: kdenetwork
Version: 3.5.9
-Release: 1
+Release: 2
Epoch: 10
License: GPL
Group: X11/Libraries
@@ -38,12 +38,15 @@
Patch2: %{name}-kopete-qca-tls.patch
Patch3: kde-ac260-lt.patch
Patch4: kopete-icqconn.patch
+Patch5: %{name}-libjingle.patch
URL: http://www.kde.org/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: expat-devel
%{?with_hidden_visibility:BuildRequires: gcc-c++ >=
5:4.1.0-0.20051206r108118.1}
BuildRequires: gettext-devel
+BuildRequires: glib2-devel
BuildRequires: gsmlib-devel
BuildRequires: kdelibs-devel >= %{_minlibsevr}
BuildRequires: libgadu-devel >= 1.4
@@ -55,13 +58,14 @@
BuildRequires: meanwhile-devel >= 1.0.1
BuildRequires: openslp-devel
BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: ortp-devel
+BuildRequires: ortp-devel >= 0.11.0
BuildRequires: pcre-devel
%{?with_hidden_visibility:BuildRequires: qt-devel >= 6:3.3.5.051113-1}
BuildRequires: rpmbuild(find_lang) >= 1.32
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
%{?with_xmms:BuildRequires: xmms-devel}
+BuildRequires: speex-devel >= 1.1.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -1026,6 +1030,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p0
+%patch5 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;FileTransfer;/' \
-e 's/Terminal=0/Terminal=false/' -e '/\[Desktop
Entry\]/aEncoding=UTF-8' \
@@ -1067,9 +1072,13 @@
fi
done
+mv -f configure{,.dist}
+
%build
cp %{_datadir}/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
+if [ ! -f configure ]; then
+ %{__make} -f admin/Makefile.common cvs
+fi
%configure \
--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
@@ -1085,7 +1094,8 @@
--with-distribution="PLD Linux Distribution" \
--with-qt-libraries=%{_libdir} \
--with-wifi \
- --with%{!?with_xmms:out}-xmms
+ --with%{!?with_xmms:out}-xmms \
+ --enable-jingle
%{__make}
@@ -1726,6 +1736,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.212.2.39 2008-02-17 22:17:40 glen
+- rel 2; enable libjingle
+- install shortcut
+
Revision 1.212.2.38 2008-02-15 22:36:36 glen
- locolor icons not supported
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdenetwork.spec?r1=1.212.2.38&r2=1.212.2.39&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
