Fix typo that causes a failure to update the common directory. (releng

#2781)

.cvsignore

@@ -1 +1 @@
-fbida-2.06.tar.gz
+fbida-2.07.tar.gz

Makefile

@@ -1,10 +1,10 @@
 # Makefile for source rpm: fbida
-# $Id$
+# $Id: Makefile,v 1.1 2004/12/17 18:53:36 scop Exp $
 NAME := fbida
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

fbgs.1.diff

@@ -1,14 +0,0 @@
---- 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

@@ -1,11 +0,0 @@
---- 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.

fbida-2.06-no-page-h.patch

@@ -1,12 +0,0 @@
-diff -u fbida-2.06/fbtools.c fbida-2.06.new/fbtools.c
---- fbida-2.06/fbtools.c	2006-08-14 21:38:05.000000000 +0200
-+++ fbida-2.06.new/fbtools.c	2008-02-15 09:54:37.000000000 +0100
-@@ -21,8 +21,6 @@
- #include <linux/vt.h>
- #include <linux/fb.h>
- 
--#include <asm/page.h>
--
- #include "fbtools.h"
- 
- /* -------------------------------------------------------------------- */

fbida.spec

@@ -1,20 +1,17 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
-Version:        2.06
-Release:        5%{?dist}
+Version:        2.07
+Release:        7%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-%{version}.tar.gz
-Patch0:         fbgs.1.diff
-Patch1:         fbi.1.diff
-Patch2:         fbida-2.06-no-page-h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
-BuildRequires:  libungif-devel curl-devel
+BuildRequires:  giflib-devel curl-devel
 BuildRequires:  libXpm-devel
-Requires:       ImageMagick bitstream-vera-fonts
+Requires:       ImageMagick dejavu-sans-mono-fonts
 Obsoletes:      fbida-ida < 2.06-1
 
 %description
@@ -33,10 +30,6 @@ A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
 
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2 -p1
-%{__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
 
@@ -51,7 +44,7 @@ iconv -t UTF-8 -f ISO-8859-1 fbgs.man > fbgs.man.new
 %{__mv} fbi.man.new fbi.man
 %{__mv} exiftran.man.new exiftran.man
 %{__mv} fbgs.man.new fbgs.man
-lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
+lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} STRIP= install
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -70,6 +63,33 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %{_bindir}/fbgs
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.07-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Matěj Cepl <mcepl@redhat.com> - 2.07-6
+- actually ida* stuff doesn't get build without Motif
+
+* Thu Feb 26 2009 Matěj Cepl <mcepl@redhat.com> - 2.07-5
+- Fix dependencies on fonts (bug# 480450) -- I made a typo in
+  BuildRequires.
+- Fix %%files (missing *ida* stuff).
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.07-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec 18 2008 Adrian Reber <adrian@lisas.de> - 2.07-3
+- removed bitstream-vera dependency to fix (#473559)
+  "Replace bitstream-vera dependencies with dejavu dependencies"
+- changed BR libungif-devel to giflib-devel
+
+* Fri Jul 04 2008 Adrian Reber <adrian@lisas.de> - 2.07-2
+- applied patch from Ville Skyttä to fix
+  "fbida: empty debuginfo package" (#453998)
+
+* Mon Jun 09 2008 Adrian Reber <adrian@lisas.de> - 2.07-1
+- updated to 2.07
+- fixes "The fbi command aborts with a stack trace" (#448126)
+
 * Fri Feb 15 2008 Adrian Reber <adrian@lisas.de> - 2.06-5
 - rebuilt
 - added patch to fix build failure on ppc/ppc64

sources

@@ -1 +1 @@
-1f78e9a83fb546660a024a4bc0580ace  fbida-2.06.tar.gz
+3e05910fb7c1d9b2bd3e272d96db069c  fbida-2.07.tar.gz