Author: glen Date: Thu Feb 14 23:43:51 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - update to kde 3.5.9, install shortcut, find_lang simplify
---- Files affected: SPECS: kdenetwork.spec (1.212.2.34 -> 1.212.2.35) ---- Diffs: ================================================================ Index: SPECS/kdenetwork.spec diff -u SPECS/kdenetwork.spec:1.212.2.34 SPECS/kdenetwork.spec:1.212.2.35 --- SPECS/kdenetwork.spec:1.212.2.34 Thu Feb 14 22:46:43 2008 +++ SPECS/kdenetwork.spec Fri Feb 15 00:43:46 2008 @@ -4,6 +4,15 @@ # - what about non-applied libgadu patch? # - fix or kill skype support # - kill internal libgadu copy +# - unpackaged: +# /usr/lib/libkdeinit_kdict.la +# /usr/lib/libkdeinit_ksirc.la +# /usr/lib/libkopete.so.1 +# /usr/lib/libkopete_msn_shared.so.0 +# /usr/lib/libkopete_oscar.so.2 +# /usr/lib/libkopete_videodevice.so.0 +# /usr/lib/libkwireless.la +# /usr/lib/librss.so.1 # # Conditional build: %bcond_without xmms # without xmms support @@ -19,13 +28,13 @@ Summary(pl.UTF-8): K Desktop Environment - aplikacje sieciowe Summary(pt_BR.UTF-8): K Desktop Environment - aplicações de rede Name: kdenetwork -Version: 3.5.8 -Release: 3 +Version: 3.5.9 +Release: 0.1 Epoch: 10 License: GPL Group: X11/Libraries Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 0e79374d1109d937b0c9bdd3a75e7476 +# Source0-md5: 0ec1d4ccd550510821a622eb91b893e8 Source1: %{name}-kopetestyles.tar.bz2 # Source1-md5: 642aa6bf71c37c90ce23e3c4c3a90922 Source2: %{name}-lisa.init @@ -38,7 +47,6 @@ Patch2: %{name}-kopete-qca-tls.patch Patch3: kde-ac260-lt.patch Patch4: kopete-icqconn.patch -Patch5: %{name}-filesharing-msdfs_proxy.patch URL: http://www.kde.org/ BuildRequires: alsa-lib-devel BuildRequires: autoconf @@ -59,6 +67,7 @@ BuildRequires: ortp-devel BuildRequires: pcre-devel %{?with_hidden_visibility:BuildRequires: qt-devel >= 6:3.3.5.051113-1} +BuildRequires: rpmbuild(find_lang) >= 1.30 BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: sed >= 4.0 %{?with_xmms:BuildRequires: xmms-devel} @@ -1026,7 +1035,6 @@ %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' \ @@ -1091,58 +1099,60 @@ %{__make} %install -rm -rf $RPM_BUILD_ROOT +if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then + rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT + + %{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + kde_htmldir=%{_kdedocdir} + %{__make} -C kopete/protocols/winpopup install \ + DESTDIR=$RPM_BUILD_ROOT \ + kde_htmldir=%{_kdedocdir} + touch makeinstall.stamp +fi -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} -%{__make} -C kopete/protocols/winpopup install \ - DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} - -install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig} -install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lisa -install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/lisa -install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lisarc -%{__tar} xfj %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/apps/kopete/styles - -mv $RPM_BUILD_ROOT%{_iconsdir}/{locolor,crystalsvg}/16x16/apps/krfb.png - -# for kdenetwork-kopete-protocol-winpopup -install -d $RPM_BUILD_ROOT{/var/lib/winpopup,/etc/samba} -# TODO: add inclusion of winpopup.conf in post script? -cat > $RPM_BUILD_ROOT/etc/samba/winpopup.conf <<'EOF' -[global] -message command = %{_bindir}/winpopup-send.sh %s %m & -EOF -install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/winpopup-install.sh - -# Messing ones -rm $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop -rm $RPM_BUILD_ROOT%{_iconsdir}/locolor/32x32/apps/krfb.png -rm $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/lan.desktop - -rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la - -%find_lang kdict --with-kde -%find_lang kget --with-kde -%find_lang knewsticker --with-kde -%find_lang kopete --with-kde -grep -v /kdenetwork-apidocs/ kopete.lang > kopete.lang. -mv kopete.lang. kopete.lang -%find_lang kpf --with-kde -%find_lang kppp --with-kde -%find_lang krdc --with-kde -%find_lang krfb --with-kde -cat krdc.lang >> krfb.lang -%find_lang ksirc --with-kde -%find_lang ktalkd --with-kde -%find_lang kcmtalkd --with-kde -cat kcmtalkd.lang >> ktalkd.lang -%find_lang kwifimanager --with-kde -%find_lang lisa --with-kde -%find_lang lanbrowser --with-kde -cat lanbrowser.lang >> lisa.lang +if [ ! -f installed.stamp ]; then + install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig} + install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lisa + install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/lisa + install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/lisarc + %{__tar} xfj %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/apps/kopete/styles + + mv $RPM_BUILD_ROOT%{_iconsdir}/{locolor,crystalsvg}/16x16/apps/krfb.png + + # for kdenetwork-kopete-protocol-winpopup + install -d $RPM_BUILD_ROOT{/var/lib/winpopup,/etc/samba} + # TODO: add inclusion of winpopup.conf in post script? + cat > $RPM_BUILD_ROOT/etc/samba/winpopup.conf <<-'EOF' + [global] + message command = %{_bindir}/winpopup-send.sh %s %m & + EOF + install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/winpopup-install.sh + + # Messing ones + %{__rm} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-icq.desktop + %{__rm} $RPM_BUILD_ROOT%{_iconsdir}/locolor/32x32/apps/krfb.png + %{__rm} $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/dirtree/remote/lan.desktop + + rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la + touch installed.stamp +fi + +%find_lang kdict --with-kde +%find_lang kget --with-kde +%find_lang knewsticker --with-kde +%find_lang kopete --with-kde +%{__sed} -i -e '/kdenetwork-apidocs/d' kopete.lang +%find_lang kpf --with-kde +%find_lang kppp --with-kde +%find_lang krfb --with-kde +%find_lang krdc --with-kde -a krfb.lang +%find_lang ksirc --with-kde +%find_lang ktalkd --with-kde +%find_lang kwifimanager --with-kde +%find_lang lisa --with-kde +%find_lang kcontrol/kcmtalkd --with-kde -a ktalkd.lang +%find_lang kcontrol/lanbrowser --with-kde -a lisa.lang %clean rm -rf $RPM_BUILD_ROOT @@ -1711,6 +1721,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.212.2.35 2008-02-14 23:43:46 glen +- update to kde 3.5.9, install shortcut, find_lang simplify + Revision 1.212.2.34 2008-02-14 21:46:43 glen - merge with HEAD ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdenetwork.spec?r1=1.212.2.34&r2=1.212.2.35&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
