From 560f5e209ef0616a4693be0e9378ea16715357ea Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Feb 2018 15:36:17 -0600 Subject: [PATCH] BR: gcc-c++, .spec cleanup --- clucene.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/clucene.spec b/clucene.spec index d14c4d1..8f9306d 100644 --- a/clucene.spec +++ b/clucene.spec @@ -6,9 +6,8 @@ Summary: A C++ port of Lucene Name: clucene Version: 2.3.3.4 -Release: 31.%{snap}.%{git_short}git%{?dist} +Release: 32.%{snap}.%{git_short}git%{?dist} License: LGPLv2+ or ASL 2.0 -Group: Development/System URL: http://www.sourceforge.net/projects/clucene %if 0%{?snap} # git archive e8e3d20f20da5ee3e37d347207b01890829a5475 --prefix=clucene-core-2.3.3.4/ | xz -9 > ../clucene-core-2.3.3.4-e8e3d20.tar.xz @@ -20,7 +19,8 @@ Source0: http://downloads.sourceforge.net/clucene/clucene-core-%{version}.tar.gz BuildRequires: boost-devel BuildRequires: cmake -BuildRequires: gawk +BuildRequires: gawk +BuildRequires: gcc-c++ BuildRequires: zlib-devel ## upstreamable patches @@ -48,7 +48,6 @@ date with Lucene 2.3.2. It contains most of the same functionality as the Java v %package core Summary: Core clucene module -Group: Development/System Provides: clucene = %{version}-%{release} #Requires: %{name} = %{version}-%{release} %description core @@ -60,7 +59,6 @@ date with Lucene 2.3.2. It contains most of the same functionality as the Java v %package core-devel Summary: Headers for developing programs that will use %{name} -Group: Development/Libraries Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-contribs-lib%{?_isa} = %{version}-%{release} %description core-devel @@ -69,7 +67,6 @@ developing with clucene %package contribs-lib Summary: Language specific text analyzers for %{name} -Group: Development/System Requires: %{name}-core%{?_isa} = %{version}-%{release} %description contribs-lib %{summary}. @@ -88,7 +85,7 @@ rm -rfv src/ext/{boost/,zlib/} %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake} \ -DBUILD_CONTRIBS_LIB:BOOL=ON \ @@ -119,8 +116,8 @@ time make -C %{_target_platform} test ARGS="--timeout 300 --output-on-failure" | %ldconfig_scriptlets core %files core -%defattr(-, root, root, -) -%doc APACHE.license AUTHORS ChangeLog COPYING LGPL.license README +%doc AUTHORS ChangeLog README +%license APACHE.license COPYING LGPL.license %{_libdir}/libclucene-core.so.1* %{_libdir}/libclucene-core.so.%{version} %{_libdir}/libclucene-shared.so.1* @@ -129,12 +126,10 @@ time make -C %{_target_platform} test ARGS="--timeout 300 --output-on-failure" | %ldconfig_scriptlets contribs-lib %files contribs-lib -%defattr(-, root, root, -) %{_libdir}/libclucene-contribs-lib.so.1* %{_libdir}/libclucene-contribs-lib.so.%{version} %files core-devel -%defattr(-, root, root, -) %dir %{_libdir}/CLucene %{_includedir}/CLucene/ %{_includedir}/CLucene.h @@ -145,6 +140,9 @@ time make -C %{_target_platform} test ARGS="--timeout 300 --output-on-failure" | %changelog +* Tue Feb 20 2018 Rex Dieter - 2.3.3.4-3220130812.e8e3d20git +- BR: gcc-c++, .spec cleanup + * Wed Feb 07 2018 Fedora Release Engineering - 2.3.3.4-31.20130812.e8e3d20git - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild