rpms/gajim/F-9 gajim.spec,1.23,1.24

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/gajim/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv412

Modified Files:
	gajim.spec 
Log Message:
* Mon Jul 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11.4-3
- Updated BuildRoot according to Fedora packaging guidelines.
- Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622.
- Removed 'BuildRequires: pkgconfig' and dropped version from
  'BuildRequires: pygtk2-devel'.
- Fixed docdir and removed empty README.



Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-9/gajim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gajim.spec	14 Jul 2008 16:55:28 -0000	1.23
+++ gajim.spec	14 Jul 2008 17:36:55 -0000	1.24
@@ -3,17 +3,17 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 Version:	0.11.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/gajim-%{version}.tar.bz2
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:	bind-utils
 Requires:	dbus-python
-#Requires:	gnome-python2-gconf
+Requires:	gnome-python2-canvas
 Requires:	pygtk2-libglade
 Requires:	python-docutils
 
@@ -24,8 +24,7 @@
 BuildRequires:	gtkspell-devel
 BuildRequires:	intltool
 BuildRequires:	libXScrnSaver-devel
-BuildRequires:	pkgconfig
-BuildRequires:	pygtk2-devel >= 2.8.0
+BuildRequires:	pygtk2-devel
 
 %description
 Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
@@ -36,14 +35,10 @@
 %setup -q
 
 %build
-%configure \
-  --disable-dependency-tracking \
-  --disable-static \
-  --enable-remote \
-  --enable-gtkspell \
-  --enable-idle \
-  --enable-trayicon \
-  --libdir=%{python_sitearch}
+%configure --docdir=%{_docdir}/%{name}-%{version} \
+  --libdir=%{python_sitearch} \
+  --disable-static --enable-remote --enable-gtkspell --enable-idle \
+  --enable-trayicon
 
 make %{?_smp_mflags}
 
@@ -55,7 +50,7 @@
 rm -rf $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la
 
 # silence rpmlint warnings
-chmod +x %{buildroot}%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py
+chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/src/{gajim{,-remote},history_manager}.py
 
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -69,20 +64,36 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc README.html
+%doc THANKS
 %{_bindir}/%{name}
 %{_bindir}/%{name}-remote
-%dir %{python_sitearch}/gajim/
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}_about.png
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}-remote.1*
+
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/data
+%{_datadir}/%{name}/src
+
+%dir %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/gtkspell.so
 %{python_sitearch}/%{name}/idle.so
 %{python_sitearch}/%{name}/trayicon.so
-%{_datadir}/applications/*gajim.desktop
-%{_datadir}/%{name}/
-%{_datadir}/pixmaps/gajim*
-%{_docdir}/%{name}/
-%{_mandir}/man1/gajim.1*
-%{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Mon Jul 14 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.11.4-3
+- Updated BuildRoot according to Fedora packaging guidelines.
+- Added 'Requires: gnome-python2-canvas'. Closes Red Hat Bugzilla bug #454622.
+- Removed 'BuildRequires: pkgconfig' and dropped version from
+  'BuildRequires: pygtk2-devel'.
+- Fixed docdir and removed empty README.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11.4-2
 - Autorebuild for gcc-4.3.