diff --git a/.cvsignore b/.cvsignore index 3ec9660..655ab20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,3 +10,4 @@ UnicodeData-Latest.txt.gz xterm-208.tgz xterm-209.tgz xterm-211.tgz +xterm-212.tgz diff --git a/sources b/sources index 802f280..bd9e34f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz 92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt -babb9a02ba7ebb7770f48e3257b2884e xterm-211.tgz +d39ec47dbf846e0e7dddb354280c4074 xterm-212.tgz diff --git a/xterm.spec b/xterm.spec index 0b048a2..3c16bb6 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 211 -Release: 4.FC6 +Version: 212 +Release: 1.FC6 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -22,7 +22,9 @@ Patch8: xterm-208-root-grab-console.patch Patch9: xterm-209-bz182382.patch Patch10: xterm-209-bz183993.patch Patch11: xterm-211-bz186094.patch -Patch12: xterm-211-bz186935.patch +Patch12: xterm-212-bz186935.patch +Patch13: xterm-212-redhat-resources.patch +Patch14: xterm-212-man-page_paths.patch BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -68,14 +70,18 @@ programs that can't use the window system directly. #%patch5 -p1 -b .freetype #^- now fixed upstream in 208 #%patch6 -p1 -b .eightBitInput_false -%patch7 -p1 -b .redhat-resources +#%patch7 -p1 -b .redhat-resources +# ^- patch now in patch13 %patch8 -p1 -b .root-grab-console #%patch9 -p1 -b .bz182382 # ^- patch now upstream #%patch10 -p1 -b .bz183993 # ^- patch now upstream -%patch11 -p1 -b .bz186094 +#%patch11 -p1 -b .bz186094 +# ^- patch now in redhat-resources %patch12 -p1 -b .bz186935 +%patch13 -p1 -b .redhat-resources +%patch14 -p1 -b .man-page_paths %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" @@ -105,7 +111,7 @@ make %install rm -rf $RPM_BUILD_ROOT -%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} +%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} apploaddir=%{x11_app_defaults_dir} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ gunzip < %SOURCE1 > ctlseqs.txt @@ -132,6 +138,10 @@ exit 0 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Thu Apr 13 2006 Jason Vas Dias - 212-1 +- Upgrade to upstream version 212 +- fix bug 188031 : paths in man-page + * Wed Mar 29 2006 Jason Vas Dias - 211-4 - fix bug 186935: cursor GCs must be freed with XtReleaseGC