pull in some upstream fixes (PR, previous commit)

use latest %cmake macros
s/define/global/
This commit is contained in:
Rex Dieter 2020-07-21 10:25:08 -05:00
parent 67d5de8487
commit 316b5186b9

View File

@ -1,12 +1,12 @@
%define git_long e8e3d20f20da5ee3e37d347207b01890829a5475 %global git_long e8e3d20f20da5ee3e37d347207b01890829a5475
%define git_short e8e3d20 %global git_short e8e3d20
%define snap 20130812 %global snap 20130812
Summary: A C++ port of Lucene Summary: A C++ port of Lucene
Name: clucene Name: clucene
Version: 2.3.3.4 Version: 2.3.3.4
Release: 37.%{snap}.%{git_short}git%{?dist} Release: 38.%{snap}.%{git_short}git%{?dist}
License: LGPLv2+ or ASL 2.0 License: LGPLv2+ or ASL 2.0
URL: http://www.sourceforge.net/projects/clucene URL: http://www.sourceforge.net/projects/clucene
%if 0%{?snap} %if 0%{?snap}
@ -91,20 +91,16 @@ rm -rfv src/ext/{boost/,zlib/}
%build %build
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake} \ %{cmake} \
-DBUILD_CONTRIBS_LIB:BOOL=ON \ -DBUILD_CONTRIBS_LIB:BOOL=ON \
-DLIB_DESTINATION:PATH=%{_libdir} \ -DLIB_DESTINATION:PATH=%{_libdir} \
-DLUCENE_SYS_INCLUDES:PATH=%{_libdir} \ -DLUCENE_SYS_INCLUDES:PATH=%{_libdir}
..
popd
%make_build -C %{_target_platform} %cmake_build
%install %install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %cmake_install
%check %check
@ -146,6 +142,11 @@ time make -C %{_target_platform} test ARGS="--timeout 300 --output-on-failure" |
%changelog %changelog
* Tue Jul 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 2.3.3.4-38.20130812.e8e3d20.git
- pull in some upstream fixes (PR, previous commit)
- use latest %%cmake macros
- s/define/global/
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.3.3.4-37.20130812.e8e3d20git * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.3.3.4-37.20130812.e8e3d20git
- Use make macros - Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro