]> git.pld-linux.org Git - packages/ibus-table-chinese.git/blob - ibus-table-chinese-no-fedora.patch
- updated to 1.4.6
[packages/ibus-table-chinese.git] / ibus-table-chinese-no-fedora.patch
1 --- ibus-table-chinese-1.4.0-Source/CMakeLists.txt.orig 2012-09-07 08:23:27.000000000 +0200
2 +++ ibus-table-chinese-1.4.0-Source/CMakeLists.txt      2012-09-16 16:20:43.936422109 +0200
3 @@ -55,20 +55,6 @@
4      MESSAGE("*Hi")
5  ENDIF(NOT CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
6  
7 -INCLUDE(ManageEnvironment RESULT_VARIABLE MANAGE_ENVIRONMENT_PATH)
8 -IF(MANAGE_ENVIRONMENT_PATH STREQUAL "NOTFOUND")
9 -    MESSAGE(FATAL_ERROR "ManageEnvironment is not found in CMAKE_MODULE_PATH,
10 -    please:
11 -    1) git submodule init; git submodule update
12 -    2) or install cmake-fedora/
13 -    3) wget -P SOURCES https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz
14 -    tar zxvf SOURCES/cmake-fedora-modules-only-latest.tar.gz")
15 -ENDIF(MANAGE_ENVIRONMENT_PATH STREQUAL "NOTFOUND")
16 -
17 -INCLUDE(ManageVersion)
18 -RELEASE_NOTES_READ_FILE()
19 -INCLUDE(ManageUninstall)
20 -
21  ####################################################################
22  # Required
23  #
24 @@ -93,27 +79,14 @@
25  
26  GET_FILENAME_COMPONENT(_releaseFileName "${RELEASE_FILE}" NAME)
27  SET(INSTALL_DOCS ${_releaseFileName} AUTHORS README ChangeLog COPYING README)
28 -STRING_JOIN(PRJ_DOC_LIST " " ${INSTALL_DOCS})
29 -
30 -INSTALL(FILES ${INSTALL_DOCS}
31 -    DESTINATION "${PRJ_DOC_DIR}")
32  
33  ####################################################################
34  # Source Version Control
35  #
36 -INCLUDE(ManageSourceVersionControl)
37 -MANAGE_SOURCE_VERSION_CONTROL_GIT()
38  
39  ####################################################################
40  # Packing
41  #
42 -INCLUDE(ManageArchive)
43 -
44 -IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
45 -    INCLUDE(ManageRPM)
46 -    INCLUDE(ManageReleaseFedora)
47 -ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
48 -INCLUDE(ManageRelease)
49  
50  SET(PRJ_IGNORE_FILES_COMMON
51      "/doc/"  "\\\\.spec$" "messages.po$" "\\\\.orig$" "/cmake-fedora/"
52 @@ -136,15 +109,6 @@
53      SET(SOURCE_ARCHIVE_DIR ${CMAKE_BINARY_DIR}/SOURCES)
54  ENDIF(RPM_BUILD_SOURCES)
55  
56 -PACK_SOURCE_ARCHIVE("${SOURCE_ARCHIVE_DIR}")
57 -IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
58 -    PACK_RPM()
59 -    RELEASE_FEDORA(fedora el6)
60 -    # "Off" Warning is displayed if mock is not installed.
61 -    RPM_MOCK_BUILD()
62 -    MANAGE_RELEASE(release_fedora)
63 -ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
64 -
65  ####################################################################
66  # Hosting and Release
67  #
68 diff -ur ibus-table-chinese-1.3.1-Source.orig/tables/CMakeLists.txt ibus-table-chinese-1.3.1-Source/tables/CMakeLists.txt
69 --- ibus-table-chinese-1.3.1-Source.orig/tables/CMakeLists.txt  2011-06-22 05:19:30.000000000 +0200
70 +++ ibus-table-chinese-1.3.1-Source/tables/CMakeLists.txt       2011-07-20 22:12:14.603170183 +0200
71 @@ -4,7 +4,7 @@
72  ENDIF(CREATE_DB STREQUAL "CREATE_DB-NOTFOUND")
73  
74  IF(NOT DEFINED DB_INSTALL_DIRECTORY)
75 -    SET(DB_INSTALL_DIRECTORY "${DATA_DIR}/ibus-table/tables")
76 +       SET(DB_INSTALL_DIRECTORY "${SHARE_INSTALL_PREFIX}/ibus-table/tables")
77  ENDIF(NOT DEFINED DB_INSTALL_DIRECTORY)
78  
79  IF(NOT DEFINED DEFAULT_FREQ)
80 @@ -12,7 +12,7 @@
81  ENDIF(NOT DEFINED DEFAULT_FREQ)
82  
83  IF(NOT DEFINED ICON_INSTALL_DIRECTORY)
84 -    SET(ICON_INSTALL_DIRECTORY "${DATA_DIR}/ibus-table/icons")
85 +       SET(ICON_INSTALL_DIRECTORY "${SHARE_INSTALL_PREFIX}/ibus-table/icons")
86  ENDIF(NOT DEFINED ICON_INSTALL_DIRECTORY)
87  
88  FIND_PROGRAM(SED_CMD sed)
89 @@ -98,7 +98,6 @@
90             LIST(APPEND _dependIcon "${CMAKE_SOURCE_DIR}/icons/${_tabName}.jpg")
91         ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/icons/${_tabName}.png")
92      ENDFOREACH(_tabFile ${ARGN})
93 -    M_MSG(${M_INFO1} "[${targetName}] db files=${_dependDb}")
94  
95      ADD_CUSTOM_TARGET(convert_${targetName}
96         COMMENT "Building ${targetName} table(s)..."
This page took 0.078599 seconds and 3 git commands to generate.