- Up to 23.2, NFY, see TODO

- Removed libpng patch, added upstream

Changed files:
    emacs-libpng.patch -> 1.2
    emacs.spec -> 1.103

diff --git a/emacs-libpng.patch b/emacs-libpng.patch
deleted file mode 100644 (file)
index 8eeae15..0000000
--- a/emacs-libpng.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c
---- emacs-23.1-orig/src/image.c        2010-01-17 23:12:10.000000000 -0500
-+++ emacs-23.1/src/image.c     2010-01-17 23:18:16.000000000 -0500
-@@ -5793,7 +5793,7 @@
- /* PNG library details.  */
- 
- DEF_IMGLIB_FN (png_get_io_ptr);
--DEF_IMGLIB_FN (png_check_sig);
-+DEF_IMGLIB_FN (png_sig_cmp);
- DEF_IMGLIB_FN (png_create_read_struct);
- DEF_IMGLIB_FN (png_create_info_struct);
- DEF_IMGLIB_FN (png_destroy_read_struct);
-@@ -5824,7 +5824,7 @@
-     return 0;
- 
-   LOAD_IMGLIB_FN (library, png_get_io_ptr);
--  LOAD_IMGLIB_FN (library, png_check_sig);
-+  LOAD_IMGLIB_FN (library, png_sig_cmp);
-   LOAD_IMGLIB_FN (library, png_create_read_struct);
-   LOAD_IMGLIB_FN (library, png_create_info_struct);
-   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
-@@ -5849,7 +5849,7 @@
- #else
- 
- #define fn_png_get_io_ptr             png_get_io_ptr
--#define fn_png_check_sig              png_check_sig
-+#define fn_png_sig_cmp                png_sig_cmp
- #define fn_png_create_read_struct     png_create_read_struct
- #define fn_png_create_info_struct     png_create_info_struct
- #define fn_png_destroy_read_struct    png_destroy_read_struct
-@@ -5996,7 +5996,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
--        || !fn_png_check_sig (sig, sizeof sig))
-+        || fn_png_sig_cmp (sig, 0, sizeof sig))
-       {
-         image_error ("Not a PNG file: `%s'", file, Qnil);
-         UNGCPRO;
-@@ -6013,7 +6013,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
--        || !fn_png_check_sig (tbr.bytes, sizeof sig))
-+        || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
-       {
-         image_error ("Not a PNG image: `%s'", img->spec, Qnil);
-         UNGCPRO;

diff --git a/emacs.spec b/emacs.spec
index 5b1e6a7dddce63583158fa84a276021f8c174225..d444ab9b52443838e4a36a20a14c7dd50cfcfad1 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,3 +1,7 @@
+# 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
@@ -13,12 +17,12 @@ Summary(pl.UTF-8):  GNU Emacs - edytor tekstu dla systemu X Window
 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
@@ -30,7 +34,6 @@ Source8:      %{name}-motif.desktop
 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
@@ -380,7 +383,6 @@ exit 1
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -582,7 +584,6 @@ fi
 %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