Accepting request 65240 from home:namtrac:branches:devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/65240
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hunspell?expand=0&rev=18

hunspell-disable-fortify.patch

@@ -1,7 +0,0 @@
---- src/hunspell/hashmgr.cxx
-+++ src/hunspell/hashmgr.cxx
-@@ -1,3 +1,4 @@
-+#undef _FORTIFY_SOURCE /* bad use of char word; at the end of struct hentry -Marcus */
- #include "license.hunspell"
- #include "license.myspell"
- 

hunspell.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 25 15:40:18 UTC 2011 - idoenmez@novell.com
+
+- Spec cleanup
+- Removed hunspell-disable-fortify.patch: we want to build
+  with fortify again now that the code is fixed.
+
 -------------------------------------------------------------------
 Fri Mar 11 10:03:19 CET 2011 - pgajdos@suse.cz
 

hunspell.spec

@@ -22,14 +22,18 @@ Name:           hunspell
 Version:        1.3.1
 Release:        1
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
+Url:            http://hunspell.sourceforge.net/
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
-Patch0:         %name-disable-fortify.patch
-Url:            http://hunspell.sourceforge.net/
 BuildRequires:  autoconf >= 2.59
+BuildRequires:  automake
+BuildRequires:  gcc-c++
+BuildRequires:  libstdc++-devel
+BuildRequires:  libtool
 BuildRequires:  ncurses-devel >= 5.0
-BuildRequires:  automake gcc-c++ libstdc++-devel libtool pkg-config readline-devel
+BuildRequires:  pkg-config
+BuildRequires:  readline-devel
 Recommends:     %{name}-tools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -40,12 +44,6 @@ compounding or character encoding. Hunspell interfaces: Ispell-like
 terminal interface using Curses library, Ispell pipe interface,
 OpenOffice.org UNO module.
 
-
-
-Authors:
---------
-    Németh László nemeth (at) OpenOffice.org
-
 %package tools
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
 Summary:        Hunspell tools
@@ -55,28 +53,17 @@ Requires:       %{name} = %{version}
 %description tools
 This package contains munch and unmunch programs.
 
-
-
-Authors:
---------
-    Németh László nemeth (at) OpenOffice.org
-
 %package devel
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
 Summary:        Files for developing with hunspell
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}
-Requires:       libstdc++-devel pkgconfig
+Requires:       libstdc++-devel
+Requires:       pkgconfig
 
 %description devel
 Includes and definitions for developing with hunspell.
 
-
-
-Authors:
---------
-    Németh László nemeth (at) OpenOffice.org
-
 %package static
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
 Summary:        Static hunspell library
@@ -86,39 +73,28 @@ Requires:       %{name}-devel = %{version}
 %description static
 Static hunspell library.
 
-
-
-Authors:
---------
-    Németh László nemeth (at) OpenOffice.org
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
-%patch0 -p0
 
 %build
-cp /usr/share/gettext/config.rpath .
-AUTOPOINT=true autoreconf -fi
-export CPPFLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses" 
 %configure \
 	--with-ui \
 	--with-readline
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
-rm -f $RPM_BUILD_ROOT%{_bindir}/example
+rm -f %{buildroot}%{_bindir}/example
-install -m 644 src/tools/{,un}munch.h $RPM_BUILD_ROOT%{_includedir}
+install -m 644 src/tools/{,un}munch.h %{buildroot}%{_includedir}
 %find_lang %{name}
 
 %check
 make check
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post	-p /sbin/ldconfig
-
 %postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang