packages: emacs/emacs.spec - rel 2 - drop extras package, no more conflicts...

[baggins]

Author: baggins                      Date: Sun Jul  1 16:35:18 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- drop extras package, no more conflicts with xemacs

---- Files affected:
packages/emacs:
   emacs.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: packages/emacs/emacs.spec
diff -u packages/emacs/emacs.spec:1.121 packages/emacs/emacs.spec:1.122
--- packages/emacs/emacs.spec:1.121	Sun Jul  1 18:02:20 2012
+++ packages/emacs/emacs.spec	Sun Jul  1 18:35:13 2012
@@ -21,7 +21,7 @@
 Name:		emacs
 %define	ver	24.1
 Version:	%{ver}
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/Editors/Emacs
 Source0:	ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.bz2
@@ -63,6 +63,7 @@
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	ctags
 Requires:	gnus-pkg-emacs
+Obsoletes:	emacs-extras
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -298,7 +299,6 @@
 Summary:	The libraries needed to run the GNU Emacs text editor
 Summary(pl.UTF-8):	Biblioteki potrzebne do uruchomienia edytora tekstu GNU Emacs
 Group:		Applications/Editors/Emacs
-Requires:	emacscommon
 
 %description common
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -323,19 +323,6 @@
 emacs). Zainstaluj emacs-nox jeżeli nie zamierzasz używasz Emacsa pod
 X Window System; zainstaluj emacs jeżeli używasz X.
 
-%package extras
-Summary:	Files which conflict with XEmacs
-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.
-
-%description extras -l pl.UTF-8
-Są to wspólne pliki GNU Emacs i XEmacs.
-
 %package gnus
 Summary:	Gnus is flexible message reader under Emacs
 Summary(pl.UTF-8):	Gnus jest czytnikiem grup dyskusyjnych pod Emacsa
@@ -582,10 +569,14 @@
 %files common
 %defattr(644,root,root,755)
 %config(noreplace) /etc/skel/.emacs
-%attr(755,root,root) %{_bindir}/emacsclient
 %attr(755,root,root) %{_bindir}/ebrowse
+%attr(755,root,root) %{_bindir}/emacsclient
+%attr(755,root,root) %{_bindir}/grep-changelog
+%attr(755,root,root) %{_bindir}/rcs-checkin
 %{_mandir}/man1/ebrowse*
 %{_mandir}/man1/emacs*
+%{_mandir}/man1/grep-changelog*
+%{_mandir}/man1/rcs-checkin*
 %{_infodir}/*
 
 %dir %{_libdir}/emacs
@@ -692,13 +683,6 @@
 %{_datadir}/emacs/%{ver}/site-lisp/tuareg.el
 %{_datadir}/emacs/%{ver}/site-lisp/nemerle.el
 
-%files extras
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/grep-changelog
-%attr(755,root,root) %{_bindir}/rcs-checkin
-%{_mandir}/man1/grep-changelog*
-%{_mandir}/man1/rcs-checkin*
-
 %files el
 %defattr(644,root,root,755)
 %{_datadir}/emacs/%{ver}/lisp/*.el.gz
@@ -790,6 +774,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2012/07/01 16:35:13  baggins
+- rel 2
+- drop extras package, no more conflicts with xemacs
+
 Revision 1.121  2012/07/01 16:02:20  baggins
 - 24.1
 - xgselect fixed upstream
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/emacs/emacs.spec?r1=1.121&r2=1.122