Author: neoclust
Date: Sun Feb  4 13:18:55 2007
New Revision: 116136

Added:
   packages/cooker/wengophone/current/SOURCES/wengophone-2.1-rev9596.tar.bz2   
(contents, props changed)
Removed:
   packages/cooker/wengophone/current/SOURCES/wengophone-2.1-rev9400.tar.bz2
Modified:
   packages/cooker/wengophone/current/SOURCES/wengophone-2.1-fixinstall.patch
   packages/cooker/wengophone/current/SPECS/wengophone.spec

Log:
- New snapshot
- Fix install patch


Modified: 
packages/cooker/wengophone/current/SOURCES/wengophone-2.1-fixinstall.patch
==============================================================================
--- packages/cooker/wengophone/current/SOURCES/wengophone-2.1-fixinstall.patch  
(original)
+++ packages/cooker/wengophone/current/SOURCES/wengophone-2.1-fixinstall.patch  
Sun Feb  4 13:18:55 2007
@@ -1,1074 +1,54 @@
---- wengophone/src/presentation/qt/CMakeLists.txt.install      2007-01-24 
13:11:14.000000000 +0100
-+++ wengophone/src/presentation/qt/CMakeLists.txt      2007-01-24 
13:11:29.000000000 +0100
-@@ -1,533 +1,537 @@
--if (APPLE)
--      ow_create_executable(WengoPhone)
--else (APPLE)
--      ow_create_executable(qtwengophone)
--endif (APPLE)
--
--subdirs(
--      pics/emoticons
--)
--
--ow_use_private_libraries(
--      owphone
--      owbuildid
--      owqtutil
--      owpixertool
--      owwebcam
--      owidle
--      owtrayicon
--      owbrowser
--      owsoftupdater
--)
--
--if (MSVC)
--      ow_use_private_libraries(
--              owmemorydump
--      )
--endif (MSVC)
--
--if (SIPWRAPPER_BACKEND_SIPX)
--      ow_add_private_definitions(
--              -DSIPXWRAPPER
--      )
--
--      ow_use_private_libraries(
--              sipxwrapper
--      )
--else (SIPWRAPPER_BACKEND_SIPX)
--if (SIPWRAPPER_BACKEND_PHAPI)
--      ow_add_private_definitions(
--              -DPHAPIWRAPPER
--      )
--
--      ow_use_private_libraries(
--              owphapiwrapper
--      )
--else (SIPWRAPPER_BACKEND_PHAPI)
--if (IMWRAPPER_BACKEND_MULTI)
--      ow_add_private_definitions(
--              -DMULTIIMWRAPPER
--      )
--
--      ow_use_private_libraries(
--              owmultiimwrapper
--      )
--endif (IMWRAPPER_BACKEND_MULTI)
--endif (SIPWRAPPER_BACKEND_PHAPI)
--endif (SIPWRAPPER_BACKEND_SIPX)
--
--ow_add_private_include_dirs(
--      ${CMAKE_CURRENT_BINARY_DIR}
--      ${CMAKE_CURRENT_SOURCE_DIR}
--)
--
--qt4_wrap_cpp(${PROJECT_NAME}_SRCS
--      QtWengoPhone.h
--      QtConfigPanel.h
--      QtDialpad.h
--      QtSVGDialpad.h
--      QtWebcamButton.h
--      QtHttpProxyLogin.h
--      QtIdle.h
--      QtLanguage.h
--      QtToolBar.h
--      QtSystray.h
--      QtFactory.h
--      QtPresenceMenuManager.h
--      QtBrowserWidget.h
--      QtIMAccountMonitor.h
--
--      phoneline/QtPhoneLine.h
--
--      phonecall/QtPhoneCall.h
--      phonecall/QtVideoQt.h
--      phonecall/QtContactCallList.h
--      phonecall/QtContactCallListWidget.h
--      phonecall/QtPhoneCallEventFilter.h
--
--      toaster/QtChatToaster.h
--      toaster/QtCallToaster.h
--      toaster/QtToaster.h
--
--      login/QtLogin.h
--
--      profile/QtProfileDetails.h
--      profile/QtUserProfile.h
--      profile/QtUserProfileHandler.h
--
--      imcontact/QtIMContactManager.h
--      imcontact/QtAddIMContact.h
--      imcontact/QtSimpleIMContactManager.h
--
--      imaccount/QtIMAccountManager.h
--      imaccount/QtSimpleIMAccountManager.h
--      imaccount/QtIMAccountSettings.h
--      imaccount/QtIMAccountPlugin.h
--      imaccount/QtMSNSettings.h
--      imaccount/QtYahooSettings.h
--      imaccount/QtAIMSettings.h
--      imaccount/QtJabberSettings.h
--      imaccount/QtGoogleTalkSettings.h
--
--      contactlist/QtContactList.h
--      contactlist/ContactGroupPopupMenu.h
--      contactlist/QtContactWidget.h
--      contactlist/QtContactTreeMouseFilter.h
--      contactlist/QtContactManager.h
--      contactlist/QtContact.h
--      contactlist/QtTreeViewDelegate.h
--      contactlist/QtContactTreeKeyFilter.h
--      contactlist/QtRenameGroup.h
--      contactlist/QtConferenceAction.h
--
--      conference/QtConferenceCallWidget.h
--
--      chat/emoticons/QtEmoticonsWidget.h
--      chat/emoticons/QtEmoticonButton.h
--      chat/chatroom/QtChatRoomInviteDlg.h
--      chat/QtChatEditEventManager.h
--      chat/QtChatTabWidget.h
--      chat/QtChatAvatarFrame.h
--      chat/QtChatAvatarWidget.h
--      chat/QtChatHandler.h
--      chat/QtChatWidget.h
--      chat/QtChatWindow.h
--      chat/QtChatEditWidget.h
--      chat/QtChatHistoryWidget.h
--      chat/QtChatEditActionBarWidget.h
--      chat/QtWengoStyleBar.h
--
--      webservices/sms/QtSms.h
--      webservices/softupdate/QtSoftUpdate.h
--      webservices/softupdate/QtBrowserSoftUpdate.h
--      webservices/directory/QtWsDirectory.h
--      webservices/directory/QtWsDirectoryContact.h
--
--      callbar/QtCallBar.h
--      callbar/QtPhoneComboBox.h
--
--      statusbar/QtStatusBar.h
--
--      config/QtAdvancedConfig.h
--      config/QtAccountSettings.h
--      config/QtAdvancedSettings.h
--      config/QtAudioSettings.h
--      config/QtAudioCodecSettings.h
--      config/QtCallForwardSettings.h
--      config/QtGeneralSettings.h
--      config/QtNotificationSettings.h
--      config/QtPrivacySettings.h
--      config/QtVideoSettings.h
--      config/QtLanguagesSettings.h
--      config/QtWengoConfigDialog.h
--
--      profilebar/QtEventWidget.h
--      profilebar/QtIMProfileWidget.h
--      profilebar/QtProfileBar.h
--      profilebar/QtCreditWidget.h
--      profilebar/QtIMAccountPresenceMenuManager.h
--
--      history/QtHistoryWidget.h
--      history/QtHistory.h
--
--      filetransfer/QtFileTransfer.h
--      filetransfer/QtFileTransferAcceptDialog.h
--      filetransfer/QtFileTransferWidget.h
--      filetransfer/QtFileTransferItem.h
--      filetransfer/QtFileTransferDownloadItem.h
--      filetransfer/QtFileTransferUploadItem.h
--      filetransfer/QtFileTransferNotifyDialog.h
--
--      webdirectory/QtWebDirectory.h
--)
--
--ow_add_sources(
--      ../main.cpp
--      QtWengoPhone.cpp
--      QtConfigPanel.cpp
--      QtDialpad.cpp
--      QtSVGDialpad.cpp
--      QtWebcamButton.cpp
--      QtAbout.cpp
--      QtHttpProxyLogin.cpp
--      QtIdle.cpp
--      QtEnumIMProtocol.cpp
--      QtLanguage.cpp
--      QtToolBar.cpp
--      QtSystray.cpp
--      QtFactory.cpp
--      QtPresenceMenuManager.cpp
--      QtWengoStyle.cpp
--      QtBrowserWidget.cpp
--      QtIMAccountMonitor.cpp
--      QtPresencePixmapHelper.cpp
--      QtIMAccountHelper.cpp
--
--      phoneline/QtPhoneLine.cpp
--
--      phonecall/QtPhoneCall.cpp
--      phonecall/QtVideo.cpp
--      phonecall/QtVideoQt.cpp
--      phonecall/QtContactCallList.cpp
--      phonecall/QtContactCallListWidget.cpp
--      phonecall/QtPhoneCallEventFilter.cpp
--
--      toaster/QtChatToaster.cpp
--      toaster/QtCallToaster.cpp
--      toaster/QtToaster.cpp
--
--      login/QtLogin.cpp
--
--      imcontact/QtIMContactManager.cpp
--      imcontact/QtAddIMContact.cpp
--      imcontact/QtIMContactItem.cpp
--      imcontact/QtSimpleIMContactManager.cpp
--
--      profile/QtProfileDetails.cpp
--      profile/QtUserProfile.cpp
--      profile/QtUserProfileHandler.cpp
--
--      imaccount/QtIMAccountItem.cpp
--      imaccount/QtIMAccountManager.cpp
--      imaccount/QtSimpleIMAccountManager.cpp
--      imaccount/QtIMAccountSettings.cpp
--      imaccount/QtIMAccountPlugin.cpp
--      imaccount/QtMSNSettings.cpp
--      imaccount/QtYahooSettings.cpp
--      imaccount/QtAIMSettings.cpp
--      imaccount/QtJabberSettings.cpp
--      imaccount/QtGoogleTalkSettings.cpp
--
--      wenbox/QtWenboxPlugin.cpp
--
--      contactlist/QtContactList.cpp
--      contactlist/ContactGroupPopupMenu.cpp
--      contactlist/QtContactWidget.cpp
--      contactlist/QtContactTreeMouseFilter.cpp
--      contactlist/QtContactManager.cpp
--      contactlist/QtContactListManager.cpp
--      contactlist/QtContact.cpp
--      contactlist/QtTreeViewDelegate.cpp
--      contactlist/QtContactPixmap.cpp
--      contactlist/QtContactInfo.cpp
--      contactlist/QtContactTreeKeyFilter.cpp
--      contactlist/QtRenameGroup.cpp
--      contactlist/QtConferenceAction.cpp
--      contactlist/QtContactMenu.cpp
--
--      conference/QtConferenceCallWidget.cpp
--
--      chat/emoticons/QtEmoticonsWidget.cpp
--      chat/emoticons/QtEmoticon.cpp
--      chat/emoticons/QtEmoticonButton.cpp
--      chat/emoticons/QtEmoticonsManager.cpp
--      chat/chatroom/QtChatRoomInviteDlg.cpp
--      chat/chatroom/QtChatRoomTreeWidgetItem.cpp
--      chat/chatroom/QtChatRoomListWidgetItem.cpp
--      chat/QtChatTabWidget.cpp
--      chat/QtChatAvatarFrame.cpp
--      chat/QtChatAvatarWidget.cpp
--      chat/QtChatHandler.cpp
--      chat/QtChatWidget.cpp
--      chat/QtChatEditEventManager.cpp
--      chat/QtChatWindow.cpp
--      chat/QtChatEditWidget.cpp
--      chat/QtChatHistoryWidget.cpp
--      chat/QtChatEditActionBarWidget.cpp
--      chat/QtWengoStyleBar.cpp
--      chat/QtChatUtils.cpp
--
--      webservices/sms/QtSms.cpp
--      webservices/softupdate/QtSoftUpdate.cpp
--      webservices/softupdate/QtBrowserSoftUpdate.cpp
--      webservices/directory/QtWsDirectory.cpp
--      webservices/directory/QtWsDirectoryContact.cpp
--
--      callbar/QtCallBar.cpp
--      callbar/QtPhoneComboBox.cpp
--
--      statusbar/QtStatusBar.cpp
--
--      config/QtAdvancedConfig.cpp
--      config/QtAccountSettings.cpp
--      config/QtAdvancedSettings.cpp
--      config/QtAudioSettings.cpp
--      config/QtAudioCodecSettings.cpp
--      config/QtCallForwardSettings.cpp
--      config/QtGeneralSettings.cpp
--      config/QtNotificationSettings.cpp
--      config/QtPrivacySettings.cpp
--      config/QtVideoSettings.cpp
--      config/QtLanguagesSettings.cpp
--      config/QtWengoConfigDialog.cpp
--
--      profilebar/QtEventWidget.cpp
--      profilebar/QtIMProfileWidget.cpp
--      profilebar/QtCreditWidget.cpp
--      profilebar/QtProfileBar.cpp
--      profilebar/QtIMAccountPresenceMenuManager.cpp
--
--      history/QtHistoryWidget.cpp
--      history/QtHistoryItem.cpp
--      history/QtHistory.cpp
--
--      filetransfer/QtFileTransfer.cpp
--      filetransfer/QtFileTransferAcceptDialog.cpp
--      filetransfer/QtFileTransferWidget.cpp
--      filetransfer/QtFileTransferItem.cpp
--      filetransfer/QtFileTransferDownloadItem.cpp
--      filetransfer/QtFileTransferUploadItem.cpp
--      filetransfer/QtFileTransferNotifyDialog.cpp
--
--      webdirectory/QtWebDirectory.cpp
--)
--
--if (WIN32)
--      ow_add_sources(
--              win32/wengophone.rc
--      )
--endif (WIN32)
--
--if (UNIX AND NOT WIN32)
--      if (APPLE)
--              qt4_wrap_cpp(${PROJECT_NAME}_SRCS
--                      chat/QtCloseChatTabWidget.h
--                      macosx/QtMacApplication.h
--              )
--
--              ow_add_sources(
--                      chat/QtCloseChatTabWidget.cpp
--                      macosx/QtMacApplication.cpp
--              )
--      else (APPLE)
--              if (WENGOPHONE_XV_SUPPORT)
--                      if (X11_XV_FOUND)
--                              ow_use_private_libraries(
--                                      x11
--                              )
--
--                              ow_add_private_definitions(
--                                      -DXV_HWACCEL
--                              )
--
--                              qt4_wrap_cpp(${PROJECT_NAME}_SRCS
--                                      phonecall/XVWindow.h
--                                      phonecall/QtVideoXV.h
--                              )
--
--                              ow_add_sources(
--                                      phonecall/XVWindow.cpp
--                                      phonecall/QtVideoXV.cpp
--                              )
--                      endif (X11_XV_FOUND)
--              endif (WENGOPHONE_XV_SUPPORT)
--      endif (APPLE)
--endif (UNIX AND NOT WIN32)
--
--qt4_wrap_ui(${PROJECT_NAME}_SRCS
--      WengoPhoneWindow.ui
--      WengoPhoneWindowConfigPanel.ui
--      AboutWindow.ui
--      HttpProxyLoginWindow.ui
--      DialpadWidget.ui
--
--      login/LoginWindow.ui
--
--      imaccount/IMAccountTemplate.ui
--      imaccount/AIMSettings.ui
--      imaccount/GoogleTalkSettings.ui
--      imaccount/IMAccountManager.ui
--      imaccount/SimpleIMAccountManager.ui
--      imaccount/JabberSettings.ui
--      imaccount/MSNSettings.ui
--      imaccount/YahooSettings.ui
--
--      profile/ProfileDetails.ui
--
--      imcontact/IMContactManager.ui
--      imcontact/AddIMContact.ui
--      imcontact/SimpleIMContactManager.ui
--
--      webservices/directory/WsDirectory.ui
--      webservices/directory/WsDirectoryContact.ui
--      webservices/sms/SmsWindow.ui
--      webservices/softupdate/SoftUpdateWindow.ui
--      webservices/softupdate/BrowserSoftUpdateWindow.ui
--
--      conference/ConferenceCallWidget.ui
--
--      config/AccountSettings.ui
--      config/AdvancedConfigWindow.ui
--      config/GeneralSettings.ui
--      config/AdvancedSettings.ui
--      config/AudioSettings.ui
--      config/AudioCodecSettings.ui
--      config/CallForwardSettings.ui
--      config/LanguagesSettings.ui
--      config/ManageBlockedUsersSettings.ui
--      config/NotificationSettings.ui
--      config/PrivacySettings.ui
--      config/VideoSettings.ui
--      config/WengoConfigDialog.ui
--
--      chat/ChatMainWindow.ui
--      chat/CloseChatTabWidget.ui
--      chat/ChatWidget.ui
--      chat/UserFrame.ui
--      chat/AvatarFrame.ui
--      chat/AvatarWidget.ui
--
--      chat/chatroom/ChatRoomInviteWidget.ui
--
--      contactlist/RenameGroupDialog.ui
--      contactlist/ContactWidget.ui
--      contactlist/ContactList.ui
--
--      profilebar/CreditWidget.ui
--      profilebar/EventWidget.ui
--      profilebar/IMProfileWidget.ui
--
--      toaster/QtChatToaster.ui
--      toaster/QtCallToaster.ui
--
--      phonecall/PhoneCallWidget.ui
--      phonecall/VideoWindow.ui
--
--      filetransfer/AcceptDialog.ui
--      filetransfer/FileTransferDialog.ui
--      filetransfer/FileTransferItem.ui
--      filetransfer/NotifyDialog.ui
--
--      history/HistoryWidget.ui
--
--      statusbar/StatusBarWidget.ui
--)
--
--qt4_add_resources(${PROJECT_NAME}_SRCS
--      wengophone.qrc
--)
--
--if (APPLE)
--      ow_use_private_frameworks(
--              Cocoa
--              Carbon
--      )
--
--      ow_use_private_libraries(
--              glib2 #comes from gaimimwrapper <- gaim
--      )
--endif (APPLE)
--
--ow_create_binary(MACOSX_BUNDLE)
--
--file(GLOB tsFiles ${CMAKE_CURRENT_SOURCE_DIR}/lang/*.ts)
--ow_create_qt_qm_files(qmFiles
--      ${tsFiles}
--)
--add_custom_target(lupdate
--      DEPENDS
--              ${qmFiles}
--)
--
--if (WIN32)
--      ow_copy_dir_recursive(${CMAKE_CURRENT_SOURCE_DIR}/webpages/* 
${BUILD_DIR}/webpages/.)
--endif (WIN32)
--
--# Bugfix, spaces don't work with install target
--string(REPLACE " " "CMAKEBUGWITHSPACES" TMP_BUILD_DIR ${BUILD_DIR})
--string(REPLACE " " "CMAKEBUGWITHSPACES" TMP_SOURCE_DIR ${CMAKE_SOURCE_DIR})
--
--# Passes variables to the install script
--install(
--      CODE "
--      set(SOURCE_DIR ${TMP_SOURCE_DIR})
--      set(APPLICATION_NAME ${APPLICATION_NAME})
--      set(APPLICATION_VERSION ${APPLICATION_VERSION})
--      set(BUILD_DIR ${TMP_BUILD_DIR})
--      set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
--      set(DATA_INSTALL_DIR ${DATA_INSTALL_DIR})
--      set(INSTALLER_WITH_PDB ${INSTALLER_WITH_PDB})
--      set(SVN_REVISION ${SVN_REVISION})
--      "
--)
--
--if (APPLE)
--      set_target_properties(${PROJECT_NAME}
--              PROPERTIES
--                      COMPILE_FLAGS "-x objective-c++"
--      )
--
--      install(SCRIPT CMakeLists-install-macosx.txt)
--endif (APPLE)
--
--if (LINUX)
--       INSTALL(TARGETS
--              qtwengophone
--              RUNTIME DESTINATION bin
--       INSTALL(PROGRAMS
--              ${TMP_BUILD_DIR}/libowcurl.so
--              ${TMP_BUILD_DIR}/libowwebcam.so
--              ${TMP_BUILD_DIR}/libphamrplugin.so
--              ${TMP_BUILD_DIR}/libphapi.so
--              ${TMP_BUILD_DIR}/libphspeexplugin.so
--              ${TMP_BUILD_DIR}/libportaudio.so
--              ${TMP_BUILD_DIR}/libsfp-plugin.so
--              DESTINATION lib)
--       INSTALL(DIRECTORY
--              ${TMP_BUILD_DIR}/sounds
--              ${TMP_BUILD_DIR}/emoticons 
--              ${TMP_BUILD_DIR}/pics
--              ${TMP_BUILD_DIR}/webpages
--              ${TMP_BUILD_DIR}/lang
--              DESTINATION share/wengophone
--              PATTERN ".svn" EXCLUDE)
--       INSTALL(FILES
--              ${TMP_BUILD_DIR}/COPYING
--              DESTINATION share/wengophone)
--       #install(SCRIPT CMakeLists-install-linux.txt)
--endif (LINUX)
--
--if (WIN32)
--      # NSIS installer script
--      install(SCRIPT ../../../nsis/CMakeLists.txt)
--endif (WIN32)
-+if (APPLE)
-+      ow_create_executable(WengoPhone)
-+else (APPLE)
-+      ow_create_executable(qtwengophone)
-+endif (APPLE)
-+
-+subdirs(
-+      pics/emoticons
-+)
-+
-+ow_use_private_libraries(
-+      owphone
-+      owbuildid
-+      owqtutil
-+      owpixertool
-+      owwebcam
-+      owidle
-+      owtrayicon
-+      owbrowser
-+      owsoftupdater
-+)
-+
-+if (MSVC)
-+      ow_use_private_libraries(
-+              owmemorydump
-+      )
-+endif (MSVC)
-+
-+if (SIPWRAPPER_BACKEND_SIPX)
-+      ow_add_private_definitions(
-+              -DSIPXWRAPPER
-+      )
-+
-+      ow_use_private_libraries(
-+              sipxwrapper
-+      )
-+else (SIPWRAPPER_BACKEND_SIPX)
-+if (SIPWRAPPER_BACKEND_PHAPI)
-+      ow_add_private_definitions(
-+              -DPHAPIWRAPPER
-+      )
-+
-+      ow_use_private_libraries(
-+              owphapiwrapper
-+      )
-+else (SIPWRAPPER_BACKEND_PHAPI)
-+if (IMWRAPPER_BACKEND_MULTI)
-+      ow_add_private_definitions(
-+              -DMULTIIMWRAPPER
-+      )
-+
-+      ow_use_private_libraries(
-+              owmultiimwrapper
-+      )
-+endif (IMWRAPPER_BACKEND_MULTI)
-+endif (SIPWRAPPER_BACKEND_PHAPI)
-+endif (SIPWRAPPER_BACKEND_SIPX)
-+
-+ow_add_private_include_dirs(
-+      ${CMAKE_CURRENT_BINARY_DIR}
-+      ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
-+qt4_wrap_cpp(${PROJECT_NAME}_SRCS
-+      QtWengoPhone.h
-+      QtConfigPanel.h
-+      QtDialpad.h
-+      QtSVGDialpad.h
-+      QtWebcamButton.h
-+      QtHttpProxyLogin.h
-+      QtIdle.h
-+      QtLanguage.h
-+      QtToolBar.h
-+      QtSystray.h
-+      QtFactory.h
-+      QtPresenceMenuManager.h
-+      QtBrowserWidget.h
-+      QtIMAccountMonitor.h
-+
-+      phoneline/QtPhoneLine.h
-+
-+      phonecall/QtPhoneCall.h
-+      phonecall/QtVideoQt.h
-+      phonecall/QtContactCallList.h
-+      phonecall/QtContactCallListWidget.h
-+      phonecall/QtPhoneCallEventFilter.h
-+
-+      toaster/QtChatToaster.h
-+      toaster/QtCallToaster.h
-+      toaster/QtToaster.h
-+
-+      login/QtLogin.h
-+
-+      profile/QtProfileDetails.h
-+      profile/QtUserProfile.h
-+      profile/QtUserProfileHandler.h
-+
-+      imcontact/QtIMContactManager.h
-+      imcontact/QtAddIMContact.h
-+      imcontact/QtSimpleIMContactManager.h
-+
-+      imaccount/QtIMAccountManager.h
-+      imaccount/QtSimpleIMAccountManager.h
-+      imaccount/QtIMAccountSettings.h
-+      imaccount/QtIMAccountPlugin.h
-+      imaccount/QtMSNSettings.h
-+      imaccount/QtYahooSettings.h
-+      imaccount/QtAIMSettings.h
-+      imaccount/QtJabberSettings.h
-+      imaccount/QtGoogleTalkSettings.h
-+
-+      contactlist/QtContactList.h
-+      contactlist/ContactGroupPopupMenu.h
-+      contactlist/QtContactWidget.h
-+      contactlist/QtContactTreeMouseFilter.h
-+      contactlist/QtContactManager.h
-+      contactlist/QtContact.h
-+      contactlist/QtTreeViewDelegate.h
-+      contactlist/QtContactTreeKeyFilter.h
-+      contactlist/QtRenameGroup.h
-+      contactlist/QtConferenceAction.h
-+
-+      conference/QtConferenceCallWidget.h
-+
-+      chat/emoticons/QtEmoticonsWidget.h
-+      chat/emoticons/QtEmoticonButton.h
-+      chat/chatroom/QtChatRoomInviteDlg.h
-+      chat/QtChatEditEventManager.h
-+      chat/QtChatTabWidget.h
-+      chat/QtChatAvatarFrame.h
-+      chat/QtChatAvatarWidget.h
-+      chat/QtChatHandler.h
-+      chat/QtChatWidget.h
-+      chat/QtChatWindow.h
-+      chat/QtChatEditWidget.h
-+      chat/QtChatHistoryWidget.h
-+      chat/QtChatEditActionBarWidget.h
-+      chat/QtWengoStyleBar.h
-+
-+      webservices/sms/QtSms.h
-+      webservices/softupdate/QtSoftUpdate.h
-+      webservices/softupdate/QtBrowserSoftUpdate.h
-+      webservices/directory/QtWsDirectory.h
-+      webservices/directory/QtWsDirectoryContact.h
-+
-+      callbar/QtCallBar.h
-+      callbar/QtPhoneComboBox.h
-+
-+      statusbar/QtStatusBar.h
-+
-+      config/QtAdvancedConfig.h
-+      config/QtAccountSettings.h
-+      config/QtAdvancedSettings.h
-+      config/QtAudioSettings.h
-+      config/QtAudioCodecSettings.h
-+      config/QtCallForwardSettings.h
-+      config/QtGeneralSettings.h
-+      config/QtNotificationSettings.h
-+      config/QtPrivacySettings.h
-+      config/QtVideoSettings.h
-+      config/QtLanguagesSettings.h
-+      config/QtWengoConfigDialog.h
-+
-+      profilebar/QtEventWidget.h
-+      profilebar/QtIMProfileWidget.h
-+      profilebar/QtProfileBar.h
-+      profilebar/QtCreditWidget.h
-+      profilebar/QtIMAccountPresenceMenuManager.h
-+
-+      history/QtHistoryWidget.h
-+      history/QtHistory.h
-+
-+      filetransfer/QtFileTransfer.h
-+      filetransfer/QtFileTransferAcceptDialog.h
-+      filetransfer/QtFileTransferWidget.h
-+      filetransfer/QtFileTransferItem.h
-+      filetransfer/QtFileTransferDownloadItem.h
-+      filetransfer/QtFileTransferUploadItem.h
-+      filetransfer/QtFileTransferNotifyDialog.h
-+
-+      webdirectory/QtWebDirectory.h
-+)
-+
-+ow_add_sources(
-+      ../main.cpp
-+      QtWengoPhone.cpp
-+      QtConfigPanel.cpp
-+      QtDialpad.cpp
-+      QtSVGDialpad.cpp
-+      QtWebcamButton.cpp
-+      QtAbout.cpp
-+      QtHttpProxyLogin.cpp
-+      QtIdle.cpp
-+      QtEnumIMProtocol.cpp
-+      QtLanguage.cpp
-+      QtToolBar.cpp
-+      QtSystray.cpp
-+      QtFactory.cpp
-+      QtPresenceMenuManager.cpp
-+      QtWengoStyle.cpp
-+      QtBrowserWidget.cpp
-+      QtIMAccountMonitor.cpp
-+      QtPresencePixmapHelper.cpp
-+      QtIMAccountHelper.cpp
-+
-+      phoneline/QtPhoneLine.cpp
-+
-+      phonecall/QtPhoneCall.cpp
-+      phonecall/QtVideo.cpp
-+      phonecall/QtVideoQt.cpp
-+      phonecall/QtContactCallList.cpp
-+      phonecall/QtContactCallListWidget.cpp
-+      phonecall/QtPhoneCallEventFilter.cpp
-+
-+      toaster/QtChatToaster.cpp
-+      toaster/QtCallToaster.cpp
-+      toaster/QtToaster.cpp
-+
-+      login/QtLogin.cpp
-+
-+      imcontact/QtIMContactManager.cpp
-+      imcontact/QtAddIMContact.cpp
-+      imcontact/QtIMContactItem.cpp
-+      imcontact/QtSimpleIMContactManager.cpp
-+
-+      profile/QtProfileDetails.cpp
-+      profile/QtUserProfile.cpp
-+      profile/QtUserProfileHandler.cpp
-+
-+      imaccount/QtIMAccountItem.cpp
-+      imaccount/QtIMAccountManager.cpp
-+      imaccount/QtSimpleIMAccountManager.cpp
-+      imaccount/QtIMAccountSettings.cpp
-+      imaccount/QtIMAccountPlugin.cpp
-+      imaccount/QtMSNSettings.cpp
-+      imaccount/QtYahooSettings.cpp
-+      imaccount/QtAIMSettings.cpp
-+      imaccount/QtJabberSettings.cpp
-+      imaccount/QtGoogleTalkSettings.cpp
-+
-+      wenbox/QtWenboxPlugin.cpp
-+
-+      contactlist/QtContactList.cpp
-+      contactlist/ContactGroupPopupMenu.cpp
-+      contactlist/QtContactWidget.cpp
-+      contactlist/QtContactTreeMouseFilter.cpp
-+      contactlist/QtContactManager.cpp
-+      contactlist/QtContactListManager.cpp
-+      contactlist/QtContact.cpp
-+      contactlist/QtTreeViewDelegate.cpp
-+      contactlist/QtContactPixmap.cpp
-+      contactlist/QtContactInfo.cpp
-+      contactlist/QtContactTreeKeyFilter.cpp
-+      contactlist/QtRenameGroup.cpp
-+      contactlist/QtConferenceAction.cpp
-+      contactlist/QtContactMenu.cpp
-+
-+      conference/QtConferenceCallWidget.cpp
-+
-+      chat/emoticons/QtEmoticonsWidget.cpp
-+      chat/emoticons/QtEmoticon.cpp
-+      chat/emoticons/QtEmoticonButton.cpp
-+      chat/emoticons/QtEmoticonsManager.cpp
-+      chat/chatroom/QtChatRoomInviteDlg.cpp
-+      chat/chatroom/QtChatRoomTreeWidgetItem.cpp
-+      chat/chatroom/QtChatRoomListWidgetItem.cpp
-+      chat/QtChatTabWidget.cpp
-+      chat/QtChatAvatarFrame.cpp
-+      chat/QtChatAvatarWidget.cpp
-+      chat/QtChatHandler.cpp
-+      chat/QtChatWidget.cpp
-+      chat/QtChatEditEventManager.cpp
-+      chat/QtChatWindow.cpp
-+      chat/QtChatEditWidget.cpp
-+      chat/QtChatHistoryWidget.cpp
-+      chat/QtChatEditActionBarWidget.cpp
-+      chat/QtWengoStyleBar.cpp
-+      chat/QtChatUtils.cpp
-+
-+      webservices/sms/QtSms.cpp
-+      webservices/softupdate/QtSoftUpdate.cpp
-+      webservices/softupdate/QtBrowserSoftUpdate.cpp
-+      webservices/directory/QtWsDirectory.cpp
-+      webservices/directory/QtWsDirectoryContact.cpp
-+
-+      callbar/QtCallBar.cpp
-+      callbar/QtPhoneComboBox.cpp
-+
-+      statusbar/QtStatusBar.cpp
-+
-+      config/QtAdvancedConfig.cpp
-+      config/QtAccountSettings.cpp
-+      config/QtAdvancedSettings.cpp
-+      config/QtAudioSettings.cpp
-+      config/QtAudioCodecSettings.cpp
-+      config/QtCallForwardSettings.cpp
-+      config/QtGeneralSettings.cpp
-+      config/QtNotificationSettings.cpp
-+      config/QtPrivacySettings.cpp
-+      config/QtVideoSettings.cpp
-+      config/QtLanguagesSettings.cpp
-+      config/QtWengoConfigDialog.cpp
-+
-+      profilebar/QtEventWidget.cpp
-+      profilebar/QtIMProfileWidget.cpp
-+      profilebar/QtCreditWidget.cpp
-+      profilebar/QtProfileBar.cpp
-+      profilebar/QtIMAccountPresenceMenuManager.cpp
-+
-+      history/QtHistoryWidget.cpp
-+      history/QtHistoryItem.cpp
-+      history/QtHistory.cpp
-+
-+      filetransfer/QtFileTransfer.cpp
-+      filetransfer/QtFileTransferAcceptDialog.cpp
-+      filetransfer/QtFileTransferWidget.cpp
-+      filetransfer/QtFileTransferItem.cpp
-+      filetransfer/QtFileTransferDownloadItem.cpp
-+      filetransfer/QtFileTransferUploadItem.cpp
-+      filetransfer/QtFileTransferNotifyDialog.cpp
-+
-+      webdirectory/QtWebDirectory.cpp
-+)
-+
-+if (WIN32)
-+      ow_add_sources(
-+              win32/wengophone.rc
-+      )
-+endif (WIN32)
-+
-+if (UNIX AND NOT WIN32)
-+      if (APPLE)
-+              qt4_wrap_cpp(${PROJECT_NAME}_SRCS
-+                      chat/QtCloseChatTabWidget.h
-+                      macosx/QtMacApplication.h
-+              )
-+
-+              ow_add_sources(
-+                      chat/QtCloseChatTabWidget.cpp
-+                      macosx/QtMacApplication.cpp
-+              )
-+      else (APPLE)
-+              if (WENGOPHONE_XV_SUPPORT)
-+                      if (X11_XV_FOUND)
-+                              ow_use_private_libraries(
-+                                      x11
-+                              )
-+
-+                              ow_add_private_definitions(
-+                                      -DXV_HWACCEL
-+                              )
-+
-+                              qt4_wrap_cpp(${PROJECT_NAME}_SRCS
-+                                      phonecall/XVWindow.h
-+                                      phonecall/QtVideoXV.h
-+                              )
-+
-+                              ow_add_sources(
-+                                      phonecall/XVWindow.cpp
-+                                      phonecall/QtVideoXV.cpp
-+                              )
-+                      endif (X11_XV_FOUND)
-+              endif (WENGOPHONE_XV_SUPPORT)
-+      endif (APPLE)
-+endif (UNIX AND NOT WIN32)
-+
-+qt4_wrap_ui(${PROJECT_NAME}_SRCS
-+      WengoPhoneWindow.ui
-+      WengoPhoneWindowConfigPanel.ui
-+      AboutWindow.ui
-+      HttpProxyLoginWindow.ui
-+      DialpadWidget.ui
-+
-+      login/LoginWindow.ui
-+
-+      imaccount/IMAccountTemplate.ui
-+      imaccount/AIMSettings.ui
-+      imaccount/GoogleTalkSettings.ui
-+      imaccount/IMAccountManager.ui
-+      imaccount/SimpleIMAccountManager.ui
-+      imaccount/JabberSettings.ui
-+      imaccount/MSNSettings.ui
-+      imaccount/YahooSettings.ui
-+
-+      profile/ProfileDetails.ui
-+
-+      imcontact/IMContactManager.ui
-+      imcontact/AddIMContact.ui
-+      imcontact/SimpleIMContactManager.ui
-+
-+      webservices/directory/WsDirectory.ui
-+      webservices/directory/WsDirectoryContact.ui
-+      webservices/sms/SmsWindow.ui
-+      webservices/softupdate/SoftUpdateWindow.ui
-+      webservices/softupdate/BrowserSoftUpdateWindow.ui
-+
-+      conference/ConferenceCallWidget.ui
-+
-+      config/AccountSettings.ui
-+      config/AdvancedConfigWindow.ui
-+      config/GeneralSettings.ui
-+      config/AdvancedSettings.ui
-+      config/AudioSettings.ui
-+      config/AudioCodecSettings.ui
-+      config/CallForwardSettings.ui
-+      config/LanguagesSettings.ui
-+      config/ManageBlockedUsersSettings.ui
-+      config/NotificationSettings.ui
-+      config/PrivacySettings.ui
-+      config/VideoSettings.ui
-+      config/WengoConfigDialog.ui
-+
-+      chat/ChatMainWindow.ui
-+      chat/CloseChatTabWidget.ui
-+      chat/ChatWidget.ui
-+      chat/UserFrame.ui
-+      chat/AvatarFrame.ui
-+      chat/AvatarWidget.ui
-+
-+      chat/chatroom/ChatRoomInviteWidget.ui
-+
-+      contactlist/RenameGroupDialog.ui
-+      contactlist/ContactWidget.ui
-+      contactlist/ContactList.ui
-+
-+      profilebar/CreditWidget.ui
-+      profilebar/EventWidget.ui
-+      profilebar/IMProfileWidget.ui
-+
-+      toaster/QtChatToaster.ui
-+      toaster/QtCallToaster.ui
-+
-+      phonecall/PhoneCallWidget.ui
-+      phonecall/VideoWindow.ui
-+
-+      filetransfer/AcceptDialog.ui
-+      filetransfer/FileTransferDialog.ui
-+      filetransfer/FileTransferItem.ui
-+      filetransfer/NotifyDialog.ui
-+
-+      history/HistoryWidget.ui
-+
-+      statusbar/StatusBarWidget.ui
-+)
-+
-+qt4_add_resources(${PROJECT_NAME}_SRCS
-+      wengophone.qrc
-+)
-+
-+if (APPLE)
-+      ow_use_private_frameworks(
-+              Cocoa
-+              Carbon
-+      )
-+
-+      ow_use_private_libraries(
-+              glib2 #comes from gaimimwrapper <- gaim
-+      )
-+endif (APPLE)
-+
-+ow_create_binary(MACOSX_BUNDLE)
-+
-+file(GLOB tsFiles ${CMAKE_CURRENT_SOURCE_DIR}/lang/*.ts)
-+ow_create_qt_qm_files(qmFiles
-+      ${tsFiles}
-+)
-+add_custom_target(lupdate
-+      DEPENDS
-+              ${qmFiles}
-+)
-+
-+if (WIN32)
-+      ow_copy_dir_recursive(${CMAKE_CURRENT_SOURCE_DIR}/webpages/* 
${BUILD_DIR}/webpages/.)
-+endif (WIN32)
-+
-+# Bugfix, spaces don't work with install target
-+string(REPLACE " " "CMAKEBUGWITHSPACES" TMP_BUILD_DIR ${BUILD_DIR})
-+string(REPLACE " " "CMAKEBUGWITHSPACES" TMP_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-+
-+# Passes variables to the install script
-+install(
-+      CODE "
-+      set(SOURCE_DIR ${TMP_SOURCE_DIR})
-+      set(APPLICATION_NAME ${APPLICATION_NAME})
-+      set(APPLICATION_VERSION ${APPLICATION_VERSION})
-+      set(BUILD_DIR ${TMP_BUILD_DIR})
-+      set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
-+      set(DATA_INSTALL_DIR ${DATA_INSTALL_DIR})
-+      set(INSTALLER_WITH_PDB ${INSTALLER_WITH_PDB})
-+      set(SVN_REVISION ${SVN_REVISION})
-+      "
-+)
-+
-+if (APPLE)
-+      set_target_properties(${PROJECT_NAME}
-+              PROPERTIES
-+                      COMPILE_FLAGS "-x objective-c++"
-+      )
-+
-+      install(SCRIPT CMakeLists-install-macosx.txt)
-+endif (APPLE)
-+
-+if (LINUX)
-+      INSTALL(TARGETS
-+              qtwengophone
-+              RUNTIME DESTINATION bin)
-+      INSTALL(PROGRAMS
-+              ${TMP_BUILD_DIR}/libowcurl.so
-+              ${TMP_BUILD_DIR}/libowwebcam.so
-+              ${TMP_BUILD_DIR}/libphamrplugin.so
-+              ${TMP_BUILD_DIR}/libphapi.so
-+              ${TMP_BUILD_DIR}/libphspeexplugin.so
-+              ${TMP_BUILD_DIR}/libportaudio.so
-+              ${TMP_BUILD_DIR}/libsfp-plugin.so
-+              DESTINATION lib)
-+      set(WENGOPHONE_BASE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/wengophone")
-+      INSTALL(DIRECTORY
-+              ${WENGOPHONE_BASE_SOURCE_DIR}/sounds
-+              ${WENGOPHONE_BASE_SOURCE_DIR}/pics
-+              pics/emoticons
-+              DESTINATION share/wengophone
-+              PATTERN ".svn" EXCLUDE)
-+      INSTALL(DIRECTORY
-+              lang
-+              DESTINATION share/wengophone
-+              PATTERN ".svn" EXCLUDE
-+              PATTERN "*.qm")
-+      INSTALL(FILES
-+              ${TMP_BUILD_DIR}/COPYING
-+              DESTINATION share/wengophone)
-+      #install(SCRIPT CMakeLists-install-linux.txt)
-+endif (LINUX)
-+
-+if (WIN32)
-+      # NSIS installer script
-+      install(SCRIPT ../../../nsis/CMakeLists.txt)
-+endif (WIN32)
-\ No newline at end of file
+--- DefineInstallationPaths.cmake~     2007-02-04 12:30:46.000000000 +0100
++++ DefineInstallationPaths.cmake      2007-02-04 12:55:59.000000000 +0100
+@@ -11,10 +11,6 @@
+ if (LINUX)
+       set(DATA_COPY_DIR ${BUILD_DIR} 
+               CACHE PATH "Data/resources (sounds, translations...) copy path")
+-      set(DATA_INSTALL_DIR "/usr/share/wengophone"
++      set(DATA_INSTALL_DIR "share/wengophone"
+               CACHE PATH "Data/resources (sounds, translations...) 
installation path")
+-      set(APPLICATION_BIN_INSTALL_DIR "/usr/bin"
+-              CACHE PATH "Application binary installation path")
+-      set(LIBRARIES_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/wengophone"
+-              CACHE PATH "Libraries installation path")
+ endif (LINUX)
+--- wengophone/src/presentation/qt/CMakeLists.txt~     2007-02-04 
12:31:03.000000000 +0100
++++ wengophone/src/presentation/qt/CMakeLists.txt      2007-02-04 
12:59:25.000000000 +0100
+@@ -520,7 +520,36 @@
+ endif (APPLE)
+ 
+ if (LINUX)
+-      install(SCRIPT CMakeLists-install-linux.txt)
++       INSTALL(TARGETS
++               qtwengophone
++               RUNTIME DESTINATION bin)
++
++       INSTALL(PROGRAMS
++               ${TMP_BUILD_DIR}/libowcurl.so
++               ${TMP_BUILD_DIR}/libowwebcam.so
++               ${TMP_BUILD_DIR}/libphamrplugin.so
++               ${TMP_BUILD_DIR}/libphapi.so
++               ${TMP_BUILD_DIR}/libphspeexplugin.so
++               ${TMP_BUILD_DIR}/libportaudio.so
++               ${TMP_BUILD_DIR}/libsfp-plugin.so
++               DESTINATION lib${LIB_SUFFIX})
++
++       INSTALL(DIRECTORY
++               ${TMP_BUILD_DIR}/lang
++               DESTINATION ${DATA_INSTALL_DIR}
++               PATTERN "*.qm")
++
++       INSTALL(DIRECTORY
++               ${CMAKE_SOURCE_DIR}/wengophone/sounds
++               ${CMAKE_SOURCE_DIR}/wengophone/pics
++               pics/emoticons
++               DESTINATION ${DATA_INSTALL_DIR}
++               PATTERN ".svn" EXCLUDE
++               PATTERN "CMakeLists.txt" EXCLUDE)
++
++       INSTALL(FILES
++               ${CMAKE_SOURCE_DIR}/wengophone/COPYING
++               DESTINATION ${DATA_INSTALL_DIR})
+ endif (LINUX)
+ 
+ if (WIN32)

Added: packages/cooker/wengophone/current/SOURCES/wengophone-2.1-rev9596.tar.bz2
==============================================================================
Binary file. No diff available.

Modified: packages/cooker/wengophone/current/SPECS/wengophone.spec
==============================================================================
--- packages/cooker/wengophone/current/SPECS/wengophone.spec    (original)
+++ packages/cooker/wengophone/current/SPECS/wengophone.spec    Sun Feb  4 
13:18:55 2007
@@ -7,7 +7,7 @@
 %define major   0
 %define libname %mklibname %{name} %{major}
 
-%define  rev  9400
+%define  rev   9596
 
 Name:          wengophone
 Version:       2.1
@@ -36,6 +36,8 @@
 BuildRequires: qt4-linguist
 BuildRequires: libsndfile-devel
 
+Obsoletes:     openwengo
+
 %description
 
 Wengophone is an opensource SIP softphone (GPL licence).
@@ -80,8 +82,9 @@
 %prep
 
 %setup -q -n %name-%version
-%patch2 -p0
-#%patch3 -p0
+#%patch2 -p0
+%patch3 -p0
+
 %build
 
 export QTDIR=/usr/lib/qt4/

Reply via email to