Author: dmacvicar
Date: Tue May 29 14:52:50 2007
New Revision: 5640
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5640&view=rev
Log:
-create rpm package
-rename to opensuse-updater-kde
Added:
trunk/updater-kde/cmake/modules/FindGettext.cmake
trunk/updater-kde/package/opensuse-updater-kde.changes
- copied unchanged from r5637, trunk/updater-kde/package/opensuse-updater.changes
Removed:
trunk/updater-kde/package/opensuse-updater.changes
Modified:
trunk/updater-kde/CMakeLists.txt
trunk/updater-kde/opensuse-updater-kde.spec.in
trunk/updater-kde/po/CMakeLists.txt
trunk/updater-kde/updater/CMakeLists.txt
Modified: trunk/updater-kde/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/CMakeLists.txt?rev=5640&r1=5639&r2=5640&view=diff
==============================================================================
--- trunk/updater-kde/CMakeLists.txt (original)
+++ trunk/updater-kde/CMakeLists.txt Tue May 29 14:52:50 2007
@@ -28,7 +28,11 @@
)
INCLUDE(CPack)
+
+# dont et cmake detect Qt4 uic as Qt3 uic:
+SET(ENV{QTDIR} /usr/lib/qt3)
FIND_PACKAGE(KDE3 REQUIRED)
+FIND_PACKAGE(Gettext REQUIRED)
# Library
IF ( DEFINED LIB )
@@ -58,6 +62,7 @@
set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde)
set(KDE3_LIB_INSTALL_DIR ${LIB_INSTALL_DIR} )
set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/kde3)
+set(KDE_UIC_EXECUTABLE /usr/lib/qt3/bin/uic)
# tell cmake where to search for libraries:
link_directories(${KDE3_LIB_DIR})
@@ -68,7 +73,7 @@
ADD_SUBDIRECTORY( images )
#ADD_SUBDIRECTORY( kxmlrpcclient )
#ADD_SUBDIRECTORY( kzmdauthutil )
-ADD_SUBDIRECTORY( po )
+ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL )
#ADD_SUBDIRECTORY( udshttp )
ADD_SUBDIRECTORY( updater )
Added: trunk/updater-kde/cmake/modules/FindGettext.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/cmake/modules/FindGettext.cmake?rev=5640&view=auto
==============================================================================
--- trunk/updater-kde/cmake/modules/FindGettext.cmake (added)
+++ trunk/updater-kde/cmake/modules/FindGettext.cmake Tue May 29 14:52:50 2007
@@ -0,0 +1,63 @@
+# - Find GNU gettext tools
+# This module looks for the GNU gettext tools. This module defines the
+# following values:
+# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
+# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
+# GETTEXT_FOUND: True if gettext has been found.
+#
+# Additionally it provides the following macros:
+# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN )
+# This will create a target "translations" which will convert the
+# given input po files into the binary output mo file. If the
+# ALL option is used, the translations will also be created when
+# building the default target.
+
+FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
+
+FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+
+MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
+
+ SET(_gmoFiles)
+ GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+ GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
+
+#MESSAGE( STATUS "pot: ${_potFile} converted to ${_potBasename}")
+
+ SET(_addToAll)
+ IF(${_firstPoFile} STREQUAL "ALL")
+ SET(_addToAll "ALL")
+ SET(_firstPoFile)
+ ENDIF(${_firstPoFile} STREQUAL "ALL")
+
+ FOREACH (_currentPoFile ${ARGN})
+ GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
+ GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)
+ GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE)
+ SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${_gmoFile}
+#COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
+ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
+#DEPENDS ${_absPotFile} ${_absFile}
+ DEPENDS ${_absFile}
+ )
+
+ INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
+ SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
+
+ ENDFOREACH (_currentPoFile )
+
+ ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
+
+ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
+
+IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+ SET(GETTEXT_FOUND TRUE)
+ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+ SET(GETTEXT_FOUND FALSE)
+ IF (GetText_REQUIRED)
+ MESSAGE(FATAL_ERROR "GetText not found")
+ ENDIF (GetText_REQUIRED)
+ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
\ No newline at end of file
Modified: trunk/updater-kde/opensuse-updater-kde.spec.in
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/opensuse-updater-kde.spec.in?rev=5640&r1=5639&r2=5640&view=diff
==============================================================================
--- trunk/updater-kde/opensuse-updater-kde.spec.in (original)
+++ trunk/updater-kde/opensuse-updater-kde.spec.in Tue May 29 14:52:50 2007
@@ -8,17 +8,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-Name: opensuse-updater
+Name: @PACKAGE@
BuildRequires: kdelibs3-devel update-desktop-files
License: GPL
Group: System/Management
Summary: KDE updater applet for OpenSUSE
-Version: @VERSION
+Version: @VERSION@
Release: 1
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: opensuseupdater-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Requires: zypper >= 0.5.3
+Obsoletes: opensuse-updater
+Conflicts: opensuse-updater
%description
KDE updater applet for OpenSUSE
@@ -30,7 +32,7 @@
Martin Vidner