rpms/emesene/F-11 emesene.spec,1.12,1.13 sources,1.7,1.8

Rahul Sundaram sundaram at fedoraproject.org
Tue Jun 8 09:23:28 UTC 2010


Author: sundaram

Update of /cvs/pkgs/rpms/emesene/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30226

Modified Files:
	emesene.spec sources 
Log Message:



Index: emesene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/emesene.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- emesene.spec	15 Jan 2010 12:19:31 -0000	1.12
+++ emesene.spec	8 Jun 2010 09:23:28 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           emesene
-Version:        1.6
+Version:        1.6.2
 Release:        1%{?dist}
 Summary:        Instant messaging client for Windows Live Messenger network
 
@@ -7,7 +7,6 @@ Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://emesene.org
 Source0:        http://downloads.sourceforge.net/emesene/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         %{name}-1.5-pythonpath.patch
 BuildRequires:  desktop-file-utils, gettext, python-devel
 Requires: gnome-python2-extras
@@ -43,7 +42,6 @@ find -name \*~ |xargs rm -fv
 python setup.py build_ext -i
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -D -m 644 misc/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
 install -D -m 644 misc/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 install -D -m 644 misc/%{name}.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.png
@@ -61,6 +59,9 @@ cd po
 for dir in *;do echo "%lang($dir) %{_datadir}/%{name}/po/$dir" >> $RPM_BUILD_DIR/%{name}-%{version}/%{name}.lang
 done
 
+# remove shebang
+sed -i -e '/^#!\//, 1d' %{buildroot}%{_datadir}/%{name}/pygif/AnimatedGifResizer.py
+
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}/
 cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
@@ -93,12 +94,19 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README COPYING
+%doc README COPYING MANIFEST.in 
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{name}
 %exclude %{_datadir}/%{name}/%{name}.pythonpath
+%exclude %{_datadir}/%{name}/MANIFEST.in
+%exclude %{_datadir}/%{name}/docs/INSTALL
+%exclude %{_datadir}/%{name}/docs/TRANSLATORS
+%exclude %{_datadir}/%{name}/docs/emeseneUML.dia
+%exclude %{_datadir}/%{name}/docs/emeseneUML.png
+%exclude %{_datadir}/%{name}/docs/msn_tlp_receive_message.dot
+%exclude %{_datadir}/%{name}/docs/msn_tlp_receive_message.png
 %{_datadir}/%{name}/*.py
 %{_datadir}/%{name}/*.pyc
 %{_datadir}/%{name}/*.pyo
@@ -113,6 +121,8 @@ fi
 %{_datadir}/%{name}/smilies
 %{_datadir}/%{name}/sound_themes
 %{_datadir}/%{name}/themes
+%{_datadir}/%{name}/pyisf
+%{_datadir}/%{name}/pygif
 %dir %{_datadir}/%{name}/po
 %{_datadir}/icons/hicolor/48x48/apps/emesene.png
 %{_datadir}/icons/hicolor/scalable/apps/emesene.png
@@ -120,6 +130,11 @@ fi
 
 
 %changelog
+
+* Tue Jun 08 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 1.6.2-1
+- Update to 1.6.2.  Resolves rhbz#601402  CVE-2010-2053
+- Update spec to match current guidelines
+
 * Fri Jan 15 2010 Allisson Azevedo <allisson at gmail.com> - 1.6-1
 - Update to 1.6.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emesene/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	15 Jan 2010 12:19:31 -0000	1.7
+++ sources	8 Jun 2010 09:23:28 -0000	1.8
@@ -1 +1 @@
-ea4d3f4097265daac6823d8288979d02  emesene-1.6.tar.gz
+f53f8bfcc6e2044acc9ce27f6da43ea6  emesene-1.6.2.tar.gz



More information about the scm-commits mailing list