From 3c1a446805c28237d247e2873415409d87a2abc73882a543366a427563ad0b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 25 May 2016 07:54:05 +0000 Subject: [PATCH] Accepting request 397870 from home:jengelh:branches:devel:libraries:c_c++ Submitting again; seems we lost track of what the pain point was. - Drop Requires: pkgconfig because this is already autodetected by rpm. Use mode inheritance for defattr. Edit rpm group and description a tiny bit. OBS-URL: https://build.opensuse.org/request/show/397870 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hunspell?expand=0&rev=51 --- hunspell.changes | 7 +++++++ hunspell.spec | 22 ++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/hunspell.changes b/hunspell.changes index 3aae630..3973fc2 100644 --- a/hunspell.changes +++ b/hunspell.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 17 23:53:49 UTC 2016 - jengelh@inai.de + +- Drop Requires: pkgconfig because this is already autodetected + by rpm. Use mode inheritance for defattr. Edit rpm group and + description a tiny bit. + ------------------------------------------------------------------- Wed May 11 07:37:23 UTC 2016 - mpluskal@suse.com diff --git a/hunspell.spec b/hunspell.spec index 98edcd4..2a5ad14 100644 --- a/hunspell.spec +++ b/hunspell.spec @@ -23,14 +23,14 @@ Version: 1.4.1 Release: 0 Summary: A spell checker and morphological analyzer library License: (GPL-2.0+ or LGPL-2.1+ or MPL-1.1+) and LGPL-2.1+ -Group: System/Libraries +Group: Productivity/Office/Other Url: https://hunspell.github.io Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: ncurses-devel >= 5.0 -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: readline-devel Recommends: %{name}-tools Recommends: unzip @@ -44,7 +44,7 @@ terminal interface using Curses library, Ispell pipe interface, LibreOffice or OpenOffice.org UNO module. %package -n %{libname} -Summary: Shared library for %{name} +Summary: A spell checker and morphological analyzer library Group: System/Libraries # same libname, support migration Conflicts: hunspell = 1.4.0 @@ -56,7 +56,7 @@ compounding or character encoding. Hunspell interfaces: Ispell-like terminal interface using Curses library, Ispell pipe interface, LibreOffice or OpenOffice.org UNO module. -This package contains shared library +This package contains the shared library. %package tools Summary: Hunspell tools @@ -64,14 +64,13 @@ Group: Development/Libraries/Other Requires: %{name} = %{version} %description tools -This package contains munch and unmunch programs. +This package contains the munch and unmunch programs. %package devel Summary: Files for developing with hunspell -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ Requires: %{libname} = %{version}-%{release} Requires: libstdc++-devel -Requires: pkgconfig %description devel Includes and definitions for developing with hunspell. @@ -103,7 +102,7 @@ make check %{?_smp_mflags} %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(644,root,root,755) +%defattr(-,root,root) %doc README README.myspell AUTHORS AUTHORS.myspell COPYING THANKS license.hunspell license.myspell %attr(755,root,root) %{_bindir}/hunspell %dir %{_mandir}/hu @@ -112,11 +111,11 @@ make check %{?_smp_mflags} %lang(hu) %{_mandir}/hu/man1/hunspell.1* %files -n %{libname} -%defattr(755,root,root,755) +%defattr(-,root,root) %{_libdir}/libhunspell-1.4.so.* %files tools -%defattr(755,root,root,755) +%defattr(-,root,root) %{_bindir}/analyze %{_bindir}/chmorph %{_bindir}/munch @@ -128,12 +127,11 @@ make check %{?_smp_mflags} %{_bindir}/makealias %{_bindir}/wordforms %{_bindir}/wordlist2hunspell -%defattr(644,root,root,755) %{_mandir}/man1/hunzip.1%{ext_man} %{_mandir}/man1/hzip.1%{ext_man} %files devel -%defattr(644,root,root,755) +%defattr(-,root,root) %{_libdir}/libhunspell-1.4.so %{_libdir}/libhunspell.so %{_mandir}/man3/hunspell.3%{ext_man}