include LUCENE_SYS_INCLUDES in pkgconfig --cflags output

This commit is contained in:
Rex Dieter 2011-10-23 15:06:16 -05:00
parent eba9284f00
commit 65ec5d448d
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,10 @@
diff -up clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.sys_includes clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake
--- clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake.sys_includes 2011-03-16 19:21:07.000000000 -0500
+++ clucene-core-2.3.3.4/src/core/libclucene-core.pc.cmake 2011-10-23 14:43:05.325553889 -0500
@@ -7,5 +7,5 @@ Name: libclucene
Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@
Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
-Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
+Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext -I@LUCENE_SYS_INCLUDES@
~

View File

@ -1,7 +1,7 @@
Summary: A C++ port of Lucene
Name: clucene
Version: 2.3.3.4
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2+ or ASL 2.0
Group: Development/System
URL: http://www.sourceforge.net/projects/clucene
@ -9,6 +9,10 @@ Source0: http://downloads.sourceforge.net/clucene/clucene-core-2.3.3.4.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gawk cmake zlib-devel boost-devel
## upstreamable patches
# include LUCENE_SYS_INCLUDES in pkgconfig --cflags output
Patch50: clucene-core-2.3.3.4-pkgconfig_sys_includes.patch
%description
CLucene is a C++ port of the popular Apache Lucene search engine
(http://lucene.apache.org/java).
@ -37,6 +41,8 @@ developing with clucene
%prep
%setup -n %{name}-core-%{version}
%patch50 -p1 -b .pkgconfig_sys_includes
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@ -85,6 +91,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libclucene-core.pc
%changelog
* Sun Oct 23 2011 Rex Dieter <rdieter@fedoraproject.org> 2.3.3.4-3
- include LUCENE_SYS_INCLUDES in pkgconfig --cflags output
* Wed Jun 08 2011 Rex Dieter <rdieter@fedoraproject.org> 2.3.3.4-2
- cleanup cmake usage
- fix scriptlets