rpms/pydict/devel pydict.spec,1.15,1.16

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/pydict/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15962

Modified Files:
	pydict.spec 
Log Message:
fix package


Index: pydict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pydict/devel/pydict.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pydict.spec	27 Jun 2007 07:20:30 -0000	1.15
+++ pydict.spec	29 Aug 2008 20:44:00 -0000	1.16
@@ -1,18 +1,19 @@
 Summary: English/Chinese Dictionary written with python/gtk
 Name:      pydict
 Version:   0.3.0
-Release:   11%{?dist}
+Release:   12%{?dist}
 Source0:   pydict-%{version}.tar.gz
-Patch: pydict-trans.patch
-Patch1: pydict-0.3.0-python.patch
-#Url:       http://www.linux.org.tw/~plateau/linux_notes/index.html
+Patch0:    pydict-trans.patch
+Patch1:    pydict-0.3.0-python.patch
+#Url:      http://www.linux.org.tw/~plateau/linux_notes/index.html
 URL:       http://sourceforge.net/projects/pydict/
-License: GPL
-Group: Applications/Text
+# No version specified.
+License:   GPL+
+Group:     Applications/Text
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires:  pygtk2
 BuildRequires: desktop-file-utils
-BuildArchitectures: noarch
+BuildArch: noarch
 
 %description
 This is an English/Chinese Dictionary wirtten by Daniel Gau with
@@ -21,42 +22,49 @@
 run in both console mode and X Window GUI mode.
 
 %prep
-%setup -n pydict
-%patch -p1
+%setup -q -n pydict
+%patch0 -p1
 %patch1 -p1
 
+for i in CHANGELOG README; do
+   iconv -f BIG-5 -t UTF-8 -o $i{.utf8,}
+   mv $i{.utf8,}
+done
+
+%build
+# Nothing to do here.
+
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/share/pydict/
-install -m 644 *.py *.lib yaba.xpm HELP $RPM_BUILD_ROOT/usr/share/pydict/
-mkdir -p  $RPM_BUILD_ROOT/usr/bin/
-ln -sf /usr/share/pydict/pydict.py $RPM_BUILD_ROOT/usr/bin/pydict
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons
-install -m 644 dict.xpm $RPM_BUILD_ROOT/usr/share/icons
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
-#install -m 644 net-pydict.desktop $RPM_BUILD_ROOT/usr/share/applications
-desktop-file-install --vendor="net" --add-category="X-Red-Hat-Extra;Utility;Application" --dir="$RPM_BUILD_ROOT/usr/share/applications" pyDict.desktop
-mv $RPM_BUILD_ROOT/usr/share/applications/net-py{D,d}ict.desktop
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -m 755 *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -m 644 *.lib yaba.xpm HELP $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons
+install -m 644 dict.xpm $RPM_BUILD_ROOT%{_datadir}/icons
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor="net" --add-category="Utility;Application" \
+                     --dir="$RPM_BUILD_ROOT%{_datadir}/applications" pyDict.desktop
+mv $RPM_BUILD_ROOT%{_datadir}/applications/net-py{D,d}ict.desktop
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -sf ../..%{_datadir}/%{name}/pydict.py pydict
 
-%preun
-if [ -d /usr/share/pydict ] ; then
-  rm -rf /usr/share/pydict/*.pyc
-fi
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc CHANGELOG README COPYING
-%dir /usr/share/pydict
-/usr/share/pydict/*
-%attr(0755,root,root) /usr/bin/pydict
-%attr(0755,root,root) /usr/share/pydict/pydict.py
-/usr/share/applications/net-pydict.desktop
-/usr/share/icons/dict.xpm
+%{_bindir}/%{name}
+%{_datadir}/%{name}/
+%{_datadir}/applications/net-pydict.desktop
+%{_datadir}/icons/dict.xpm
 
 %changelog
+* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.0-12
+- fix license tag
+
 * Wed Jun 27 2007 Hu Zheng <zhu at redhat.com> - 0.3.0-11
 - add encoding tag and fix desktop file.
 
@@ -96,7 +104,7 @@
 - ported for pygtk2
 - rewritten some of the classes for fixing bugs
 
-* Mon Mar 18 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.2.5.1-8
+* Mon Mar 18 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.2.5.1-8
 - Remove packager/vendor
 - Don't define version/releason on top of the specfile and then
   use that in the header
@@ -140,11 +148,11 @@
 
 * Fri Jan 21 2000 Shang-Feng Yang <storm at chempro.che.ntu.edu.tw>
 - Modify some improper terms of the word base pydict.lib
-- Add Summary and %description tags of zh_TW.Big5 locale
+- Add Summary and %%description tags of zh_TW.Big5 locale
 
 * Mon Jan 17 2000 Chih-Wei Huang <cwhuang at linux.org.tw>
 - Add menu for Gnome & KDE
-- Add %clean
+- Add %%clean
 
 * Thu Jan 13 2000 Shang-Feng Yang <storm at chempro.che.ntu.edu.tw>
 - Fix the IndexError problem caused by some incomplete records in the