packages: mythes/mythes.spec, mythes/mythes-1.2.1-rhbz675806.patch (NEW), m...

[arekm]

Author: arekm                        Date: Mon Oct 17 16:30:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.2.1

---- Files affected:
packages/mythes:
   mythes.spec (1.8 -> 1.9) , mythes-1.2.1-rhbz675806.patch (NONE -> 1.1)  (NEW), mythes-optflags.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/mythes/mythes.spec
diff -u packages/mythes/mythes.spec:1.8 packages/mythes/mythes.spec:1.9
--- packages/mythes/mythes.spec:1.8	Sat Feb  5 00:36:52 2011
+++ packages/mythes/mythes.spec	Mon Oct 17 18:30:09 2011
@@ -1,15 +1,17 @@
 # $Revision$, $Date$
+%bcond_without	tests
 Summary:	MyThes thesaurus
 Summary(pl.UTF-8):	MyThes - słownik wyrazów bliskoznacznych
 Name:		mythes
-Version:	1.0
+Version:	1.2.1
 Release:	1
 License:	BSD
 Group:		Libraries
-Source0:	http://lingucomponent.openoffice.org/MyThes-1.zip
-# Source0-md5:	79e24a2e9a44d5d370d6685ff233064c
-Patch0:		%{name}-optflags.patch
+Source0:	http://downloads.sourceforge.net/hunspell/%{name}-%{version}.tar.gz
+# Source0-md5:	54b310488dda6929cf31ae859928c945
+Patch0:		%{name}-1.2.1-rhbz675806.patch
 URL:		http://lingucomponent.openoffice.org/thesaurus.html
+BuildRequires:	hunspell-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	unzip
@@ -58,25 +60,25 @@
 Biblioteka statyczna MyThes.
 
 %prep
-%setup -q -n MyThes-%{version}
-%patch0 -p1
+%setup -q
+%patch0 -p0
 
 %build
-CXXFLAGS="-Wall -ansi -pedantic %{rpmcxxflags}"
-libtool --tag=CXX --mode=compile %{__cxx} mythes.cxx $CXXFLAGS -c -o mythes.lo
-libtool --tag=CXX --mode=link %{__cxx} mythes.lo -rpath %{_libdir} -o libmythes.la
+%configure
+%{__make}
 
-libtool --tag=CXX --mode=compile %{__cxx} example.cxx $CXXFLAGS -c -o example.lo
-libtool --tag=CXX --mode=link %{__cxx} libmythes.la example.lo -o example
-
-%check
+%if %{with tests}
 ./example th_en_US_new.idx th_en_US_new.dat checkme.lst
+./example morph.idx morph.dat morph.lst morph.aff morph.dic
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
-install mythes.hxx $RPM_BUILD_ROOT%{_includedir}
-libtool --mode=install install libmythes.la $RPM_BUILD_ROOT%{_libdir}
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,17 +89,17 @@
 %files
 %defattr(644,root,root,755)
 %doc README data_layout.txt
-%attr(755,root,root) %{_libdir}/libmythes.so.*.*.*
+%attr(755,root,root) %{_libdir}/libmythes-*.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmythes.so
-%{_libdir}/libmythes.la
+%attr(755,root,root) %{_libdir}/libmythes-*.so
 %{_includedir}/mythes.hxx
+%{_pkgconfigdir}/mythes.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libmythes.a
+%{_libdir}/libmythes-*.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -105,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/10/17 16:30:09  arekm
+- up to 1.2.1
+
 Revision 1.8  2011/02/04 23:36:52  sparky
 - %description <name> for correct %package
 

================================================================
Index: packages/mythes/mythes-1.2.1-rhbz675806.patch
diff -u /dev/null packages/mythes/mythes-1.2.1-rhbz675806.patch:1.1
--- /dev/null	Mon Oct 17 18:30:15 2011
+++ packages/mythes/mythes-1.2.1-rhbz675806.patch	Mon Oct 17 18:30:09 2011
@@ -0,0 +1,10 @@
+--- mythes.cxx	2011-02-08 10:42:57.262964286 +0000
++++ mythes.cxx	2011-02-08 10:43:06.305076490 +0000
+@@ -14,6 +14,7 @@
+     encoding = NULL;
+     list = NULL;
+     offst = NULL;
++    pdfile = NULL;
+ 
+     if (thInitialize(idxpath, datpath) != 1) {
+         fprintf(stderr,"Error - can't open %s or %s\n",idxpath, datpath);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythes/mythes.spec?r1=1.8&r2=1.9&f=u