SPECS: WordNet.spec - updated to 2.1 - ugly wnb got separate packa...

[glen]

Author: glen                         Date: Sun Dec 18 19:07:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.1
- ugly wnb got separate package -browser due tcl/tk deps

---- Files affected:
SPECS:
   WordNet.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/WordNet.spec
diff -u SPECS/WordNet.spec:1.4 SPECS/WordNet.spec:1.5
--- SPECS/WordNet.spec:1.4	Fri Dec  9 18:48:36 2005
+++ SPECS/WordNet.spec	Sun Dec 18 20:07:04 2005
@@ -2,16 +2,19 @@
 Summary:	Online lexical reference system, ie. smart dictionary
 Summary(pl):	System referencji słownikowych, czyli mądry słownik
 Name:		WordNet
-Version:	1.7.1
-Release:	2
-License:	Free to use (see LICENSE)
+Version:	2.1
+Release:	0.11
+License:	Free to use (see COPYING)
 Group:		Applications/Dictionaries
-Source0:	ftp://ftp.cogsci.princeton.edu/pub/wordnet/%{version}/WordNet-%{version}.tar.gz
-# Source0-md5:	5c8e569339cf7d8e727d884234365508
-Patch0:		%{name}-includes.patch
+Source0:	ftp://ftp.cogsci.princeton.edu/pub/wordnet/2.1/%{name}-%{version}.tar.gz
+# Source0-md5:	081aa25baaccac602cebb61f6cb949e7
+Patch0:		%{name}-FHS.patch
 Patch1:		%{name}-shared.patch
-Patch2:		%{name}-tcltk.patch
-URL:		http://www.cogsci.princeton.edu/~wn/
+Patch2:		%{name}-typo.patch
+URL:		http://wordnet.princeton.edu/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
 BuildRequires:	tcl-devel >= 8.4
 BuildRequires:	tk-devel >= 8.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,7 +29,7 @@
 
 Information about WordNet, an online interface, and the various
 WordNet packages are available from our Web site at
-%URL
+<%URL>.
 
 %description -l pl
 WordNet to system referencji słownikowych. Formy słów w WordNet są
@@ -48,6 +51,22 @@
 %description devel -l pl
 Pliki nagłówkowe, biblioteka i dokumentacja do WordNet.
 
+%package static
+Summary:	Static WordNet library
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static WordNet library.
+
+%package browser
+Summary:	WordNet browser
+Group:		Applications/Dictionaries
+Requires:	%{name} = %{version}-%{release}
+
+%description browser
+A graphical interface to the WordNet online lexical database.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -55,32 +74,21 @@
 %patch2 -p1
 
 %build
-%define wnopts "PLATFORM=linux WN_ROOT=%{_prefix} %WN_DICT=%{_datadir}/%{name}"
-
-ff=src/include/wnconsts.h
-sed 's|/usr/local/%{name}-%{version}/dict|%{_datadir}/%{name}|' < $ff > $ff.fix
-mv -f $ff.fix $ff
-
-%{__make} %{wnopts} clean
-%{__make} %{wnopts} -C src/lib
-%{__make} %{wnopts} LOCAL_LDFLAGS=-dynamic -C src/wn
-%{__make} %{wnopts} LOCAL_LDFLAGS=-dynamic -C src/wnb
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}} \
-	$RPM_BUILD_ROOT{%{_datadir}/%{name},%{_mandir}/man{1,3,5,7}}
-
-install src/wn/wn $RPM_BUILD_ROOT%{_bindir}
-install src/wnb/{wnb,wishwn} $RPM_BUILD_ROOT%{_bindir}
-
-%{__make} -C dict WN_INSTALLDIR=$RPM_BUILD_ROOT%{_datadir}/%{name} install
-%{__make} -C man  WN_INSTALLDIR=$RPM_BUILD_ROOT%{_mandir} install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/wnb*
-
-install src/lib/libwn.{a,so} $RPM_BUILD_ROOT%{_libdir}
-install src/include/wn*.h $RPM_BUILD_ROOT%{_includedir}
+# dunno. anyone needs this?
+rm -rf $RPM_BUILD_ROOT%{_prefix}/doc/{html,ps,pdf}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,24 +98,45 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
-%attr(755,root,root) %{_libdir}/*.so
-%{_mandir}/man1/*
-%doc CHANGES INSTALL LICENSE README.doc README.list README.tcltk UNBUNDLE
+%doc AUTHORS COPYING ChangeLog README
+%attr(755,root,root) %{_bindir}/wn
+%attr(755,root,root) %{_libdir}/*.so.0.0.0
+%{_mandir}/man1/wn.1*
+%{_mandir}/man1/wnintro.1*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/dict
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/*
-%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
+# funny. manual is there but no such program. rm -f it?
+%{_mandir}/man1/grind.1*
 %{_mandir}/man[357]/*
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/*.a
+
+%files browser
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/wnres
+# anyone? is this prog needed?
+%attr(755,root,root) %{_bindir}/wishwn
+%attr(755,root,root) %{_bindir}/wnb
+%{_mandir}/man1/wnb.1*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/12/18 19:07:04  glen
+- updated to 2.1
+- ugly wnb got separate package -browser due tcl/tk deps
+
 Revision 1.4  2005/12/09 17:48:36  baggins
 - release 2
 - BR tcl/tk >= 8.4
@@ -135,22 +164,22 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.9  2002/10/13 12:39:23  hunter
---Corected Source url.
-STBR AfterPLDRelease !
+- Corrected Source url.
+  STBR AfterPLDRelease !
 
 Revision 1.8  2002/10/13 12:17:25  hunter
---up to 1.7.1
---correted %doc, (rm gzip -9v)
+- up to 1.7.1
+- correted %doc, (rm gzip -9v)
 
 Revision 1.7  2002/04/05 15:33:02  roman
-s/Free to use, see file LICENSE from this package/Free to use (see LICENSE) in License
+- s/Free to use, see file LICENSE from this package/Free to use (see LICENSE) in License
 
 Revision 1.6  2002/02/22 23:30:00  kloczek
 - removed all Group fields translations (oure rpm now can handle translating
   Group field using gettext).
 
 Revision 1.5  2002/01/18 02:15:25  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.4  2001/12/20 11:58:22  qboosh
 - remaining pl translations, updated Groups, cosmetics
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/WordNet.spec?r1=1.4&r2=1.5&f=u