[packages/ibus-table-chinese] - updated to 1.8.2 - dropped outdated no-fedora patch, BR: cmake-fedora-modules and pass some cmake
qboosh
qboosh at pld-linux.org
Tue Apr 5 16:56:30 CEST 2016
commit ed9e72f109325a1830be74d85336c13e346b06db
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 5 16:56:37 2016 +0200
- updated to 1.8.2
- dropped outdated no-fedora patch, BR: cmake-fedora-modules and pass some cmake options instead
ibus-table-chinese-no-fedora.patch | 96 --------------------------------------
ibus-table-chinese.spec | 22 +++++----
2 files changed, 13 insertions(+), 105 deletions(-)
---
diff --git a/ibus-table-chinese.spec b/ibus-table-chinese.spec
index 014ddeb..8015807 100644
--- a/ibus-table-chinese.spec
+++ b/ibus-table-chinese.spec
@@ -3,16 +3,16 @@ Summary(pl.UTF-8): Tablice wprowadzania znaków chińskich dla platformy IBus
Summary(zh_CN.UTF-8): 中文码表输入法
Summary(zh_TW.UTF-8): 中文碼表輸入法
Name: ibus-table-chinese
-Version: 1.4.6
+Version: 1.8.2
Release: 1
License: GPL v3+
Group: Libraries
-#Source0Download: http://code.google.com/p/ibus/downloads/list
-Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
-# Source0-md5: 552dc3e28fbbf52435d3ce41fc09ac35
-Patch0: %{name}-no-fedora.patch
-URL: http://code.google.com/p/ibus/
+#Source0Download: https://github.com/definite/ibus-table-chinese/releases
+Source0: https://github.com/definite/ibus-table-chinese/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 6360649580363bb3627a11e32057f6b1
+URL: https://github.com/definite/ibus-table-chinese
BuildRequires: cmake >= 2.6.2
+BuildRequires: cmake-fedora-modules
BuildRequires: ibus-table-devel >= 1.2
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.603
@@ -320,11 +320,15 @@ 永码输入法。
永碼輸入法。
%prep
-%setup -q -n %{name}-%{version}-Source
-%patch0 -p1
+%setup -q
+
+install -d tmp
%build
-%cmake
+%cmake \
+ -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=0 \
+ -DCMAKE_FEDORA_TMP_DIR=$(pwd)/tmp \
+ -DDATA_DIR=%{_datadir}
%{__make}
%install
diff --git a/ibus-table-chinese-no-fedora.patch b/ibus-table-chinese-no-fedora.patch
deleted file mode 100644
index 46c2538..0000000
--- a/ibus-table-chinese-no-fedora.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- ibus-table-chinese-1.4.0-Source/CMakeLists.txt.orig 2012-09-07 08:23:27.000000000 +0200
-+++ ibus-table-chinese-1.4.0-Source/CMakeLists.txt 2012-09-16 16:20:43.936422109 +0200
-@@ -55,20 +55,6 @@
- MESSAGE("*Hi")
- ENDIF(NOT CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-
--INCLUDE(ManageEnvironment RESULT_VARIABLE MANAGE_ENVIRONMENT_PATH)
--IF(MANAGE_ENVIRONMENT_PATH STREQUAL "NOTFOUND")
-- MESSAGE(FATAL_ERROR "ManageEnvironment is not found in CMAKE_MODULE_PATH,
-- please:
-- 1) git submodule init; git submodule update
-- 2) or install cmake-fedora/
-- 3) wget -P SOURCES https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-modules-only-latest.tar.gz
-- tar zxvf SOURCES/cmake-fedora-modules-only-latest.tar.gz")
--ENDIF(MANAGE_ENVIRONMENT_PATH STREQUAL "NOTFOUND")
--
--INCLUDE(ManageVersion)
--RELEASE_NOTES_READ_FILE()
--INCLUDE(ManageUninstall)
--
- ####################################################################
- # Required
- #
-@@ -93,27 +79,14 @@
-
- GET_FILENAME_COMPONENT(_releaseFileName "${RELEASE_FILE}" NAME)
- SET(INSTALL_DOCS ${_releaseFileName} AUTHORS README ChangeLog COPYING README)
--STRING_JOIN(PRJ_DOC_LIST " " ${INSTALL_DOCS})
--
--INSTALL(FILES ${INSTALL_DOCS}
-- DESTINATION "${PRJ_DOC_DIR}")
-
- ####################################################################
- # Source Version Control
- #
--INCLUDE(ManageSourceVersionControl)
--MANAGE_SOURCE_VERSION_CONTROL_GIT()
-
- ####################################################################
- # Packing
- #
--INCLUDE(ManageArchive)
--
--IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-- INCLUDE(ManageRPM)
-- INCLUDE(ManageReleaseFedora)
--ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
--INCLUDE(ManageRelease)
-
- SET(PRJ_IGNORE_FILES_COMMON
- "/doc/" "\\\\.spec$" "messages.po$" "\\\\.orig$" "/cmake-fedora/"
-@@ -136,15 +109,6 @@
- SET(SOURCE_ARCHIVE_DIR ${CMAKE_BINARY_DIR}/SOURCES)
- ENDIF(RPM_BUILD_SOURCES)
-
--PACK_SOURCE_ARCHIVE("${SOURCE_ARCHIVE_DIR}")
--IF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
-- PACK_RPM()
-- RELEASE_FEDORA(fedora el6)
-- # "Off" Warning is displayed if mock is not installed.
-- RPM_MOCK_BUILD()
-- MANAGE_RELEASE(release_fedora)
--ENDIF(CMAKE_FEDORA_ENABLE_FEDORA_BUILD)
--
- ####################################################################
- # Hosting and Release
- #
-diff -ur ibus-table-chinese-1.3.1-Source.orig/tables/CMakeLists.txt ibus-table-chinese-1.3.1-Source/tables/CMakeLists.txt
---- ibus-table-chinese-1.3.1-Source.orig/tables/CMakeLists.txt 2011-06-22 05:19:30.000000000 +0200
-+++ ibus-table-chinese-1.3.1-Source/tables/CMakeLists.txt 2011-07-20 22:12:14.603170183 +0200
-@@ -4,7 +4,7 @@
- ENDIF(CREATE_DB STREQUAL "CREATE_DB-NOTFOUND")
-
- IF(NOT DEFINED DB_INSTALL_DIRECTORY)
-- SET(DB_INSTALL_DIRECTORY "${DATA_DIR}/ibus-table/tables")
-+ SET(DB_INSTALL_DIRECTORY "${SHARE_INSTALL_PREFIX}/ibus-table/tables")
- ENDIF(NOT DEFINED DB_INSTALL_DIRECTORY)
-
- IF(NOT DEFINED DEFAULT_FREQ)
-@@ -12,7 +12,7 @@
- ENDIF(NOT DEFINED DEFAULT_FREQ)
-
- IF(NOT DEFINED ICON_INSTALL_DIRECTORY)
-- SET(ICON_INSTALL_DIRECTORY "${DATA_DIR}/ibus-table/icons")
-+ SET(ICON_INSTALL_DIRECTORY "${SHARE_INSTALL_PREFIX}/ibus-table/icons")
- ENDIF(NOT DEFINED ICON_INSTALL_DIRECTORY)
-
- FIND_PROGRAM(SED_CMD sed)
-@@ -98,7 +98,6 @@
- LIST(APPEND _dependIcon "${CMAKE_SOURCE_DIR}/icons/${_tabName}.jpg")
- ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/icons/${_tabName}.png")
- ENDFOREACH(_tabFile ${ARGN})
-- M_MSG(${M_INFO1} "[${targetName}] db files=${_dependDb}")
-
- ADD_CUSTOM_TARGET(convert_${targetName}
- COMMENT "Building ${targetName} table(s)..."
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-table-chinese.git/commitdiff/ed9e72f109325a1830be74d85336c13e346b06db
More information about the pld-cvs-commit
mailing list