packages: xemacs/xemacs-destdir.patch, xemacs/xemacs-info.patch, xemacs/xem...

Sun Jul 1 18:37:34 CEST 2012

Author: baggins                      Date: Sun Jul  1 16:37:34 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated patches
- dropped extras package, no more conflicts with GNU emacs

---- Files affected:
packages/xemacs:
   xemacs-destdir.patch (1.3 -> 1.4) , xemacs-info.patch (1.4 -> 1.5) , xemacs.spec (1.175 -> 1.176) , xemacs-libpng15.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xemacs/xemacs-destdir.patch
diff -u packages/xemacs/xemacs-destdir.patch:1.3 packages/xemacs/xemacs-destdir.patch:1.4

--- packages/xemacs/xemacs-destdir.patch:1.3	Wed Apr  6 23:37:21 2011
+++ packages/xemacs/xemacs-destdir.patch	Sun Jul  1 18:37:29 2012
@@ -10,7 +10,7 @@
  SHELL = /bin/sh
  LANG = C
  LC_ALL = C
-@@ -378,37 +380,37 @@
+@@ -378,33 +380,33 @@
  	(cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \
  	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
  	    archlibdir=${archlibdir}) ; done
@@ -58,12 +58,7 @@
 +	cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
  # endif /* CYGWIN */
  #endif /* WIN32_NATIVE */
- 	if test "${prefix}" != "${exec_prefix}"; then \
--	  $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
-+	  $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \
- 	  for dir in \
- 		lib/${inststaticdir} \
- 	 	lib/${instvardir}/etc \
+ #ifdef HAVE_SHLIB
 @@ -417,13 +419,13 @@
  	  done; \
  	fi
@@ -157,22 +152,13 @@
  
  ## Delete all the installed files that the `install' target would
  ## create (but not the noninstalled files such as `make all' would
-diff -ru xemacs-21.5.21.orig/dynodump/Makefile.in.in xemacs-21.5.21/dynodump/Makefile.in.in
---- xemacs-21.5.21.orig/dynodump/Makefile.in.in	2001-04-12 20:20:43.000000000 +0200
-+++ xemacs-21.5.21/dynodump/Makefile.in.in	2005-06-02 12:51:26.000000000 +0200
-@@ -21,6 +21,8 @@
- 
- ## Synched up with: Not synched with FSF.
- 
-+DESTDIR=
-+
- ## For performance and consistency, no built-in rules.
- .SUFFIXES:
- .SUFFIXES: .c .o .i .h
 diff -ru xemacs-21.5.21.orig/etc/tests/external-widget/Makefile xemacs-21.5.21/etc/tests/external-widget/Makefile
 --- xemacs-21.5.21.orig/etc/tests/external-widget/Makefile	1996-12-18 23:42:31.000000000 +0100
 +++ xemacs-21.5.21/etc/tests/external-widget/Makefile	2005-06-02 12:51:26.000000000 +0200
-@@ -1,3 +1,5 @@
+@@ -1,6 +1,8 @@
+ ## You should have received a copy of the GNU General Public License
+ ## along with XEmacs.  If not, see <http://www.gnu.org/licenses/>.
+ 
 +DESTDIR=
 +
  CFLAGS += -Xc -g -DTOOLTALK
@@ -291,27 +277,6 @@
  SHELL=/bin/sh
  RM=rm -f
  CC=../../lib-src/ellcc
-diff -ru xemacs-21.5.21.orig/netinstall/Makefile.in.in xemacs-21.5.21/netinstall/Makefile.in.in
---- xemacs-21.5.21.orig/netinstall/Makefile.in.in	2001-12-20 06:49:40.000000000 +0100
-+++ xemacs-21.5.21/netinstall/Makefile.in.in	2005-06-02 12:51:27.000000000 +0200
-@@ -13,6 +13,8 @@
- ##
- ## Makefile for Cygwin installer
- 
-+DESTDIR=
-+
- ## For performance and consistency, no built-in rules
- .SUFFIXES:
- .SUFFIXES: .c .cc .h .o
-@@ -171,7 +173,7 @@
- install:
- 	@echo; echo "Installing net setup."
- 	for file in ${INSTALLABLES} ; do \
--	  (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \
-+	  (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \
- 	done
- 
- version.c : $(srcdir)/ChangeLog Makefile
 diff -ru xemacs-21.5.21.orig/src/Makefile.in.in xemacs-21.5.21/src/Makefile.in.in
 --- xemacs-21.5.21.orig/src/Makefile.in.in	2005-04-09 01:11:18.000000000 +0200
 +++ xemacs-21.5.21/src/Makefile.in.in	2005-06-02 12:51:27.000000000 +0200

================================================================
Index: packages/xemacs/xemacs-info.patch
diff -u packages/xemacs/xemacs-info.patch:1.4 packages/xemacs/xemacs-info.patch:1.5
--- packages/xemacs/xemacs-info.patch:1.4	Sun Oct  2 23:52:31 2005
+++ packages/xemacs/xemacs-info.patch	Sun Jul  1 18:37:29 2012
@@ -10,18 +10,6 @@
  @direntry
  * Common Lisp: (cl).		XEmacs Common Lisp emulation package.
  @end direntry
-diff -urbB xemacs-21.5.22.org/man/custom.texi xemacs-21.5.22/man/custom.texi
---- xemacs-21.5.22.org/man/custom.texi	2003-10-10 14:39:27.000000000 +0200
-+++ xemacs-21.5.22/man/custom.texi	2005-10-02 23:49:07.730680250 +0200
-@@ -10,7 +10,7 @@
- @c %**end of header
- 
- @ifinfo
-- at dircategory XEmacs Editor
-+ at dircategory XEmacs Editor:
- @direntry
- * Customizations: (custom).	Customization Library.
- @end direntry
 diff -urbB xemacs-21.5.22.org/man/external-widget.texi xemacs-21.5.22/man/external-widget.texi
 --- xemacs-21.5.22.org/man/external-widget.texi	2002-06-04 08:04:35.000000000 +0200
 +++ xemacs-21.5.22/man/external-widget.texi	2005-10-02 23:49:34.848375000 +0200
@@ -69,18 +57,6 @@
 + at dircategory XEmacs Editor:
  @direntry
  * Intro: (new-users-guide).	Introduction to the XEmacs Editor.
- @end direntry
-diff -urbB xemacs-21.5.22.org/man/term.texi xemacs-21.5.22/man/term.texi
---- xemacs-21.5.22.org/man/term.texi	2002-07-29 23:52:15.000000000 +0200
-+++ xemacs-21.5.22/man/term.texi	2005-10-02 23:51:06.194083750 +0200
-@@ -8,7 +8,7 @@
- @end titlepage
- 
- @ifinfo
-- at dircategory XEmacs Editor
-+ at dircategory XEmacs Editor:
- @direntry
- * Term mode: (term).		XEmacs Terminal Emulator Mode.
  @end direntry
 diff -urbB xemacs-21.5.22.org/man/widget.texi xemacs-21.5.22/man/widget.texi
 --- xemacs-21.5.22.org/man/widget.texi	2004-04-19 10:02:27.000000000 +0200

================================================================
Index: packages/xemacs/xemacs.spec
diff -u packages/xemacs/xemacs.spec:1.175 packages/xemacs/xemacs.spec:1.176
--- packages/xemacs/xemacs.spec:1.175	Sun Jul  1 18:14:12 2012
+++ packages/xemacs/xemacs.spec	Sun Jul  1 18:37:29 2012
@@ -39,7 +39,6 @@
 Patch7:		%{name}-level3.patch
 Patch8:		%{name}-ptmx.patch
 Patch9:		%{name}-set-locale-to-c-when-not-supported-by-x.patch
-Patch10:	%{name}-libpng15.patch
 URL:		http://www.xemacs.org/
 # for X11/bitmaps/gray
 BuildRequires:	automake
@@ -66,6 +65,7 @@
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	ctags
 Requires:	xorg-lib-libXt >= 1.0
+Obsoletes:	xemacs-extras
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -79,10 +79,7 @@
 
 xemacs-common - common files needed by xemacs and xemacs-nox packages
 xemacs - XEmacs binary with both X11 and TTY support xemacs-nox -
-XEmacs binary with TTY support only xemacs-extras - files in conflict
-with emacs
-
-Install xemacs-extras if you haven't emacs installed.
+XEmacs binary with TTY support only
 
 %description -l ja.UTF-8
 XEmacs は Free Software Foundation の Richard Stallman によって
@@ -106,11 +103,9 @@
 xemacs-common - pakiet zawierający pliki współdzielone przez pakiety
 xemacs i xemacs-nox xemacs - XEmacs skompilowany ze wsparciem dla X11
 i konsoli xemacs-nox - XEmacs skompilowany bez wsparcia dla X11
-(pracuje tylko na konsoli tekstowej) xemacs-extras - pliki wchodzące w
-skład dystrybucji GNU Emacs
+(pracuje tylko na konsoli tekstowej)
 
 Do pracy niezbędne są xemacs-common oraz xemacs bądź xemacs-nox.
-Zainstaluj także xemacs-extras jeśli nie posiadasz GNU Emacsa.
 
 %description -l pt_BR.UTF-8
 XEmacs é uma versão do Emacs, compatível com o GNU Emacs, contendo
@@ -148,7 +143,6 @@
 Summary:	Common part of XEmacs distribution
 Summary(pl.UTF-8):	Wspólne części XEmacsa
 Group:		Applications/Editors/Emacs
-Requires:	emacscommon
 Provides:	xemacs-base-pkg
 
 %description common
@@ -175,22 +169,6 @@
 XEmacs skompilowany bez wsparcia dla X11 (pracuje tylko na konsoli lub
 w okienku xterma).
 
-%package extras
-Summary:	Files which conflict with GNU Emacs
-Summary(pl.UTF-8):	Wspólne pliki XEmacsa i GNU Emacsa
-Group:		Applications/Editors/Emacs
-Provides:	emacscommon
-Obsoletes:	emacscommon
-
-%description extras
-These files are common between GNU Emacs and XEmacs. If you do not
-have GNU Emacs installed, be sure to install this package as well when
-you install XEmacs.
-
-%description extras -l pl.UTF-8
-Są to wpólne pliki GNU Emacs i XEmacs. Jeśli nie zainstalowałeś GNU
-Emacsa, to koniecznie zainstaluj ten pakiet.
-
 %prep
 %setup -q -a2
 %patch0 -p1
@@ -204,7 +182,6 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 %if "%{_lib}" == "lib64"
 sed -i -e 's#"lib"#"lib64"#g' lisp/find-paths.el lisp/info.el lisp/setup-paths.el
@@ -442,6 +419,7 @@
 %files common
 %defattr(644,root,root,755)
 %doc README etc/NEWS
+%attr(755,root,root) %{_bindir}/b2m
 %dir %{_datadir}/%{name}-%{xver}
 %dir %{_datadir}/%{name}-%{xver}/etc
 %{_datadir}/%{name}-%{xver}/etc/package-index.LATEST.gpg
@@ -496,17 +474,16 @@
 %endif
 %attr(755,root,root) %{_bindir}/gnuserv-nox
 
-%files extras
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/b2m
-%attr(755,root,root) %{_bindir}/rcs-checkin
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2012/07/01 16:37:29  baggins
+- updated patches
+- dropped extras package, no more conflicts with GNU emacs
+
 Revision 1.175  2012/07/01 16:14:12  baggins
 - up to 21.5.31
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/xemacs/xemacs-destdir.patch?r1=1.3&r2=1.4
    http://cvs.pld-linux.org/packages/xemacs/xemacs-info.patch?r1=1.4&r2=1.5
    http://cvs.pld-linux.org/packages/xemacs/xemacs.spec?r1=1.175&r2=1.176

