packages: kde4-kdenetwork/kde4-kdenetwork.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Wed Jul 29 21:59:32 CEST 2009


Author: shadzik                      Date: Wed Jul 29 19:59:32 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdenetwork:
   kde4-kdenetwork.spec (1.74 -> 1.75) 

---- Diffs:

================================================================
Index: packages/kde4-kdenetwork/kde4-kdenetwork.spec
diff -u packages/kde4-kdenetwork/kde4-kdenetwork.spec:1.74 packages/kde4-kdenetwork/kde4-kdenetwork.spec:1.75
--- packages/kde4-kdenetwork/kde4-kdenetwork.spec:1.74	Mon Jun  1 07:58:26 2009
+++ packages/kde4-kdenetwork/kde4-kdenetwork.spec	Wed Jul 29 21:59:27 2009
@@ -1,29 +1,29 @@
 # $Revision$, $Date$
 # TODO
 # - fix kopete-tool-{avdeviceconfig,smpppdcs} summaries/descriptions (copy-pastos!)
-# - what about non-applied libgadu patch?
-# - kill internal libgadu copy
 # - BR phonon-devel
 #
 # Conditional build:
 #
 %define		_state		stable
 %define		orgname		kdenetwork
-%define		qtver		4.5.1
+%define		qtver		4.5.2
 
 Summary:	K Desktop Environment - network applications
 Summary(es.UTF-8):	K Desktop Environment - aplicaciones de red
 Summary(pl.UTF-8):	K Desktop Environment - aplikacje sieciowe
 Summary(pt_BR.UTF-8):	K Desktop Environment - aplicações de rede
 Name:		kde4-kdenetwork
-Version:	4.2.4
-Release:	2
+Version:	4.3.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	3071bbb1a24c62b81593e76187a84fb6
-Patch100:	%{name}-branch.diff
-Patch0:		%{name}-FindDecibel.patch
+# Source0-md5:	f9695ff06d0d67a78a71fb9b3ddbd4f3
+#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+#Patch100:	%{name}-branch.diff
+Patch0:		%{name}-libknotification.patch
+Patch1:		%{name}-FindLibgadu.patch
 URL:		http://www.kde.org/
 BuildRequires:	QtOpenGL-devel >= %{qtver}
 BuildRequires:	automoc4 >= 0.9.88
@@ -34,7 +34,7 @@
 BuildRequires:	kde4-kdebase-workspace-devel >= %{version}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
-BuildRequires:	libgadu-devel >= 1.4
+BuildRequires:	libgadu-devel >= 1.8.0
 BuildRequires:	libidn-devel
 BuildRequires:	libiw-devel >= 27
 BuildRequires:	libjpeg-devel
@@ -42,6 +42,7 @@
 #BuildRequires:	libnxcl-devel >= 1.0-0.r612.1
 BuildRequires:	libotr-devel >= 3.2.0
 BuildRequires:	libtool
+BuildRequires:	libv4l-devel >= 0.5.8
 BuildRequires:	libvncserver-devel
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-devel >= 1.0.7
@@ -57,6 +58,7 @@
 BuildRequires:	xmms-devel
 BuildRequires:	xorg-lib-libXtst-devel
 Obsoletes:	kdenetwork4
+Obsoletes:	kde4-kdenetwork-kopete-tool-alias
 Conflicts:	kdenetwork4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -371,6 +373,19 @@
 %description kopete-protocol-wlm -l pl.UTF-8
 Wtyczka Kopete dodająca obsługę protokołu WLM (Windows Live Messenger).
 
+%package kopete-protocol-skype
+Summary:	Kopete plugin which adds Skype(tm) protocol support
+Summary(pl.UTF-8):	Wtyczka Kopete dodająca obsługę protokołu Skype(tm)
+Group:		X11/Applications/Networking
+Requires:	%{name}-kopete = %{version}-%{release}
+
+%description kopete-protocol-skype
+Kopete plugin which adds Skype(tm) protocol support.
+
+%description kopete-protocol-skype -l pl.UTF-8
+Wtyczka Kopete dodająca obsługę protokołu Skype(tm).
+
+
 %package kopete-protocol-msn
 Summary:	Kopete plugin which adds MSN protocol support
 Summary(pl.UTF-8):	Wtyczka Kopete dodająca obsługę protokołu MSN
@@ -706,13 +721,15 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 #%patch100 -p0
-#%patch0 -p0
+%patch0 -p1
+%patch1 -p0
 
 %build
 install -d build
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DLIB_INSTALL_DIR=%{_libdir} \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
 	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
 %if "%{_lib}" == "lib64"
@@ -772,7 +789,6 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libiris_kopete.so
 %attr(755,root,root) %{_libdir}/libkopete.so
 #%attr(755,root,root) %{_libdir}/libkopete_msn_shared.so
 %attr(755,root,root) %{_libdir}/libkopete_oscar.so
@@ -784,7 +800,10 @@
 %attr(755,root,root) %{_libdir}/libkopeteprivacy.so
 %attr(755,root,root) %{_libdir}/libkopetestatusmenu.so
 %attr(755,root,root) %{_libdir}/liboscar.so
+%attr(755,root,root) %{_libdir}/libkrdccore.so
+%attr(755,root,root) %{_libdir}/libkopetecontactlist.so
 %{_includedir}/kopete
+%{_includedir}/krdc
 
 %files filesharing
 %defattr(644,root,root,755)
@@ -885,7 +904,6 @@
 %attr(755,root,root) %{_libdir}/kde4/kopete_statistics.so
 %attr(755,root,root) %{_libdir}/kde4/kopete_testbed.so
 %attr(755,root,root) %{_libdir}/kde4/kopete_urlpicpreview.so
-%attr(755,root,root) %{_libdir}/kde4/libkrichtexteditpart.so
 
 %attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-account-0.10.pl
 %attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-account-kconf_update.sh
@@ -901,10 +919,13 @@
 %attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-pluginloader.upd
 %attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-pluginloader2.sh
 %attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-pluginloader2.upd
+%attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-gaim_to_pidgin_style.pl
+%attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-gaim_to_pidgin_style.upd
+%attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-update_yahoo_server.pl
+%attr(755,root,root) %{_datadir}/apps/kconf_update/kopete-update_yahoo_server.upd
+
 
 #### ???
-%attr(755,root,root) %{_libdir}/libiris_kopete.so.1.0.0
-%attr(755,root,root) %ghost %{_libdir}/libiris_kopete.so.?
 %attr(755,root,root) %{_libdir}/libkopeteaddaccountwizard.so.1.0.0
 %attr(755,root,root) %ghost %{_libdir}/libkopeteaddaccountwizard.so.?
 %attr(755,root,root) %{_libdir}/libkopetechatwindow_shared.so.1.0.0
@@ -917,6 +938,9 @@
 %attr(755,root,root) %ghost %{_libdir}/liboscar.so.?
 %attr(755,root,root) %{_libdir}/libkopetestatusmenu.so.1.0.0
 %attr(755,root,root) %ghost %{_libdir}/libkopetestatusmenu.so.?
+%attr(755,root,root) %{_libdir}/libkopetecontactlist.so.1
+%attr(755,root,root) %{_libdir}/libkopetecontactlist.so.1.0.0
+%attr(755,root,root) %{_libdir}/kde4/libchattexteditpart.so
 ####
 
 %dir %{_datadir}/apps/kopete
@@ -939,6 +963,8 @@
 %{_datadir}/apps/kopete/icons/*/*/apps/preferences-plugin-text-effect-kopete.png
 %{_datadir}/apps/kopete/icons/*/*/apps/preferences-text-autocorrection-kopete.png
 %{_datadir}/apps/kopete/icons/*/*/apps/preferences-text-highlighting-kopete.png
+%{_datadir}/apps/kopete/CompactContactListLayouts.xml
+%{_datadir}/apps/kopete/DefaultContactListLayouts.xml
 #%{_datadir}/apps/kopete/pics/statistics
 %{_datadir}/apps/kopete/styles
 %{_datadir}/apps/kopete_otr
@@ -1002,9 +1028,6 @@
 %files kopete-protocol-gg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kopete_gadu.so
-%attr(755,root,root) %{_libdir}/libgadu_kopete.so.1.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgadu_kopete.so.1
-%attr(755,root,root) %{_libdir}/libgadu_kopete.so
 %{_datadir}/apps/kopete/icons/*/*/*/gadu*
 %{_datadir}/apps/kopete/icons/*/*/*/gg*
 %{_datadir}/kde4/services/kopete_gadu.desktop
@@ -1052,6 +1075,23 @@
 %dir %{_datadir}/apps/kopete_wlm
 %{_datadir}/apps/kopete_wlm/wlmchatui.rc
 
+%files kopete-protocol-skype
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/skype-action-handler
+# someone find a way to package this
+#/usr/lib/mozilla/plugins/libskypebuttons.so
+%attr(755,root,root) %{_libdir}/kde4/kopete_skype.so
+%dir %{_datadir}/apps/kopete_skype
+%{_datadir}/apps/kopete_skype/call_end
+%{_datadir}/apps/kopete_skype/call_start
+%{_datadir}/apps/kopete_skype/skypechatui.rc
+%{_datadir}/apps/kopete_skype/skypeui.rc
+%{_datadir}/kde4/services/callto.protocol
+%{_datadir}/kde4/services/kopete_skype.desktop
+%{_datadir}/kde4/services/skype.protocol
+%{_datadir}/kde4/services/tel.protocol
+%{_datadir}/apps/kopete/icons/*/*/*/skype_protocol.png
+
 %files kopete-protocol-sms
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kopete_sms.so
@@ -1078,12 +1118,12 @@
 %{_datadir}/apps/kopete/icons/*/*/*/yahoo*
 %{_datadir}/kde4/services/kopete_yahoo.desktop
 
-%files kopete-tool-alias
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde4/kcm_kopete_alias.so
-%attr(755,root,root) %{_libdir}/kde4/kopete_alias.so
-%{_datadir}/kde4/services/kconfiguredialog/kopete_alias_config.desktop
-%{_datadir}/kde4/services/kopete_alias.desktop
+#%files kopete-tool-alias
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/kde4/kcm_kopete_alias.so
+#%attr(755,root,root) %{_libdir}/kde4/kopete_alias.so
+#%{_datadir}/kde4/services/kconfiguredialog/kopete_alias_config.desktop
+#%{_datadir}/kde4/services/kopete_alias.desktop
 
 %files kopete-tool-autoreplace
 %defattr(644,root,root,755)
@@ -1179,11 +1219,24 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/krdc
 %attr(755,root,root) %{_bindir}/krfb
+%attr(755,root,root) %ghost %{_libdir}/libkrdccore.so.?
+%attr(755,root,root) %{_libdir}/libkrdccore.so.4.3.0
+%attr(755,root,root) %{_libdir}/kde4/krdc_rdpplugin.so
+%attr(755,root,root) %{_libdir}/kde4/krdc_testplugin.so
+%attr(755,root,root) %{_libdir}/kde4/krdc_vncplugin.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_krdc_rdpplugin.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_krdc_vncplugin.so
 %{_datadir}/apps/krdc
 %{_datadir}/apps/krfb
 %{_datadir}/config.kcfg/krdc.kcfg
 %{_datadir}/kde4/services/rdp.protocol
 %{_datadir}/kde4/services/vnc.protocol
+%{_datadir}/kde4/services/krdc_rdp.desktop
+%{_datadir}/kde4/services/krdc_rdp_config.desktop
+%{_datadir}/kde4/services/krdc_test.desktop
+%{_datadir}/kde4/services/krdc_vnc.desktop
+%{_datadir}/kde4/services/krdc_vnc_config.desktop
+%{_datadir}/kde4/servicetypes/krdc_plugin.desktop
 %{_desktopdir}/kde4/krdc.desktop
 %{_desktopdir}/kde4/krfb.desktop
 %{_kdedocdir}/en/krdc
@@ -1195,15 +1248,50 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.74  2009/06/01 05:58:26  shadzik
-- new tarball
-- rel 2
+Revision 1.75  2009/07/29 19:59:27  shadzik
+- merged from DEVEL
+
+Revision 1.71.2.12  2009/07/29 19:59:17  shadzik
+- 4.3.0
+
+Revision 1.71.2.11  2009/07/22 10:33:06  shadzik
+- 4.3rc3
+
+Revision 1.71.2.10  2009/07/13 22:44:06  shadzik
+- O: kde4-kdenetwork-kopete-tool-alias
+
+Revision 1.71.2.9  2009/07/09 19:05:47  paszczus
+- updated to 4.2.96
+
+Revision 1.71.2.8  2009/07/04 15:33:53  shadzik
+- fix --target build
+
+Revision 1.71.2.7  2009/07/04 15:00:33  shadzik
+- gg is back
+
+Revision 1.71.2.6  2009/06/30 13:06:15  shadzik
+- 4.3 RC1
+
+Revision 1.71.2.5  2009/05/30 14:52:01  paszczus
+- updated to 4.2.88, NFY
+
+Revision 1.71.2.4  2009/05/28 14:12:14  shadzik
+- baaad shadzik baad, talking shit in commitslog ;)
+- the icons are of course needed :)
+
+Revision 1.71.2.3  2009/05/28 14:06:26  shadzik
+- %files
+- add new -kopete-protocol-skype subpackage
+- TODO: mozillashit for skype protocol needs packaging
+- icons are probably conflicting with kde4-oxygen-icons (i hope so, 'coz otherwise kde is making an icon mess yet again)
 
-Revision 1.73  2009/05/28 23:20:04  shadzik
-- 4.2.4 try #1
+Revision 1.71.2.2  2009/05/28 13:42:20  shadzik
+- fix build
 
-Revision 1.72  2009/05/28 19:43:25  arekm
-- rel 4; branch diff update
+Revision 1.71.2.1  2009/05/28 07:38:00  paszczus
+- updated to 4.2.87
+- added BR: libv4l-devel
+- NFY (WebKitKDE missing)
 
 Revision 1.71  2009/05/08 15:02:09  shadzik
 - release 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork.spec?r1=1.74&r2=1.75&f=u



More information about the pld-cvs-commit mailing list