--- a/ChangeLog Wed Nov 10 01:16:14 2010 +0000
+++ b/ChangeLog Wed Nov 10 19:13:39 2010 +0000
@@ -1,3 +1,9 @@
+2010-11-10 Alex Viskovatoff
+
+ * SFEhunspell.spec: find dicts without using environment variable
+ * SFEncursesw.spec: get version number from base spec
+ * SFExz: update to 5.0.0
+
2010-11-08 Milan Jurik <[email protected]>
* SFEldns.spec: bump to 1.6.7
--- a/SFEhunspell.spec Wed Nov 10 01:16:14 2010 +0000
+++ b/SFEhunspell.spec Wed Nov 10 19:13:39 2010 +0000
@@ -4,12 +4,7 @@
# includes module: hunspell
#
-# To use, make sure that library/myspell/dictionary/en, for example, is
-# installed, and that you have in .bashrc
-# export DICPATH=/usr/share/spell/myspell
-# export DICTIONARY=en_US
-
-#### USING WITH EMACS ####
+#### USING WITH EMACS ####
#
# NOTE: To use Hunspell under Emacs, at least Emacs 23 is required.
# NOTE: For some reason, unless Emacs is started from the command line, hunspell
@@ -53,6 +48,7 @@
Version: 1.2.12
License: MPL 1.1/GPL 2.0/LGPL 2.1
Source: http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
+Patch1: hunspell-01-dict-path.diff
%include default-depend.inc
SUNW_BaseDir: %{_basedir}
@@ -61,9 +57,11 @@
BuildRequires: SUNWaconf
BuildRequires: SUNWgnu-automake-19
BuildRequires: SFElibiconv-devel
+BuildRequires: SFEncursesw-devel
Requires: SFEncursesw
Requires: SUNWgnu-readline
Requires: SFElibiconv
+Requires: SUNWmyspell-dictionary-en
%package devel
Summary: %{summary} - development files
@@ -74,6 +72,7 @@
%prep
%setup -q -n %srcname-%version
+%patch1 -p1
%build
@@ -85,7 +84,7 @@
export CXXFLAGS="%cxx_optflags -I/usr/gnu/include/ncursesw"
export LIBS="-lsocket -lpthread -lCrun"
-export LDFLAGS="-L/usr/gnu/lib -R/usr/gnu/lib"
+export LDFLAGS="%_ldflags %gnu_lib_path"
./configure --prefix=%_prefix --enable-threads=solaris --with-ui --with-readline
@@ -96,6 +95,8 @@
gmake install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%_libdir/lib*a
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -103,7 +104,6 @@
%files
%defattr (-, root, bin)
%_bindir/*
-%_libdir/*a
%_libdir/*.so*
%dir %attr (-, root, other) %_libdir/pkgconfig
%_libdir/pkgconfig/%{srcname}.pc
@@ -118,6 +118,9 @@
%{_includedir}/*
%changelog
+* Wed Nov 10 2010 - Alex Viskovatoff
+- add another missing build dep; do not package static lib
+- add patch to make Hunspell find dictionaries without depending on DICPATH
* Mon Nov 08 2010 - Milan Jurik
- add missing build dep
* Thu Oct 14 2010 - Alex Viskovatoff
--- a/SFEncursesw.spec Wed Nov 10 01:16:14 2010 +0000
+++ b/SFEncursesw.spec Wed Nov 10 19:13:39 2010 +0000
@@ -16,7 +16,7 @@
Name: SFEncursesw
Summary: Emulation of SVR4 curses with wide-character support
-Version: 5.6
+Version: %{ncursesw.version}
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -34,11 +34,11 @@
rm -rf %name-%version
mkdir %name-%version
-export LDFLAGS="%_ldflags"
-%ifarch amd64 sparcv9
-mkdir %name-%version/%_arch64
-%ncursesw_64.prep -d %name-%version/%_arch64
-%endif
+# 64-bit binaries are of no benefit
+#%ifarch amd64 sparcv9
+#mkdir %name-%version/%_arch64
+#%ncursesw_64.prep -d %name-%version/%_arch64
+#%endif
mkdir %name-%version/%{base_arch}
%ncursesw.prep -d %name-%version/%{base_arch}
@@ -51,10 +51,11 @@
FLAG64="-m64"
fi
-%ifarch amd64 sparcv9
-export LDFLAGS="$FLAG64"
-%ncursesw_64.build -d %name-%version/%_arch64
-%endif
+# 64-bit binaries are of no benefit
+#%ifarch amd64 sparcv9
+#export LDFLAGS="$FLAG64"
+#%ncursesw_64.build -d %name-%version/%_arch64
+#%endif
export LDFLAGS=
%ncursesw.build -d %name-%version/%{base_arch}
@@ -62,12 +63,6 @@
%install
rm -rf $RPM_BUILD_ROOT
-%ifarch amd64 sparcv9
-%ncursesw_64.install -d %name-%version/%_arch64
-# 64-bit binaries are of no benefit
-rm -rf $RPM_BUILD_ROOT%{_bindir}/%_arch64
-%endif
-
%ncursesw.install -d %name-%version/%{base_arch}
%clean
@@ -86,6 +81,8 @@
%{_includedir}/*
%changelog
+* Wed Nov 10 2010 - Alex Viskovatoff
+- get version number from base spec
* jul 27 2009 - Gilles Dauphin
- s/SFEncurses/SUNWncurses/
- s/SFEncurses-data/SUNWncurses-devel/
--- a/SFExz.spec Wed Nov 10 01:16:14 2010 +0000
+++ b/SFExz.spec Wed Nov 10 19:13:39 2010 +0000
@@ -7,10 +7,10 @@
%include Solaris.inc
Name: SFExz
-Version: 4.999.9
+Version: 5.0.0
Summary: LZMA utils
URL: http://tukaani.org/xz
-Source: http://tukaani.org/xz/xz-%{version}beta.tar.bz2
+Source: http://tukaani.org/xz/xz-%{version}.tar.bz2
Group: Applications/Archivers
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -23,11 +23,19 @@
*BSDs, etc.), but also work on some not-so-POSIX systems like Windows. XZ Utils
are the successor to LZMA Utils.
+%if %build_l10n
+%package l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
%prep
%setup -q -c -n %{name}-%{version}
%build
-cd xz-%{version}beta
+cd xz-%{version}
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
CXXFLAGS="$CXXFLAGS -D_FILE_OFFSET_BITS=64"
export CFLAGS CXXFLAGS
@@ -41,12 +49,17 @@
make
%install
-cd xz-%{version}beta
+cd xz-%{version}
rm -rf ${RPM_BUILD_ROOT}
gmake install DESTDIR=${RPM_BUILD_ROOT}
find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
+%if %build_l10n
+%else
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -67,6 +80,15 @@
%dir %attr (0755, root, other) %{_datadir}/doc
%{_datadir}/doc/*
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %_datadir
+%attr (-, root, other) %_datadir/locale
+%endif
+
%changelog
+* Fri Nov 5 2010 - Alex Viskovatoff
+- Update to 1.0.0, adding l10n
* Wed Jun 02 2010 - [email protected]
- Initial setup.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hunspell-01-dict-path.diff Wed Nov 10 19:13:39 2010 +0000
@@ -0,0 +1,13 @@
+--- hunspell-1.2.12/src/tools/hunspell.cxx.orig Mon Jul 5 05:06:21 2010
++++ hunspell-1.2.12/src/tools/hunspell.cxx Wed Nov 10 13:16:12 2010
+@@ -61,9 +61,7 @@
+ #include "firstparser.hxx"
+
+ #define LIBDIR \
+- "/usr/share/hunspell:" \
+- "/usr/share/myspell:" \
+- "/usr/share/myspell/dicts"
++ "/usr/share/spell/myspell:"
+ #define USEROOODIR \
+ ".openoffice.org/3/user/wordbook:" \
+ ".openoffice.org2/user/wordbook:" \