rpms/geeqie/F-10 .cvsignore, 1.5, 1.6 geeqie.spec, 1.9, 1.10 sources, 1.5, 1.6 geeqie-1.0alpha2-gcc-warn.patch, 1.1, NONE geeqie-1.0beta1-desktop.patch, 1.1, NONE geeqie-1.0beta1-print-pagesize.patch, 1.1, NONE

Michael Schwendt mschwendt at fedoraproject.org
Mon Jul 6 17:30:04 UTC 2009


Author: mschwendt

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

Modified Files:
	.cvsignore geeqie.spec sources 
Removed Files:
	geeqie-1.0alpha2-gcc-warn.patch geeqie-1.0beta1-desktop.patch 
	geeqie-1.0beta1-print-pagesize.patch 
Log Message:
sync with Rawhide (1.0beta2)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 May 2009 09:37:18 -0000	1.5
+++ .cvsignore	6 Jul 2009 17:29:34 -0000	1.6
@@ -1 +1 @@
-geeqie-1.0beta1.tar.gz
+geeqie-1.0beta2.tar.gz


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/geeqie.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- geeqie.spec	15 May 2009 09:37:19 -0000	1.9
+++ geeqie.spec	6 Jul 2009 17:29:34 -0000	1.10
@@ -1,27 +1,21 @@
-%define upstreamversion 1.0beta1
+%define upstreamversion 1.0beta2
 
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.16.beta1%{?dist}
+Release: 0.17.beta2%{?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
-# submitted upstream
-Patch1: geeqie-1.0beta1-desktop.patch
-# bz 222639
-Patch3: geeqie-1.0beta1-print-pagesize.patch
-# submitted upstream
-Patch4: geeqie-1.0alpha2-gcc-warn.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
 BuildRequires: exiv2-devel
 BuildRequires: lirc-devel
-BuildRequires: gettext desktop-file-utils
+BuildRequires: gettext intltool desktop-file-utils
 
 # Not in Fedora yet. It's a development release, btw.
 #BuildRequires: libchamplain-gtk-devel >= 0.3
@@ -45,9 +39,6 @@ and zoom.
 
 %prep
 %setup -q -n %{name}-%{upstreamversion}
-%patch1 -p1 -b .desktop
-%patch3 -p1 -b .print-pagesize
-%patch4 -p1 -b .gcc-warn
 
 
 %build
@@ -90,6 +81,7 @@ update-desktop-database &> /dev/null || 
 %defattr(-,root,root,-)
 %doc %{_datadir}/doc/%{name}*
 %{_bindir}/%{name}*
+%{_libdir}/%{name}/
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
@@ -97,6 +89,11 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Jul  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.17.beta2
+- update to beta2 tarball
+- BR intltool
+- print-pagesize.patch enabled in 1.0beta2 (#222639)
+
 * Thu May 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.16.beta1
 - update to beta1 tarball
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 May 2009 09:37:19 -0000	1.5
+++ sources	6 Jul 2009 17:29:34 -0000	1.6
@@ -1 +1 @@
-58496a506fb09307fc98fcc08ed25b32  geeqie-1.0beta1.tar.gz
+4e4ddc96a83e1d6bc43d478796e0b3c4  geeqie-1.0beta2.tar.gz


--- geeqie-1.0alpha2-gcc-warn.patch DELETED ---


--- geeqie-1.0beta1-desktop.patch DELETED ---


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




More information about the fedora-extras-commits mailing list