Hello community, here is the log from the commit of package kdenetwork4 checked in at Sun Jun 3 21:36:57 CEST 2007. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2007-05-28 23:19:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-06-01 13:53:11.139436000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 1 13:31:58 CEST 2007 - coolo@suse.de + +- simplify spec file by using macros from kde4-filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.b24527/_old 2007-06-03 21:36:47.000000000 +0200 +++ /var/tmp/diff_new_pack.b24527/_new 2007-06-03 21:36:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdenetwork4 (Version 3.90.1.svn668132) +# spec file for package kdenetwork4 (Version 3.90.1.svn670093) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ Group: Productivity/Networking/Other Summary: kdenetwork base package URL: http://www.kde.org -Version: 3.90.1.svn668132 +Version: 3.90.1.svn670093 Release: 1 Source0: kdenetwork.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,7 +32,6 @@ Suggests: kde4-kwifimanager Suggests: kde4-kdnssd Suggests: kdenetwork4-filesharing -%define prefix /usr %description This package suggests the packages which are built from the kdenetwork @@ -49,21 +48,12 @@ %patch %build - export CFLAGS="$RPM_OPT_FLAGS" - export CXXFLAGS="$CFLAGS" - mkdir build - cd build - %ifarch x86_64 ppc64 s390x mips64 sparc64 - cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../ -DLIB_INSTALL_DIR=%prefix/%_lib - %else - cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull ../ - %endif - make + %cmake_kde4 -d build + %make_jobs %install cd build - make install \ - DESTDIR="$RPM_BUILD_ROOT" + %makeinstall # FIXME: contact security team chmod u-s $RPM_BUILD_ROOT/usr/bin/kppp %suse_update_desktop_file fileshare @@ -76,7 +66,7 @@ %suse_update_desktop_file -u knewsticker-standalone Network News %suse_update_desktop_file kget -r System TrayIcon %suse_update_desktop_file krfb -r System RemoteAccess - + %kde_post_install %post -p /sbin/ldconfig @@ -112,8 +102,10 @@ /usr/%_lib/kde4/kdict_panelapplet.so /usr/%_lib/libkdeinit4_kdict.so /usr/share/applications/kde4/kdict.desktop -/usr/share/apps/kdict -/usr/share/apps/kicker/applets/kdictapplet.desktop + +%_kde_share_dir/apps/kdict + +%_kde_share_dir/apps/kicker/applets/kdictapplet.desktop /usr/share/dbus-1/interfaces/org.kde.kdict.xml %doc %lang(en) /usr/share/doc/HTML/en/kdict /usr/share/icons/hicolor/*/apps/kdict.* @@ -161,23 +153,40 @@ /usr/%_lib/libkopete_videodevice.so.* /usr/%_lib/libkopeteaddaccountwizard.so.* /usr/share/applications/kde4/kopete.desktop -/usr/share/apps/kconf_update/kopete-account-0.10.pl -/usr/share/apps/kconf_update/kopete-account-kconf_update.sh -/usr/share/apps/kconf_update/kopete-account-kconf_update.upd -/usr/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh -/usr/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd -/usr/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh -/usr/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd -/usr/share/apps/kconf_update/kopete-nameTracking.upd -/usr/share/apps/kconf_update/kopete-pluginloader.pl -/usr/share/apps/kconf_update/kopete-pluginloader.upd -/usr/share/apps/kconf_update/kopete-pluginloader2.sh -/usr/share/apps/kconf_update/kopete-pluginloader2.upd -/usr/share/apps/kopete -/usr/share/config.kcfg/kopeteappearancesettings.kcfg -/usr/share/config.kcfg/kopetebehaviorsettings.kcfg -/usr/share/config.kcfg/kopetegeneralsettings.kcfg -/usr/share/config.kcfg/kopeteidentityconfigpreferences.kcfg + +%_kde_share_dir/apps/kconf_update/kopete-account-0.10.pl + +%_kde_share_dir/apps/kconf_update/kopete-account-kconf_update.sh + +%_kde_share_dir/apps/kconf_update/kopete-account-kconf_update.upd + +%_kde_share_dir/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh + +%_kde_share_dir/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd + +%_kde_share_dir/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh + +%_kde_share_dir/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd + +%_kde_share_dir/apps/kconf_update/kopete-nameTracking.upd + +%_kde_share_dir/apps/kconf_update/kopete-pluginloader.pl + +%_kde_share_dir/apps/kconf_update/kopete-pluginloader.upd + +%_kde_share_dir/apps/kconf_update/kopete-pluginloader2.sh + +%_kde_share_dir/apps/kconf_update/kopete-pluginloader2.upd + +%_kde_share_dir/apps/kopete + +%_kde_share_dir/config.kcfg/kopeteappearancesettings.kcfg + +%_kde_share_dir/config.kcfg/kopetebehaviorsettings.kcfg + +%_kde_share_dir/config.kcfg/kopetegeneralsettings.kcfg + +%_kde_share_dir/config.kcfg/kopeteidentityconfigpreferences.kcfg /usr/share/dbus-1/interfaces/org.kde.kopete.Client.xml %doc %lang(en) /usr/share/doc/HTML/en/kopete /usr/share/icons/oxygen/*/actions/kopeteavailable.* @@ -198,30 +207,49 @@ /usr/share/icons/oxygen/*/actions/webcamreceive.* /usr/share/icons/oxygen/*/actions/webcamsend.* /usr/share/icons/hicolor/*/apps/kopete.* -%dir /usr/share/kde4/services/kconfiguredialog -/usr/share/kde4/services/kconfiguredialog/kopete_*.desktop -/usr/share/kde4/services/kopete_*.desktop -/usr/share/kde4/servicetypes/kopeteplugin.desktop -/usr/share/kde4/servicetypes/kopeteprotocol.desktop -/usr/share/kde4/servicetypes/kopeteui.desktop +%dir %_kde_share_dir/services/kconfiguredialog + +%_kde_share_dir/services/kconfiguredialog/kopete_*.desktop + +%_kde_share_dir/services/kopete_*.desktop + +%_kde_share_dir/servicetypes/kopeteplugin.desktop + +%_kde_share_dir/servicetypes/kopeteprotocol.desktop + +%_kde_share_dir/servicetypes/kopeteui.desktop /usr/share/sounds/Kopete_Event.ogg /usr/share/sounds/Kopete_Received.ogg /usr/share/sounds/Kopete_Sent.ogg /usr/share/sounds/Kopete_User_is_Online.ogg -/usr/share/apps/kopete_contactnotes -/usr/share/apps/kopete_cryptography -/usr/share/apps/kopete_history -/usr/share/apps/kopete_jabber -/usr/share/apps/kopete_latex -/usr/share/apps/kopete_msn -/usr/share/apps/kopete_privacy -/usr/share/apps/kopete_translator -/usr/share/apps/kopete_yahoo -/usr/share/apps/kopeterichtexteditpart -/usr/share/kde4/services/aim.protocol -/usr/share/kde4/services/chatwindow.desktop -/usr/share/kde4/services/emailwindow.desktop -/usr/share/kde4/services/xmpp.protocol + +%_kde_share_dir/apps/kopete_contactnotes + +%_kde_share_dir/apps/kopete_cryptography + +%_kde_share_dir/apps/kopete_history + +%_kde_share_dir/apps/kopete_jabber + +%_kde_share_dir/apps/kopete_latex + +%_kde_share_dir/apps/kopete_msn + +%_kde_share_dir/apps/kopete_privacy + +%_kde_share_dir/apps/kopete_translator + +%_kde_share_dir/apps/kopete_yahoo + +%_kde_share_dir/apps/kopeterichtexteditpart + +%_kde_share_dir/services/aim.protocol + +%_kde_share_dir/services/chatwindow.desktop + +%_kde_share_dir/services/emailwindow.desktop + +%_kde_share_dir/services/xmpp.protocol /usr/share/icons/hicolor/*/actions/emoticon.* /usr/share/icons/hicolor/*/actions/kopeteavailable.* /usr/share/icons/hicolor/*/actions/kopeteaway.* @@ -236,9 +264,12 @@ /usr/share/icons/oxygen/*/apps/kopete_some_online.* /usr/share/icons/oxygen/*/actions/add_user.* /usr/share/icons/oxygen/*/actions/newmessage.mng -/usr/share/config.kcfg/historyconfig.kcfg -/usr/share/config.kcfg/latexconfig.kcfg -/usr/share/config.kcfg/nowlisteningconfig.kcfg + +%_kde_share_dir/config.kcfg/historyconfig.kcfg + +%_kde_share_dir/config.kcfg/latexconfig.kcfg + +%_kde_share_dir/config.kcfg/nowlisteningconfig.kcfg /usr/share/icons/oxygen/*/actions/account_offline_overlay.* /usr/share/icons/oxygen/*/actions/contact_away_overlay.* /usr/share/icons/oxygen/*/actions/contact_busy_overlay.* @@ -277,7 +308,8 @@ /usr/bin/kppplogview /usr/share/applications/kde4/Kppp.desktop /usr/share/applications/kde4/kppplogview.desktop -/usr/share/apps/kppp + +%_kde_share_dir/apps/kppp /usr/share/dbus-1/interfaces/org.kde.kppp.xml %doc %lang(en) /usr/share/doc/HTML/en/kppp /usr/share/icons/hicolor/*/apps/kppp.* @@ -307,13 +339,17 @@ %doc COPYING COPYING-DOCS README /usr/bin/krdc /usr/share/applications/kde4/krdc.desktop -/usr/share/apps/krdc + +%_kde_share_dir/apps/krdc %doc %lang(en) /usr/share/doc/HTML/en/krdc -/usr/share/kde4/services/rdp.protocol -/usr/share/kde4/services/vnc.protocol -%dir /usr/share/apps/konqueror -%dir /usr/share/apps/konqueror/servicemenus -/usr/share/apps/konqueror/servicemenus/smb2rdc.desktop + +%_kde_share_dir/services/rdp.protocol + +%_kde_share_dir/services/vnc.protocol +%dir %_kde_share_dir/apps/konqueror +%dir %_kde_share_dir/apps/konqueror/servicemenus + +%_kde_share_dir/apps/konqueror/servicemenus/smb2rdc.desktop /usr/share/icons/hicolor/*/apps/krdc.* %package -n kde4-krfb Group: Productivity/Networking/Other @@ -340,11 +376,12 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/bin/krfb -/usr/share/apps/krfb + +%_kde_share_dir/apps/krfb /usr/share/applications/kde4/krfb.desktop #/usr/share/dbus-1/interfaces/org.kde.krfb.xml %doc %lang(en) /usr/share/doc/HTML/en/krfb -#/usr/share/kde4/services/kinetd_krfb.desktop +#%_kde_share_dir/services/kinetd_krfb.desktop /usr/share/icons/hicolor/*/apps/krfb.* %package -n kde4-knewsticker Group: Productivity/Networking/News/Clients @@ -376,10 +413,14 @@ %dir /usr/share/applnk %dir /usr/share/applnk/.hidden /usr/share/applnk/.hidden/knewstickerstub.desktop -/usr/share/apps/kconf_update/knewsticker.upd -/usr/share/apps/kconf_update/knt-0.1-0.2.pl -/usr/share/apps/kicker/applets/knewsticker.desktop -/usr/share/apps/knewsticker + +%_kde_share_dir/apps/kconf_update/knewsticker.upd + +%_kde_share_dir/apps/kconf_update/knt-0.1-0.2.pl + +%_kde_share_dir/apps/kicker/applets/knewsticker.desktop + +%_kde_share_dir/apps/knewsticker %doc %lang(en) /usr/share/doc/HTML/en/knewsticker /usr/share/icons/hicolor/*/apps/knewsticker.* %package -n kde4-lisa @@ -408,18 +449,25 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/sbin/lisad -/usr/share/apps/konqsidebartng/virtual_folders/services/lisa.desktop -/usr/share/apps/lisa + +%_kde_share_dir/apps/konqsidebartng/virtual_folders/services/lisa.desktop + +%_kde_share_dir/apps/lisa %doc %lang(en) /usr/share/doc/HTML/en/lisa -/usr/share/kde4/services/kcmlisa.desktop + +%_kde_share_dir/services/kcmlisa.desktop /usr/%_lib/kde4/kio_lan.so -/usr/share/kde4/services/kcmkiolan.desktop -/usr/share/kde4/services/lan.protocol + +%_kde_share_dir/services/kcmkiolan.desktop + +%_kde_share_dir/services/lan.protocol %doc %lang(en) /usr/share/doc/HTML/en/lanbrowser /usr/%_lib/kde4/kcm_lanbrowser.so -%dir /usr/share/apps/konqueror -/usr/share/apps/konqueror/dirtree -/usr/share/apps/remoteview/lan.desktop +%dir %_kde_share_dir/apps/konqueror + +%_kde_share_dir/apps/konqueror/dirtree + +%_kde_share_dir/apps/remoteview/lan.desktop %package -n kde4-kwifimanager Group: Productivity/Networking/Other Summary: Wireless LAN Manager @@ -446,8 +494,10 @@ %doc COPYING COPYING-DOCS README /usr/bin/kwifimanager /usr/share/applications/kde4/kwifimanager.desktop -/usr/share/apps/kwifimanager -/usr/share/config.kcfg/kwifimanager.kcfg + +%_kde_share_dir/apps/kwifimanager + +%_kde_share_dir/config.kcfg/kwifimanager.kcfg %doc %lang(en) /usr/share/doc/HTML/en/kwifimanager /usr/share/icons/hicolor/*/apps/kwifimanager.* %package -n kde4-kdnssd @@ -474,13 +524,17 @@ %files -n kde4-kdnssd %defattr(-,root,root) %doc COPYING COPYING-DOCS README -/usr/share/apps/zeroconf -/usr/share/kde4/services/kded/dnssdwatcher.desktop -/usr/share/kde4/services/zeroconf.protocol -#/usr/share/kde4/services/invitation.protocol + +%_kde_share_dir/apps/zeroconf + +%_kde_share_dir/services/kded/dnssdwatcher.desktop + +%_kde_share_dir/services/zeroconf.protocol +#%_kde_share_dir/services/invitation.protocol /usr/%_lib/kde4/kded_dnssdwatcher.so /usr/%_lib/kde4/kio_zeroconf.so -/usr/share/apps/remoteview/zeroconf.desktop + +%_kde_share_dir/apps/remoteview/zeroconf.desktop /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml %package filesharing Group: Productivity/Networking/System @@ -515,7 +569,8 @@ /usr/share/applications/kde4/fileshare.desktop /usr/share/applications/kde4/kcmsambaconf.desktop /usr/share/icons/hicolor/*/apps/kcmsambaconf.* -/usr/share/kde4/services/fileshare_propsdlgplugin.desktop + +%_kde_share_dir/services/fileshare_propsdlgplugin.desktop %package -n kde4-kget Group: Productivity/Networking/Other Summary: Download Manager @@ -546,18 +601,26 @@ /usr/%_lib/kde4/libkget_multisegkiofactory.so /usr/%_lib/libkgetcore.so.* /usr/share/applications/kde4/kget.desktop -/usr/share/apps/kget -/usr/share/apps/khtml/kpartplugins/kget_plug_in.rc -%dir /usr/share/apps/konqueror -%dir /usr/share/apps/konqueror/servicemenus -/usr/share/apps/konqueror/servicemenus/kget_download.desktop -/usr/share/config.kcfg/kget.kcfg -/usr/share/config.kcfg/kget_multisegkiofactory.kcfg + +%_kde_share_dir/apps/kget + +%_kde_share_dir/apps/khtml/kpartplugins/kget_plug_in.rc +%dir %_kde_share_dir/apps/konqueror +%dir %_kde_share_dir/apps/konqueror/servicemenus + +%_kde_share_dir/apps/konqueror/servicemenus/kget_download.desktop + +%_kde_share_dir/config.kcfg/kget.kcfg + +%_kde_share_dir/config.kcfg/kget_multisegkiofactory.kcfg /usr/share/icons/crystalsvg/*/apps/kget.* /usr/share/icons/crystalsvg/*/mimetypes/kget_list.* -/usr/share/kde4/services/kget_kiofactory.desktop -/usr/share/kde4/services/kget_multisegkiofactory.desktop -/usr/share/kde4/servicetypes/kget_plugin.desktop + +%_kde_share_dir/services/kget_kiofactory.desktop + +%_kde_share_dir/services/kget_multisegkiofactory.desktop + +%_kde_share_dir/servicetypes/kget_plugin.desktop /usr/share/sounds/KGet_Added.ogg /usr/share/sounds/KGet_Finished.ogg /usr/share/sounds/KGet_Finished_All.ogg @@ -600,6 +663,8 @@ %_libdir/libiris_kopete.so %changelog +* Fri Jun 01 2007 - coolo@suse.de +- simplify spec file by using macros from kde4-filesystem * Mon May 28 2007 - dmueller@suse.de - update to 3.90.1.svn668119 * Wed May 23 2007 - dmueller@suse.de ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.b24527/_old 2007-06-03 21:36:47.000000000 +0200 +++ /var/tmp/diff_new_pack.b24527/_new 2007-06-03 21:36:47.000000000 +0200 @@ -1,15 +1,7 @@ ---- filesharing/simple/fileshare.desktop 2007/05/13 14:53:42 1.1 -+++ filesharing/simple/fileshare.desktop 2007/05/13 14:53:50 -@@ -1,7 +1,6 @@ - [Desktop Entry] - Encoding=UTF-8 - Exec=kcmshell fileshare --Icon=share - Type=Application - - X-KDE-ModuleType=Library ---- ./kget/desktop/kget.desktop 2007/05/13 16:09:22 1.1 -+++ ./kget/desktop/kget.desktop 2007/05/13 16:09:34 +Index: kget/desktop/kget.desktop +=================================================================== +--- kget/desktop/kget.desktop (Revision 670620) ++++ kget/desktop/kget.desktop (Arbeitskopie) @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Application @@ -18,3 +10,15 @@ Terminal=false Name=KGet Name[ar]=ك.جيت +Index: filesharing/simple/fileshare.desktop +=================================================================== +--- filesharing/simple/fileshare.desktop (Revision 670620) ++++ filesharing/simple/fileshare.desktop (Arbeitskopie) +@@ -1,7 +1,6 @@ + [Desktop Entry] + Encoding=UTF-8 + Exec=kcmshell fileshare +-Icon=share + Type=Service + ServiceTypes=KCModule + ++++++ kdenetwork.tar.bz2 ++++++ KDE/kdenetwork4/kdenetwork.tar.bz2 /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org