Accepting request 86562 from home:adra:branches:devel:libraries:c_c++
update to version 0.60.6.1, Spec file updates, Removed some patches (fixed upstream), Updated baselibs.conf OBS-URL: https://build.opensuse.org/request/show/86562 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aspell?expand=0&rev=11
This commit is contained in:
parent
35807e398c
commit
5763db286b
3
aspell-0.60.6.1.tar.gz
Normal file
3
aspell-0.60.6.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1
|
||||||
|
size 1878163
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a2629ad31dfb7944e8df46ef7c99edfded815838a42df6206eca23e61b8505de
|
|
||||||
size 1194066
|
|
@ -1,19 +0,0 @@
|
|||||||
--- lib/new_fmode.cpp
|
|
||||||
+++ lib/new_fmode.cpp
|
|
||||||
@@ -277,10 +277,13 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
void FilterMode::MagicString::remExtension(const String & ext) {
|
|
||||||
- for ( Vector<String>::iterator it = fileExtensions.begin() ;
|
|
||||||
- it != fileExtensions.end() ; it++ ) {
|
|
||||||
+ Vector<String>::iterator it = fileExtensions.begin();
|
|
||||||
+ while (it != fileExtensions.end()) {
|
|
||||||
if ( *it == ext ) {
|
|
||||||
- fileExtensions.erase(it);
|
|
||||||
+ it = fileExtensions.erase(it);
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ it++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
--- gen/mk-static-filter.pl
|
|
||||||
+++ gen/mk-static-filter.pl
|
|
||||||
@@ -159,7 +159,7 @@
|
|
||||||
printf STATICFILTERS "\n const KeyInfo * ".${$filter}{"NAME"}."_options_begin = ".
|
|
||||||
${$filter}{"NAME"}."_options;\n";
|
|
||||||
# If structure is empty, set options_end to same as options_begin.
|
|
||||||
- if (%{$filter}) {
|
|
||||||
+ if ($firstopt) {
|
|
||||||
printf STATICFILTERS "\n const KeyInfo * ".${$filter}{"NAME"}."_options_end = ".
|
|
||||||
${$filter}{"NAME"}."_options;\n";
|
|
||||||
} else {
|
|
@ -1,3 +1,38 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Oct 2 17:58:18 UTC 2011 - asterios.dramis@gmail.com
|
||||||
|
|
||||||
|
- update to version 0.60.6.1
|
||||||
|
* Update to Automake 1.10.3.
|
||||||
|
* Fix a bug which caused a race condition (leading to a likely crash)
|
||||||
|
when two threads try to update the dictionary cache at the same
|
||||||
|
time.
|
||||||
|
* Make it very clear that compiling Aspell with NDEBUG is a bad idea
|
||||||
|
(see `http://aspell.net/ndebug.html') by outputting a warning when
|
||||||
|
building with NDEBUG defined.
|
||||||
|
* Numerous other minor updates and bug fixes.
|
||||||
|
- Spec file updates:
|
||||||
|
* Changes based on spec-cleaner run.
|
||||||
|
* Changed License: to LGPL-2.1+.
|
||||||
|
* Splitted the package according to the shared library packaging policy
|
||||||
|
(added libaspell15 and libpspell15 sub-packages).
|
||||||
|
* Added descriptions for the patches based on openSUSE guidelines.
|
||||||
|
* Suggest also aspell-spell sub-package.
|
||||||
|
* Added versioned Provides:/Obsoletes: for pspell and pspell-devel (rpmlint
|
||||||
|
warning fix).
|
||||||
|
* Removed libstdc++-devel from Requires: of aspell-devel (not needed).
|
||||||
|
* Improved summaries and descriptions.
|
||||||
|
* Clean up in %build, %install and %files sections.
|
||||||
|
* Install the "spell" script provided by the package for compatibility
|
||||||
|
reasons (added a aspell-spell sub-package containing this script and moved
|
||||||
|
the Provides: entry for "spell" into this package).
|
||||||
|
* Use %fdupes macro to fix rpmlint warning about duplicate files.
|
||||||
|
* Use %install_info_delete in %preun instead of %postun section.
|
||||||
|
* Add pspell-config.1 man page to the aspell-devel sub-package instead of
|
||||||
|
aspell.
|
||||||
|
- Removed the following patches (fixed upstream):
|
||||||
|
* aspell-iterator-after-erase.patch
|
||||||
|
* aspell-make-static-filters.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 30 20:07:42 UTC 2011 - coolo@suse.com
|
Fri Sep 30 20:07:42 UTC 2011 - coolo@suse.com
|
||||||
|
|
||||||
|
247
aspell.spec
247
aspell.spec
@ -15,37 +15,39 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
# norootforbuild
|
|
||||||
|
|
||||||
|
|
||||||
Name: aspell
|
Name: aspell
|
||||||
BuildRequires: gcc-c++ ncurses-devel
|
Version: 0.60.6.1
|
||||||
BuildRequires: libtool
|
Release: 1
|
||||||
License: LGPL v2.1 or later
|
License: LGPL-2.1+
|
||||||
|
Summary: A Free and Open Source Spell Checker
|
||||||
|
Url: http://aspell.net/
|
||||||
Group: Productivity/Text/Spell
|
Group: Productivity/Text/Spell
|
||||||
Provides: spell pspell
|
Source0: ftp://ftp.gnu.org/gnu/aspell/%{name}-%{version}.tar.gz
|
||||||
|
Source100: baselibs.conf
|
||||||
|
# PATCH-FIX-OPENSUSE aspell-strict-aliasing.patch pnemec@suse.cz -- Fix gcc strict aliasing warnings
|
||||||
|
Patch0: aspell-strict-aliasing.patch
|
||||||
|
# PATCH-FIX-OPENSUSE aspell-quotes.patch lmichnovic@suse.cz -- Fix command execution in script "run-with-aspell"
|
||||||
|
Patch1: aspell-quotes.patch
|
||||||
|
# PATCH-FIX-OPENSUSE aspell-epmty_file.patch bnc#266130 lmichnovic@suse.cz -- Fix SIGSEV when checking empty file
|
||||||
|
Patch2: aspell-epmty_file.patch
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
Requires(post): info
|
||||||
|
Requires(preun): info
|
||||||
Recommends: aspell-en
|
Recommends: aspell-en
|
||||||
Obsoletes: pspell
|
Suggests: aspell-ispell
|
||||||
PreReq: %install_info_prereq
|
Suggests: aspell-spell
|
||||||
AutoReqProv: on
|
Provides: pspell = %{version}
|
||||||
|
Obsoletes: pspell < %{version}
|
||||||
# bug437293
|
# bug437293
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
Obsoletes: aspell-64bit
|
Obsoletes: aspell-64bit
|
||||||
%endif
|
%endif
|
||||||
#
|
|
||||||
Version: 0.60.6
|
|
||||||
Release: 28
|
|
||||||
Summary: A Free and Open Source Spell Checker
|
|
||||||
Url: http://aspell.net/
|
|
||||||
Source: aspell-%{version}.tar.bz2
|
|
||||||
Source2: baselibs.conf
|
|
||||||
Patch1: aspell-strict-aliasing.patch
|
|
||||||
Patch3: aspell-quotes.patch
|
|
||||||
Patch4: aspell-epmty_file.patch
|
|
||||||
Patch6: aspell-make-static-filters.patch
|
|
||||||
Patch7: aspell-iterator-after-erase.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Suggests: aspell-ispell
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
GNU Aspell is a spell checker designed to eventually replace Ispell. It
|
GNU Aspell is a spell checker designed to eventually replace Ispell. It
|
||||||
@ -58,141 +60,166 @@ has many other technical enhancements over Ispell, such as using shared
|
|||||||
memory for dictionaries and intelligently handling personal
|
memory for dictionaries and intelligently handling personal
|
||||||
dictionaries when more than one Aspell process is open at once.
|
dictionaries when more than one Aspell process is open at once.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Kevin Atkinson kevina@gnu.org
|
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: LGPL v2.1 or later
|
License: LGPL-2.1+
|
||||||
Provides: pspell-devel
|
Summary: Include Files and Libraries Mandatory for Development with aspell
|
||||||
Requires: aspell = %{version} libstdc++-devel glibc-devel
|
|
||||||
PreReq: %install_info_prereq
|
|
||||||
Obsoletes: pspell-devel
|
|
||||||
Summary: Include Files and Libraries Mandatory for Development
|
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
|
Requires: glibc-devel
|
||||||
|
Requires: libaspell15 = %{version}
|
||||||
|
Requires: libpspell15 = %{version}
|
||||||
|
Requires(post): info
|
||||||
|
Requires(preun): info
|
||||||
|
Provides: pspell-devel = %{version}
|
||||||
|
Obsoletes: pspell-devel < %{version}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
This package contains all necessary include files and libraries needed
|
This package contains all necessary include files and libraries needed
|
||||||
to develop applications that require these.
|
to develop applications that require aspell.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Kevin Atkinson kevina@gnu.org
|
|
||||||
|
|
||||||
%package ispell
|
%package ispell
|
||||||
License: LGPL v2.1 or later
|
License: LGPL-2.1+
|
||||||
Requires: aspell = %{version}
|
Summary: GNU Aspell - Ispell compatibility
|
||||||
Summary: A Free and Open Source Spell Checker
|
|
||||||
Group: Productivity/Text/Spell
|
Group: Productivity/Text/Spell
|
||||||
|
Requires: %{name} = %{version}
|
||||||
Conflicts: ispell
|
Conflicts: ispell
|
||||||
|
|
||||||
%description ispell
|
%description ispell
|
||||||
GNU Aspell is a spell checker designed to eventually replace Ispell. It
|
GNU Aspell is a spell checker designed to eventually replace Ispell. It
|
||||||
can be used as a library or as an independent spell checker.
|
can be used as a library or as an independent spell checker.
|
||||||
|
|
||||||
Its main feature is that it does a much better job of coming up with
|
This package contains an ispell script for compatibility reasons so that
|
||||||
possible suggestions than just about any other spell checker available
|
programs that expect the "ispell" command will work correctly.
|
||||||
for the English language, including Ispell and Microsoft Word. It also
|
|
||||||
has many other technical enhancements over Ispell, such as using shared
|
|
||||||
memory for dictionaries and intelligently handling personal
|
|
||||||
dictionaries when more than one Aspell process is open at once.
|
|
||||||
|
|
||||||
|
%package spell
|
||||||
|
License: LGPL-2.1+
|
||||||
|
Summary: GNU Aspell - Spell compatibility
|
||||||
|
Group: Productivity/Text/Spell
|
||||||
|
Requires: %{name} = %{version}
|
||||||
|
Provides: spell
|
||||||
|
|
||||||
|
%description spell
|
||||||
|
GNU Aspell is a spell checker designed to eventually replace Ispell. It
|
||||||
|
can be used as a library or as an independent spell checker.
|
||||||
|
|
||||||
|
This package contains a spell script for compatibility reasons so that programs
|
||||||
|
that expect the "spell" command will work correctly.
|
||||||
|
|
||||||
|
%package -n libaspell15
|
||||||
|
License: LGPL-2.1+
|
||||||
|
Summary: GNU Aspell Library
|
||||||
|
Group: System/Libraries
|
||||||
|
|
||||||
|
%description -n libaspell15
|
||||||
|
GNU Aspell is a spell checker designed to eventually replace Ispell. It
|
||||||
|
can be used as a library or as an independent spell checker.
|
||||||
|
|
||||||
|
This package contains the aspell library.
|
||||||
|
|
||||||
|
%package -n libpspell15
|
||||||
|
License: LGPL-2.1+
|
||||||
|
Summary: GNU Aspell - Pspell Compatibility Library
|
||||||
|
Group: System/Libraries
|
||||||
|
|
||||||
|
%description -n libpspell15
|
||||||
|
GNU Aspell is a spell checker designed to eventually replace Ispell. It
|
||||||
|
can be used as a library or as an independent spell checker.
|
||||||
|
|
||||||
|
This package contains the pspell compatibility library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0
|
||||||
%patch1
|
%patch1
|
||||||
%patch3
|
%patch2
|
||||||
%patch4
|
|
||||||
%patch6
|
|
||||||
%patch7
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#%{suse_update_config}
|
export CFLAGS="%{optflags}"
|
||||||
#rm aclocal.m4
|
export CXXFLAGS="%{optflags}"
|
||||||
#rm -f missing # Get newest from automake
|
|
||||||
gettextize -f
|
%configure \
|
||||||
autoreconf -fi
|
--disable-rpath
|
||||||
libtoolize -f
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS" \
|
make %{?_smp_mflags}
|
||||||
CXXFLAGS="$RPM_OPT_FLAGS" \
|
|
||||||
./configure --prefix=%{_prefix} \
|
|
||||||
--libdir=%{_prefix}/%_lib \
|
|
||||||
--infodir=%{_infodir} \
|
|
||||||
--mandir=%{_mandir} \
|
|
||||||
--enable-curses=%{_libdir}/libncursesw.so \
|
|
||||||
--enable-static
|
|
||||||
# dictionary files depend on endian, needs fix, then posible
|
|
||||||
# --enable-pkgdatadir=%{_prefix}/share/aspell-0.60 \
|
|
||||||
# --enable-dict-dir=%{_prefix}/share/aspell-0.60 \
|
|
||||||
#
|
|
||||||
# hack for non expanded $echo
|
|
||||||
sed -i 's/\$echo/echo/g' libtool
|
|
||||||
make %{?jobs:-j%jobs}
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install
|
%if 0%{?suse_version} >= 1120
|
||||||
ln -s %{_libdir}/aspell-0.60/ispell $RPM_BUILD_ROOT/%{_bindir}
|
%make_install
|
||||||
|
%else
|
||||||
|
make DESTDIR=%{buildroot} install
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Links for compatibility reasons (ispell and spell)
|
||||||
|
ln -s %{_libdir}/aspell-0.60/ispell %{buildroot}%{_bindir}
|
||||||
|
ln -s %{_libdir}/aspell-0.60/spell %{buildroot}%{_bindir}
|
||||||
|
|
||||||
|
%fdupes -s %{buildroot}
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
#mv $RPM_BUILD_ROOT%{_datadir}/aspell/spell $RPM_BUILD_ROOT%{_bindir}/
|
|
||||||
#
|
|
||||||
# create directory for precompiled dictionaries
|
|
||||||
#install -m 755 -d $RPM_BUILD_ROOT%{_prefix}/lib/aspell
|
|
||||||
#
|
|
||||||
# documentation
|
|
||||||
#mv $RPM_BUILD_ROOT%{_datadir}/doc/aspell .
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
|
||||||
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
|
||||||
|
|
||||||
%postun
|
%preun
|
||||||
/sbin/ldconfig
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
|
||||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
|
||||||
|
|
||||||
%post devel
|
%post devel
|
||||||
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info.gz
|
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info%{ext_info}
|
||||||
|
|
||||||
%postun devel
|
%preun devel
|
||||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info.gz
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info%{ext_info}
|
||||||
|
|
||||||
|
%post -n libaspell15 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libaspell15 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%post -n libpspell15 -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n libpspell15 -p /sbin/ldconfig
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root,-)
|
||||||
%doc COPYING README
|
%doc COPYING README TODO
|
||||||
%doc manual/aspell.html
|
%doc manual/aspell.html/
|
||||||
%{_mandir}/*/*
|
|
||||||
%{_infodir}/aspell.*
|
|
||||||
%{_bindir}/aspell
|
%{_bindir}/aspell
|
||||||
%{_bindir}/aspell-import
|
%{_bindir}/aspell-import
|
||||||
|
%{_bindir}/pre*
|
||||||
%{_bindir}/run-with-aspell
|
%{_bindir}/run-with-aspell
|
||||||
%{_bindir}/word-list-compress
|
%{_bindir}/word-list-compress
|
||||||
%{_bindir}/pre*
|
%doc %{_infodir}/%{name}.info%{ext_info}
|
||||||
%{_libdir}/libaspell.so.*
|
%doc %{_mandir}/man1/*.1%{ext_man}
|
||||||
%{_libdir}/libpspell.so.*
|
%exclude %{_mandir}/man1/pspell-config.1%{ext_man}
|
||||||
%{_libdir}/aspell-0.60
|
|
||||||
#%{_prefix}/share/aspell-0.60
|
|
||||||
%{_datadir}/locale/*/*/aspell.mo
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root,-)
|
||||||
%doc manual/aspell-dev.html
|
%doc manual/aspell-dev.html/
|
||||||
%{_infodir}/aspell-dev.*
|
|
||||||
%{_prefix}/include/*
|
|
||||||
%{_bindir}/pspell-config
|
%{_bindir}/pspell-config
|
||||||
%{_libdir}/lib*.a
|
%{_includedir}/pspell/
|
||||||
%{_libdir}/lib*.la
|
%{_includedir}/*.h
|
||||||
|
%{_libdir}/libaspell.la
|
||||||
|
%{_libdir}/libpspell.la
|
||||||
%{_libdir}/libaspell.so
|
%{_libdir}/libaspell.so
|
||||||
%{_libdir}/libpspell.so
|
%{_libdir}/libpspell.so
|
||||||
|
%doc %{_infodir}/%{name}-dev.info%{ext_info}
|
||||||
|
%doc %{_mandir}/man1/pspell-config.1%{ext_man}
|
||||||
|
|
||||||
%files ispell
|
%files ispell
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root,-)
|
||||||
%{_bindir}/ispell
|
%{_bindir}/ispell
|
||||||
|
|
||||||
|
%files spell
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_bindir}/spell
|
||||||
|
|
||||||
|
%files -n libaspell15
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_libdir}/aspell-0.60/
|
||||||
|
%{_libdir}/libaspell.so.15*
|
||||||
|
|
||||||
|
%files -n libpspell15
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_libdir}/libpspell.so.15*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
@ -1 +1,2 @@
|
|||||||
aspell
|
libaspell15
|
||||||
|
libpspell15
|
||||||
|
Loading…
Reference in New Issue
Block a user