SPECS: emacs.spec - unified

[qboosh]

Author: qboosh                       Date: Mon Jun 11 17:12:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   emacs.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: SPECS/emacs.spec
diff -u SPECS/emacs.spec:1.84 SPECS/emacs.spec:1.85
--- SPECS/emacs.spec:1.84	Sun Jun 10 20:36:49 2007
+++ SPECS/emacs.spec	Mon Jun 11 19:12:35 2007
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without	athena	# don't build athena version
-%bcond_without	gtk	# don't build GTK2 version
+%bcond_without	gtk	# don't build GTK+2 version
 %bcond_without	motif	# don't build motif version
 %bcond_without	nox	# don't build nox version
 #
@@ -258,16 +258,16 @@
 Emacs - edytor tekstu Emacs dla X Window System (wersja Athena).
 
 %package gtk
-Summary:	The Emacs text editor for X Window System (GTK2 toolkit version)
-Summary(pl.UTF-8):	Emacs - edytor tekstu Emacs dla X Window System (wersja GTK2)
+Summary:	The Emacs text editor for X Window System (GTK+2 toolkit version)
+Summary(pl.UTF-8):	Emacs - edytor tekstu Emacs dla X Window System (wersja GTK+2)
 Group:		Applications/Editors/Emacs
 Requires:	%{name}-common = %{version}-%{release}
 
 %description gtk
-The Emacs text editor for X Window System (GTK2 toolkit version).
+The Emacs text editor for X Window System (GTK+2 toolkit version).
 
 %description gtk -l pl.UTF-8
-Emacs - edytor tekstu Emacs dla X Window System (wersja GTK2).
+Emacs - edytor tekstu Emacs dla X Window System (wersja GTK+2).
 
 %package motif
 Summary:	The Emacs text editor for X Window System (Motif toolkit version)
@@ -398,7 +398,7 @@
 %endif
 
 %if %{with gtk}
-echo "Building emacs GTK2 binary ..."
+echo "Building emacs GTK+2 binary ..."
 rm -rf build-gtk
 mkdir build-gtk && cd build-gtk
 ../%configure \
@@ -496,7 +496,7 @@
 	fi
 done
 
-install site-start.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+install site-start.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/skel/.emacs
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/emacs/%{version}/site-lisp/tuareg.el
@@ -805,6 +805,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2007/06/11 17:12:35  qboosh
+- unified
+
 Revision 1.84  2007/06/10 18:36:49  twittner
 - fixed `emacs: Cannot open termcap database file'
 - rel. 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/emacs.spec?r1=1.84&r2=1.85&f=u