rpms/geeqie/F-10 geeqie-1.0beta1-desktop.patch, NONE, 1.1 geeqie-1.0beta1-print-pagesize.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 geeqie.spec, 1.8, 1.9 sources, 1.4, 1.5 geeqie-1.0alpha1-print-pagesize.patch, 1.1, NONE geeqie-1.0alpha2-desktop.patch, 1.1, NONE geeqie-1.0alpha2-editors.patch, 1.2, NONE geeqie-1.0alpha3-docdirs.patch, 1.1, NONE geeqie-1.0alpha3-lirc.patch, 1.1, NONE geeqie-1.0alpha3-metadata-exit.patch, 1.1, NONE

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5262/F-10

Modified Files:
	.cvsignore geeqie.spec sources 
Added Files:
	geeqie-1.0beta1-desktop.patch 
	geeqie-1.0beta1-print-pagesize.patch 
Removed Files:
	geeqie-1.0alpha1-print-pagesize.patch 
	geeqie-1.0alpha2-desktop.patch geeqie-1.0alpha2-editors.patch 
	geeqie-1.0alpha3-docdirs.patch geeqie-1.0alpha3-lirc.patch 
	geeqie-1.0alpha3-metadata-exit.patch 
Log Message:
sync with beta1 from devel/F-12 for F-10/F11 updates-testing

geeqie-1.0beta1-desktop.patch:

--- NEW FILE geeqie-1.0beta1-desktop.patch ---
diff -Nur geeqie-1.0beta1-orig/geeqie.desktop geeqie-1.0beta1/geeqie.desktop
--- geeqie-1.0beta1-orig/geeqie.desktop	2009-05-13 21:30:49.000000000 +0200
+++ geeqie-1.0beta1/geeqie.desktop	2009-05-14 19:47:00.000000000 +0200
@@ -17,5 +17,5 @@
 #StartupNotify=false
 #StartupWMClass=geeqie
 NotShowIn=X-Geeqie;
-Categories=Application;Graphics;Viewer;
+Categories=Graphics;Viewer;
 MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-cmu-raster;image/x-sun-raster;image/x-tga;image/tiff;image/vnd.wap.wbmp;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;image/x-png;image/xpm;image/x-ico;image/x-pcx;

geeqie-1.0beta1-print-pagesize.patch:

--- NEW FILE geeqie-1.0beta1-print-pagesize.patch ---
diff -Nur geeqie-1.0beta1-orig/src/print.c geeqie-1.0beta1/src/print.c
--- geeqie-1.0beta1-orig/src/print.c	2009-05-13 21:30:37.000000000 +0200
+++ geeqie-1.0beta1/src/print.c	2009-05-14 19:52:02.000000000 +0200
@@ -1120,7 +1120,6 @@
 	g_fprintf(f, "%%%%Title:\n");
 
 	/* setup page size, coordinates (do we really need this?) */
-#if 0
 	g_fprintf(f, "<<\n");
 	g_fprintf(f, "/PageSize [%f %f]\n", pw->layout_width, pw->layout_height);
 	g_fprintf(f, "/ImagingBBox [%f %f %f %f]\n", /* l b r t */
@@ -1129,7 +1128,6 @@
 	g_fprintf(f, "/Orientation %d\n",
 		(pw->paper_orientation == PAPER_ORIENTATION_PORTRAIT) ? 0 : 1);
 	g_fprintf(f, ">> setpagedevice\n");
-#endif
 
 	ret = !pipe_handler_check(pe);
 	pipe_handler_free(pe);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Feb 2009 07:30:01 -0000	1.4
+++ .cvsignore	15 May 2009 09:37:18 -0000	1.5
@@ -1 +1 @@
-geeqie-1.0alpha3.tar.gz
+geeqie-1.0beta1.tar.gz


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/geeqie.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- geeqie.spec	26 Feb 2009 07:30:02 -0000	1.8
+++ geeqie.spec	15 May 2009 09:37:19 -0000	1.9
@@ -1,22 +1,20 @@
-%define upstreamversion 1.0alpha3
+%define upstreamversion 1.0beta1
 
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.14.alpha3%{?dist}
+Release: 0.16.beta1%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
 #Source: geeqie-1.0alpha2-svn-1341.tgz
 Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
-Patch1: geeqie-1.0alpha2-desktop.patch
-Patch2: geeqie-1.0alpha2-editors.patch
+# submitted upstream
+Patch1: geeqie-1.0beta1-desktop.patch
 # bz 222639
-Patch3: geeqie-1.0alpha1-print-pagesize.patch
+Patch3: geeqie-1.0beta1-print-pagesize.patch
+# submitted upstream
 Patch4: geeqie-1.0alpha2-gcc-warn.patch
-Patch5: geeqie-1.0alpha3-lirc.patch
-Patch6: geeqie-1.0alpha3-docdirs.patch
-Patch7: geeqie-1.0alpha3-metadata-exit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel
@@ -25,6 +23,9 @@ BuildRequires: exiv2-devel
 BuildRequires: lirc-devel
 BuildRequires: gettext desktop-file-utils
 
+# Not in Fedora yet. It's a development release, btw.
+#BuildRequires: libchamplain-gtk-devel >= 0.3
+
 # Something for the future:
 # Replace GQView last stable release in Fedora space,
 # plus allow for it to return if a higher version.
@@ -32,7 +33,8 @@ BuildRequires: gettext desktop-file-util
 #Obsoletes: gqview <= 2.0.4
 
 %description
-*** This software is currently in alpha state ***
+*** Caution! This is a beta release.
+*** Be careful when evaluating this software.
 
 Geeqie has been forked from the GQview project with the goal of picking up
 development and integrating patches. It is an image viewer for browsing
@@ -44,17 +46,13 @@ and zoom.
 %prep
 %setup -q -n %{name}-%{upstreamversion}
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .editors
 %patch3 -p1 -b .print-pagesize
 %patch4 -p1 -b .gcc-warn
-%patch5 -p1 -b .lirc
-%patch6 -p1 -b .docdirs
-%patch7 -p1 -b .metadata-exit
 
 
 %build
 %configure --enable-lirc
-make clean
+#make clean
 make %{?_smp_mflags}
 
 
@@ -91,13 +89,20 @@ update-desktop-database &> /dev/null || 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc %{_datadir}/doc/%{name}*
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_mandir}/man1/%{name}.1*
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 
 
 %changelog
+* Thu May 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.16.beta1
+- update to beta1 tarball
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.15.alpha3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb  7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.14.alpha3
 - fetch src/utilops.c change from svn 1385 for metadata crash-fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Feb 2009 07:30:02 -0000	1.4
+++ sources	15 May 2009 09:37:19 -0000	1.5
@@ -1 +1 @@
-0f0c3991ee4ef9232e21ed49fa879b83  geeqie-1.0alpha3.tar.gz
+58496a506fb09307fc98fcc08ed25b32  geeqie-1.0beta1.tar.gz


--- geeqie-1.0alpha1-print-pagesize.patch DELETED ---


--- geeqie-1.0alpha2-desktop.patch DELETED ---


--- geeqie-1.0alpha2-editors.patch DELETED ---


--- geeqie-1.0alpha3-docdirs.patch DELETED ---


--- geeqie-1.0alpha3-lirc.patch DELETED ---


--- geeqie-1.0alpha3-metadata-exit.patch DELETED ---