diff --git a/clucene.spec b/clucene.spec
index e0eca1b..31e7e25 100644
--- a/clucene.spec
+++ b/clucene.spec
@@ -1,12 +1,12 @@
 
-%define git_long  e8e3d20f20da5ee3e37d347207b01890829a5475
-%define git_short e8e3d20
-%define snap 20130812
+%global git_long  e8e3d20f20da5ee3e37d347207b01890829a5475
+%global git_short e8e3d20
+%global snap 20130812
 
 Summary:	A C++ port of Lucene
 Name:		clucene
 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
 URL:		http://www.sourceforge.net/projects/clucene
 %if 0%{?snap}
@@ -91,20 +91,16 @@ rm -rfv src/ext/{boost/,zlib/}
 
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
 %{cmake} \
   -DBUILD_CONTRIBS_LIB:BOOL=ON \
   -DLIB_DESTINATION:PATH=%{_libdir} \
-  -DLUCENE_SYS_INCLUDES:PATH=%{_libdir} \
-  ..
-popd
+  -DLUCENE_SYS_INCLUDES:PATH=%{_libdir}
 
-%make_build -C %{_target_platform}
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %check
@@ -146,6 +142,11 @@ time make -C %{_target_platform} test ARGS="--timeout 300 --output-on-failure" |
 
 
 %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
 - Use make macros
 - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro