rpms/gonvert/devel .cvsignore, 1.6, 1.7 gonvert.spec, 1.12, 1.13 sources, 1.6, 1.7

[Todd M. Zullinger (tmz)]

Author: tmz

Update of /cvs/extras/rpms/gonvert/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5259

Modified Files:
	.cvsignore gonvert.spec sources 
Log Message:
* Tue Oct 16 2007 Todd Zullinger <tmz at pobox.com> - 0.2.19-1
- update to 2.19
- update License and URL tags
- drop version from python Requires
- replace libglade2 and pygtk2 Requires with pygtk2-libglade
- remove execute bits from doc files
- remove unneeded make in %build
- re-work %install, avoid placing glade file under python site dir (#237286)
- fix encoding on THANKS and TODO files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Apr 2006 11:20:17 -0000	1.6
+++ .cvsignore	17 Oct 2007 03:22:57 -0000	1.7
@@ -1 +1 @@
-gonvert-0.2.15.tar.gz
+gonvert-0.2.19.tar.gz


Index: gonvert.spec
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/gonvert.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gonvert.spec	15 Dec 2006 03:01:22 -0000	1.12
+++ gonvert.spec	17 Oct 2007 03:22:57 -0000	1.13
@@ -1,18 +1,16 @@
 Name:           gonvert
-Version:        0.2.15
-Release:        4%{?dist}
+Version:        0.2.19
+Release:        1%{?dist}
 Summary:        Units conversion utility
 Group:          Applications/Engineering
-License:        GPL
-URL:            http://unihedron.com/projects/gonvert/gonvert.php
-Source0:        http://www.unihedron.com/projects/gonvert/downloads/%{name}-%{version}.tar.gz
-Source1:	gonvert.glade
+License:        GPL+
+URL:            http://unihedron.com/projects/gonvert
+Source0:        http://unihedron.com/projects/gonvert/downloads/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-Requires:       libglade2
-Requires:       python >= 2.0
-Requires:       pygtk2 >= 1.99.0
+Requires:       python
+Requires:       pygtk2-libglade
 
 BuildArch:      noarch
 
@@ -20,39 +18,38 @@
 gonvert is a conversion utility that allows conversion between many units
 like CGS, Ancient, Imperial with many categories like length, mass, numbers,
 etc. All units converted values shown at once as you type. Easy to add/change
-your own units. Written in Python,pygtk,libgade.
+your own units. Written in Python, pygtk, libgade.
 
 
 %prep
 %setup -q
 
+# remove execute bits from doc files
+chmod -x doc/*
+
+# fix encoding on THANKS and TODO files
+pushd doc >/dev/null
+iconv -f iso8859-1 -t utf-8 THANKS > THANKS.conv && mv -f THANKS.conv THANKS
+iconv -f iso8859-1 -t utf-8 TODO > TODO.conv && mv -f TODO.conv TODO
+popd >/dev/null
+
 
 %build
-make %{?_smp_mflags}
+# there's nothing that needs built
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} install
+rm -rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}
+
+desktop-file-install                                \
+    --delete-original                               \
+    --vendor fedora                                 \
+    --remove-category Application                   \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+    ${RPM_BUILD_ROOT}%{_datadir}/gnome/apps/Utilities/gonvert.desktop
 
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gonvert
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
-
-install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
-install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/gonvert/gonvert.glade
-install -m0644 pixmaps/gonvert.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert.png
-install -m0644 pixmaps/gonvert_picture.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert_picture.png
-install -m0755 gonvert ${RPM_BUILD_ROOT}%{_bindir}/gonvert
-cp doc/* ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
-chmod 0644 doc/*
-rm -rf ${RPM_BUILD_ROOT}%{_prefix}/doc
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
-desktop-file-install --vendor fedora                    \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --add-category X-Fedora                               \
-  gonvert.desktop
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -60,17 +57,24 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/CHANGELOG doc/COPYING doc/FAQ doc/THANKS doc/TODO
+%doc doc/CHANGELOG doc/COPYING doc/FAQ doc/README doc/THANKS doc/TODO
 %{_bindir}/gonvert
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/gonvert
-%{_datadir}/pixmaps/gonvert.png
-%{_datadir}/pixmaps/gonvert_picture.png
-%{_libdir}/python2.4/site-packages/share/gonvert/gonvert.glade
-%exclude %{_docdir}/gonvert
+%{_datadir}/pixmaps/gonvert*.png
 
 
 %changelog
+* Tue Oct 16 2007 Todd Zullinger <tmz at pobox.com> - 0.2.19-1
+- update to 2.19
+- update License and URL tags
+- drop version from python Requires
+- replace libglade2 and pygtk2 Requires with pygtk2-libglade
+- remove execute bits from doc files
+- remove unneeded make in %%build
+- re-work %%install, avoid placing glade file under python site dir (#237286)
+- fix encoding on THANKS and TODO files
+
 * Thu Dec 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.2.15-4
 - Bump and rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Apr 2006 11:20:17 -0000	1.6
+++ sources	17 Oct 2007 03:22:57 -0000	1.7
@@ -1 +1 @@
-f8e184cc1a77c790fcb404f3f17bebea  gonvert-0.2.15.tar.gz
+5fa0df1ee4b4783d9093dd0a707d805c  gonvert-0.2.19.tar.gz