rpms/xterm/devel xterm.spec, 1.23, 1.24 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31162

Modified Files:
	xterm.spec sources .cvsignore 
Log Message:
upgrade to upstream version 207; fix modular X app-defaults directory


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xterm.spec	13 Nov 2005 17:04:34 -0000	1.23
+++ xterm.spec	14 Nov 2005 20:40:08 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 206
-Release: 4
+Version: 207
+Release: 1
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -12,7 +12,6 @@
 Patch2: xterm-179-ppc-fix-bug-101472.patch
 Patch3: xterm-tty-group-name.patch
 Patch4: xterm-206-appsdir.patch
-BuildRequires: xorg-x11-proto-devel
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -53,14 +52,14 @@
            --with-utempter \
            --disable-tek4014 \
 	   --enable-narrowproto \
-	   --with-app-defaults=%{_datadir}/X11/app-defaults \
+	   --with-app-defaults=%{_sysconfdir}/X11/app-defaults \
            %{?_with_256_color:--enable-256-color};
 export XTERM_TTY_GROUP_NAME=tty;
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults
+%makeinstall appsdir=$RPM_BUILD_ROOT/%{_sysconfdir}/X11/app-defaults
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 
@@ -74,12 +73,16 @@
 %{_bindir}/xterm
 %{_mandir}/man1/resize.1*
 %{_mandir}/man1/xterm.1*
-%{_datadir}/X11/app-defaults/UXTerm
-%{_datadir}/X11/app-defaults/XTerm
-%{_datadir}/X11/app-defaults/XTerm-color
+%{_sysconfdir}/X11/app-defaults/UXTerm
+%{_sysconfdir}/X11/app-defaults/XTerm
+%{_sysconfdir}/X11/app-defaults/XTerm-color
 %doc xterm.log.html ctlseqs.ms README.i18n
 
 %changelog
+* Mon Nov 14 2005 Jason Vas Dias<jvdias at redhat.com> - 207-1
+- Upgrade to upstream version 207
+- Fix app-defaults directory for modular X11
+
 * Sun Nov 13 2005 Jeremy Katz <katzj at redhat.com> - 206-4
 - rebuild for newer modular X
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2005 18:23:58 -0000	1.7
+++ sources	14 Nov 2005 20:40:08 -0000	1.8
@@ -1 +1,2 @@
 21e22fe56f2af0b952619acbe0a1d7ae  xterm-206.tgz
+3de8a3756c284a46a08c6d0308909486  xterm-207.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2005 18:23:58 -0000	1.7
+++ .cvsignore	14 Nov 2005 20:40:08 -0000	1.8
@@ -3,3 +3,4 @@
 xterm-205.tgz
 xterm-205.tgz.asc
 xterm-206.tgz
+xterm-207.tgz