[opencc] Fixes cmake
Peng Wu
pwu at fedoraproject.org
Mon Jul 23 04:46:59 UTC 2012
commit 567c828b754d380cebcc57b7291efeb606880403
Author: Peng Wu <alexepico at gmail.com>
Date: Mon Jul 23 12:46:00 2012 +0800
Fixes cmake
opencc-0.3.0-fixes-cmake.patch | 35 +++++++++++++++++++++++++++++++++++
opencc.spec | 7 ++++++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/opencc-0.3.0-fixes-cmake.patch b/opencc-0.3.0-fixes-cmake.patch
new file mode 100644
index 0000000..d596f90
--- /dev/null
+++ b/opencc-0.3.0-fixes-cmake.patch
@@ -0,0 +1,35 @@
+Index: opencc-0.3.0/src/CMakeLists.txt
+===================================================================
+--- opencc-0.3.0.orig/src/CMakeLists.txt
++++ opencc-0.3.0/src/CMakeLists.txt
+@@ -99,7 +99,7 @@ install(
+ TARGETS
+ ${LIBOPENCC_TARGET}
+ LIBRARY DESTINATION
+- ${DIR_LIBRARY}
++ ${LIB_INSTALL_DIR}
+ )
+ endif (NOT WIN32)
+
+@@ -107,7 +107,7 @@ install(
+ TARGETS
+ ${LIBOPENCC_STATIC_TARGET}
+ ARCHIVE DESTINATION
+- ${DIR_LIBRARY_STATIC}
++ ${LIB_INSTALL_DIR}
+ )
+
+ install(
+Index: opencc-0.3.0/CMakeLists.txt
+===================================================================
+--- opencc-0.3.0.orig/CMakeLists.txt
++++ opencc-0.3.0/CMakeLists.txt
+@@ -102,7 +102,7 @@ install(
+ FILES
+ ${CMAKE_BINARY_DIR}/opencc.pc
+ DESTINATION
+- ${DIR_LIBRARY}/pkgconfig
++ ${LIB_INSTALL_DIR}/pkgconfig
+ )
+
+ ######## Subdirectories
diff --git a/opencc.spec b/opencc.spec
index aa434bf..2dacb81 100644
--- a/opencc.spec
+++ b/opencc.spec
@@ -1,12 +1,13 @@
Name: opencc
Version: 0.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Libraries for Simplified-Traditional Chinese Conversion
License: ASL 2.0
Group: System Environment/Libraries
URL: http://code.google.com/p/open-chinese-convert/
Source0: http://open-chinese-convert.googlecode.com/files/%{name}-%{version}.tar.gz
Patch0: opencc-fixes-ctest.patch
+Patch1: opencc-0.3.0-fixes-cmake.patch
BuildRequires: gettext
BuildRequires: cmake
@@ -39,6 +40,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .ctest
+%patch1 -p1 -b .cmake
%build
%cmake . -DENABLE_GETTEXT:BOOL=ON
@@ -75,6 +77,9 @@ ctest
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Jul 23 2012 Peng Wu <pwu at redhat.com> - 0.3.0-3
+- Fixes cmake
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list