rpms/fbida/devel fbgs.1.diff, NONE, 1.1 fbi.1.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 fbida.spec, 1.15, 1.16 sources, 1.3, 1.4 fbida.CVE-2006-1695.patch, 1.1, NONE

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7943

Modified Files:
	.cvsignore fbida.spec sources 
Added Files:
	fbgs.1.diff fbi.1.diff 
Removed Files:
	fbida.CVE-2006-1695.patch 
Log Message:
* Fri Jul 28 2006 Adrian Reber <adrian at lisas.de> - 2.05-1
- updated to 2.05
- dropped fbida.CVE-2006-1695.patch (now included)
- dropped fix for #200321 (included in new release)
- added two patches from debian to fix typos in manpages


fbgs.1.diff:

--- NEW FILE fbgs.1.diff ---
--- fbgs.man	2005-05-30 01:31:53.177642000 -0400
+++ /tmp/fbgs1.gz.27328	2005-05-30 01:31:53.000000000 -0400
@@ -8,9 +8,9 @@
 .B fbgs
 is a simple wrapper script which takes a PostScript or pdf
 file as input, renders the pages using ghostscript into a
-temporarely directory and finally calls fbi to display them.
+temporary directory and finally calls fbi to display them.
 .SH OPTIONS
-fbps understands all fbi options (they are passed throuth).
+fbps understands all fbi options (they are passed through).
 Additionally you can specify -l, -xl or -xxl to get the pages
 rendered with 100, 120 or 150 dpi (default is 75). You can
 use option -p <password> if your PDF file requires password.

fbi.1.diff:

--- NEW FILE fbi.1.diff ---
--- fbi.man	2005-05-30 01:33:43.633949000 -0400
+++ /tmp/fbi1.gz.27873	2005-05-30 01:33:43.000000000 -0400
@@ -77,7 +77,7 @@
 preserve timestamps (when editing images).
 .TP
 .B --comments
-Display comment tags (if present) instead of the filename.  Probaby
+Display comment tags (if present) instead of the filename.  Probably
 only useful if you added reasonable comments yourself (using wrjpgcom
 for example), otherwise you likely just find texts pointing to the
 software which created the image.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 18:24:12 -0000	1.3
+++ .cvsignore	28 Jul 2006 06:48:41 -0000	1.4
@@ -1 +1 @@
-fbida-2.03.tar.gz
+fbida-2.05.tar.gz


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fbida.spec	27 Jul 2006 15:43:51 -0000	1.15
+++ fbida.spec	28 Jul 2006 06:48:41 -0000	1.16
@@ -1,12 +1,13 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
-Version:        2.03
-Release:        12%{?dist}
+Version:        2.05
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
-Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
-Patch:          fbida.CVE-2006-1695.patch
+Source:         http://dl.bytesex.org/releases/fbida/fbida-2.05.tar.gz
+Patch0:         fbgs.1.diff
+Patch1:         fbi.1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -39,11 +40,11 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0
+%patch1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__sed} -i -e "s,/X11R6,,g" GNUmakefile
 %{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
-%{__sed} -i -e "s,-dSAVER,-dSAFER," fbgs
 
 %build
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -83,6 +84,12 @@
 %{_bindir}/fbgs
 
 %changelog
+* Fri Jul 28 2006 Adrian Reber <adrian at lisas.de> - 2.05-1
+- updated to 2.05
+- dropped fbida.CVE-2006-1695.patch (now included)
+- dropped fix for #200321 (included in new release)
+- added two patches from debian to fix typos in manpages
+
 * Thu Jul 27 2006 Adrian Reber <adrian at lisas.de> - 2.03-12
 - security fix for #200321
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 18:24:12 -0000	1.3
+++ sources	28 Jul 2006 06:48:41 -0000	1.4
@@ -1 +1 @@
-8fd76661686a38a7bcd251b7aadc73eb  fbida-2.03.tar.gz
+7a624bb9f08e76c80e79eca2fbbe770d  fbida-2.05.tar.gz


--- fbida.CVE-2006-1695.patch DELETED ---