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

#2781)

.cvsignore

@@ -1 +1 @@
-fbida-2.03.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))

fbida.spec

@@ -1,34 +1,25 @@
-# $Id: fbida.spec,v 1.5 2005/02/21 17:19:10 thl Exp $
-
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
-Version:        2.03
+Version:        2.07
-Release:        3
+Release:        7%{?dist}
-License:        GPL
+License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
-Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Source:         http://dl.bytesex.org/releases/fbida/fbida-%{version}.tar.gz
 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:  openmotif-devel
+BuildRequires:  libXpm-devel
-Requires:       ImageMagick bitstream-vera-fonts
+Requires:       ImageMagick dejavu-sans-mono-fonts
+Obsoletes:      fbida-ida < 2.06-1
 
 %description
 fbi displays the specified file(s) on the linux console using the
 framebuffer device. PhotoCD, jpeg, ppm, gif, tiff, xwd, bmp and png
-are supported directly. For other formats fbi tries to use 
+are supported directly. For other formats fbi tries to use
 ImageMagick's convert.
 
-%package ida
-Group: Applications/Multimedia
-Summary: Motif based Imageviewer
-
-%description ida
-This is a X11 application (Motif based) for viewing images. Some basic 
-editing functions are available too.
-
 %package fbgs
 Group: Applications/Multimedia
 Summary: Framebuffer Postscript Viewer
@@ -39,45 +30,115 @@ A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
 
 %prep
 %setup -q
+%{__sed} -i -e "s,/X11R6,,g" GNUmakefile
+%{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
 
 %build
-LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
+LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags} HAVE_MOTIF=no exiftran thumbnail.cgi fbi
 
 %install
 %{__rm} -rf %{buildroot}
 iconv -t UTF-8 -f ISO-8859-1 fbi.man > fbi.man.new
 iconv -t UTF-8 -f ISO-8859-1 exiftran.man > exiftran.man.new
-iconv -t UTF-8 -f ISO-8859-1 ida.man > ida.man.new
 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} exiftran.man.new exiftran.man
-%{__mv} ida.man.new ida.man 
+%{__mv} fbgs.man.new fbgs.man
-%{__mv} fbgs.man.new fbgs.man 
+lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} STRIP= install
-lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes COPYING README TODO 
+%doc Changes COPYING README TODO
 %doc %{_mandir}/man1/fbi*
 %doc %{_mandir}/man1/exiftran*
 %{_bindir}/fbi
 %{_bindir}/exiftran
 
-%files ida
-%defattr(-, root, root, -)
-%doc %{_mandir}/man1/ida*
-%{_bindir}/ida
-%config %{_prefix}/X11R6/lib/X11/app-defaults/Ida
-
 %files fbgs
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/fbgs*
 %{_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
+
+* Sat Aug 25 2007 Adrian Reber <adrian@lisas.de> - 2.06-4
+- rebuilt
+
+* Tue Oct 31 2006 Adrian Reber <adrian@lisas.de> - 2.06-3
+- rebuilt for new curl
+
+* Fri Sep 29 2006 Adrian Reber <adrian@lisas.de> - 2.06-2
+- obsoleted fbida-ida subpackage (#208457)
+
+* Wed Aug 30 2006 Tom "spot" Callaway <tcallawa@redhat.com> - 2.06-1
+- get rid of ida, we can't build a working version without openmotif
+
+* Fri Jul 28 2006 Adrian Reber <adrian@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@lisas.de> - 2.03-12
+- security fix for #200321
+
+* Mon Apr 24 2006 Adrian Reber <adrian@lisas.de> - 2.03-11
+- security fix for #189721
+
+* Mon Feb 13 2006 Adrian Reber <adrian@lisas.de> - 2.03-10
+- rebuilt
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-9
+- this should finally work; also on x86_64
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-8
+- rebuilt
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-7
+- moved file Ida to %%{_datadir}/X11/app-defaults
+
+* Thu Nov 24 2005 Adrian Reber <adrian@lisas.de> - 2.03-6
+- updated for modular xorg-x11
+
+* Tue May 10 2005 Adrian Reber <adrian@lisas.de> - 2.03-5
+- fix debuginfo subpackage creation
+
+* Mon Apr 04 2005 Adrian Reber <adrian@lisas.de> - 2.03-4
+- rebuild for new libexif
+
 * Mon Feb 21 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.03-3
 - Fix typo; must be LIB=%%{_lib}; really fixes x86_64
 

sources

@@ -1 +1 @@
-8fd76661686a38a7bcd251b7aadc73eb  fbida-2.03.tar.gz
+3e05910fb7c1d9b2bd3e272d96db069c  fbida-2.07.tar.gz