packages: emacs/emacs.spec, emacs/emacs-libpng.patch (REMOVED) - Up to 23.2...

[caleb]

Author: caleb                        Date: Mon Oct 18 11:03:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 23.2, NFY, see TODO
- Removed libpng patch, added upstream

---- Files affected:
packages/emacs:
   emacs.spec (1.102 -> 1.103) , emacs-libpng.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/emacs/emacs.spec
diff -u packages/emacs/emacs.spec:1.102 packages/emacs/emacs.spec:1.103
--- packages/emacs/emacs.spec:1.102	Sat Feb 27 16:52:33 2010
+++ packages/emacs/emacs.spec	Mon Oct 18 13:03:21 2010
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+# TODO:
+# - package cedit lisp files files
+# - package new (non gtk) desktop file?
+# - package ctags/etags in subpackage?
 #
 # Conditional build:
 %bcond_without	athena	# don't build athena version
@@ -14,12 +18,12 @@
 Summary(pt_BR.UTF-8):	GNU Emacs
 Summary(tr.UTF-8):	GNU Emacs
 Name:		emacs
-Version:	23.1
-Release:	2
+Version:	23.2
+Release:	0.1
 License:	GPL v3+
 Group:		Applications/Editors/Emacs
 Source0:	ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.gz
-# Source0-md5:	a620d4452769d04ad8864d662f34f8dd
+# Source0-md5:	b6691852dae0bc142b3c12749f6b7ade
 Source1:	%{name}-dot%{name}
 Source2:	%{name}-site-start.el
 Source3:	%{name}.png
@@ -31,7 +35,6 @@
 Source9:	%{name}-nox.desktop
 Patch0:		%{name}-tinfo.patch
 Patch1:		%{name}-lib64.patch
-Patch2:		%{name}-libpng.patch
 URL:		http://www.gnu.org/software/emacs/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -381,7 +384,6 @@
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -583,7 +585,6 @@
 %dir %{_libdir}/emacs/%{version}/*
 
 %attr(2755,root,mail) %{_libdir}/emacs/%{version}/*-linux/movemail
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/cvtmail
 %attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/digest-doc
 %attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/fakemail
 %attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/hexl
@@ -751,6 +752,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2010/10/18 11:03:21  caleb
+- Up to 23.2, NFY, see TODO
+- Removed libpng patch, added upstream
+
 Revision 1.102  2010/02/27 15:52:33  pawelz
 - BR: ncurses-devel, libdnet-devel, pkgconfig, rpm-pythonprov
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emacs/emacs.spec?r1=1.102&r2=1.103&f=u