rpms/gqview/devel gqview-configure.in-xinerama.patch, NONE, 1.1 gqview.spec, NONE, 1.1 sources, 1.1, 1.2

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv17906

Modified Files:
	sources 
Added Files:
	gqview-configure.in-xinerama.patch gqview.spec 
Log Message:
Import last Fedora Core 2 gqview src.rpm

gqview-configure.in-xinerama.patch:

--- NEW FILE gqview-configure.in-xinerama.patch ---
--- configure.in.orig	2004-03-02 11:39:15.653673888 +0100
+++ configure.in	2004-03-02 11:53:34.470113944 +0100
@@ -49,13 +49,18 @@
 dnl check for Xinerama
 AC_ARG_ENABLE(xinerama, [  --disable-xinerama      do not check for Xinerama [default: check for Xinerama]],,enable_xinerama=$enableval)
 AC_PATH_XTRA
+AC_CHECK_HEADERS(X11/Xlib.h)
 XINERAMA_LIBS=""
 if test "x$enable_xinerama" = "xno"; then
   echo "skipping test for Xinerama (Xinerama disabled)"
 else
   AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
     [XINERAMA_LIBS="-lXinerama"
-    AC_CHECK_HEADERS(X11/extensions/Xinerama.h)],
+    AC_CHECK_HEADERS(X11/extensions/Xinerama.h,,,
+[[#ifdef HAVE_X11_XLIB_H
+#include <X11/Xlib.h>
+#endif
+]])],
     [],[$X_LIBS -lX11 -lXext])
   AC_SUBST(XINERAMA_LIBS)
 fi


--- NEW FILE gqview.spec ---
Summary: 	Image browser and viewer.
Name: 		gqview
Version: 	1.4.1
Release: 	2
License: 	GPL
Group: 		User Interface/X
Source: 	http://download.sourceforge.net/sourceforge/gqview/gqview-1.4.1.tar.gz
Patch0:		gqview-configure.in-xinerama.patch
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
URL: 		http://gqview.sourceforge.net/
BuildRequires: 	libpng-devel gtk2-devel gnome-libs-devel
BuildRequires: 	gettext desktop-file-utils
# We patch configure.in...
BuildRequires:	autoconf

%description
GQview is an image viewer for browsing through graphics files. GQview
features include single click file viewing, support for external
editors, previewing images using thumbnails, and zoom.

Install GQview if you need an image viewer.

%prep
%setup -q
%patch0 -p0 
autoconf

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall GNOME_DATADIR=$RPM_BUILD_ROOT%{_datadir}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
	--delete-original \
	--vendor gnome \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category "Application;Graphics;X-Red-Hat-Extra" \
	$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Graphics/gqview.desktop

perl -pi -e 's/Name=GQview/Name=GQview Image Viewer/g' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gqview.desktop
perl -pi -e 's/Comment=Image Viewer/Comment=View and organize images/g' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gqview.desktop

# Remove unpackaged file from buildroot
rm -f $RPM_BUILD_ROOT%{_datadir}/gqview/README

%find_lang %name

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING
%{_bindir}/gqview
%{_mandir}/man1/gqview.1*
%{_datadir}/pixmaps/gqview.png
%{_datadir}/applications/*gqview.desktop

%changelog
* Tue Mar 16 2004 Warren Togami <wtogami at redhat.com> 1.4.1-2
- rebuild

* Tue Mar  2 2004 Dams <anvil[AT]livna.org> 1.4.1-1
- Fixed configure Xinerama.h checking (with patch)

* Mon Mar 01 2004 Warren Togami <wtogami at redhat.com> 1.4.0-1
- upgrade to 1.4.0
- massive spec cleanup, BuildRequires, etc.

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Oct 27 2003 Havoc Pennington <hp at redhat.com> 1.2.1-6
- rebuild for execshield

* Sun Oct 19 2003 Florian La Roche <Florian.LaRoche at redhat.de>
- add a %%clean specfile target

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May  1 2003 Elliot Lee <sopwith at redhat.com> 1.2.1-4
- Use configure macro

* Thu Feb  6 2003 Havoc Pennington <hp at redhat.com> 1.2.1-3
- 1.2.1

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Jan 17 2003 Havoc Pennington <hp at redhat.com>
- fixup menu entry, #82129

* Thu Jan  9 2003 Havoc Pennington <hp at redhat.com>
- 1.2.0

* Thu Nov 28 2002 Mike A. Harris <mharris at redhat.com> 1.0.2-3
- Cleaned up specfile to use standard RPM macros _bindir, _datadir, etc.
- Fixed build problem for if desktop_file define is set to 0
- Remove unpackaged files from buildroot
- Add previously unpackaged gqview manpage
- s/Copyright/License/
- use makeinstall macro

* Mon Jul 29 2002 Karsten Hopp <karsten at redhat.de> 1.0.2-2
- remove --add-only-show-in GNOME 

* Tue Jul 16 2002 Karsten Hopp <karsten at redhat.de> 1.0.2-1
- update (#68838)
- use desktop-file-install
- fix path to help files

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon Jul 23 2001 Jonathan Blandford <jrb at redhat.com>
- Add BuildRequires

* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
- Bump release + rebuild.

* Tue Feb 27 2001 Trond Eivind Glomsrød <teg at redhat.com>
- use %%{_tmppath}

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Fri May 19 2000 Jonathan Blandford <jrb at redhat.com>
- Updated to new version.  Added locale information.  Fixed
  build directive to reflect new build system.

* Wed Feb 02 2000 Cristian Gafton <gafton at redhat.com>
- fix description and summary

* Mon Jan 17 2000 Elliot Lee <sopwith at redhat.com>
- Fix group.

* Wed Jul 7 1999 Michael Fulbright <drmike at redhat.com>
- version 0.7.0

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 3)

* Fri Mar 19 1999 Michael Fulbright <drmike at redhat.com>
- strip binaries
* Sat Mar 6 1999 Michael Fulbright <drmike at redhat.com>
- version 0.6.0
* Wed Oct 7 1998 John Ellis <gqview at geocities.com>
- updated for version 0.4.2
* Fri Sep 11 1998 John Ellis <gqview at geocities.com>
- updated for version 0.4.1
* Sat Aug 15 1998 John Ellis <gqview at geocities.com>
- updated for version 0.4.0
* Wed Aug 5 1998 Joel Young <jyoung at erols.com>
- enhanced rpm .spec file



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2004 21:40:22 -0000	1.1
+++ sources	26 Nov 2004 09:06:44 -0000	1.2
@@ -0,0 +1 @@
+d963fbb878d78e8ebf78ea8c18caa72f  gqview-1.4.1.tar.gz