rpms/geeqie/F-10 geeqie-1.0alpha3-docdirs.patch, NONE, 1.1 geeqie-1.0alpha3-lirc.patch, NONE, 1.1 geeqie-1.0alpha3-metadata-exit.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 geeqie-1.0alpha2-editors.patch, 1.1, 1.2 geeqie.spec, 1.7, 1.8 sources, 1.3, 1.4 geeqie-1.0alpha2-float-layout.patch, 1.1, NONE geeqie-1.0alpha2-remote-blank.patch, 1.1, NONE geeqie-1.0alpha2-vf_notify_cb.patch, 1.1, NONE
Michael Schwendt
mschwendt at fedoraproject.org
Thu Feb 26 07:30:32 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/geeqie/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18702
Modified Files:
.cvsignore geeqie-1.0alpha2-editors.patch geeqie.spec sources
Added Files:
geeqie-1.0alpha3-docdirs.patch geeqie-1.0alpha3-lirc.patch
geeqie-1.0alpha3-metadata-exit.patch
Removed Files:
geeqie-1.0alpha2-float-layout.patch
geeqie-1.0alpha2-remote-blank.patch
geeqie-1.0alpha2-vf_notify_cb.patch
Log Message:
copy from Rawhide for F-10 updates-testing
geeqie-1.0alpha3-docdirs.patch:
--- NEW FILE geeqie-1.0alpha3-docdirs.patch ---
diff -Nur geeqie-1.0alpha3-orig/src/rcfile.c geeqie-1.0alpha3/src/rcfile.c
--- geeqie-1.0alpha3-orig/src/rcfile.c 2009-01-25 19:53:32.000000000 +0100
+++ geeqie-1.0alpha3/src/rcfile.c 2009-01-28 11:11:52.000000000 +0100
@@ -921,9 +921,10 @@
READ_BOOL(metadata.confirm_on_dir_change);
/* Documentation */
+/* Rely on defaults to make version upgrades work.
READ_CHAR(documentation.helpdir);
READ_CHAR(documentation.htmldir);
-
+*/
}
fclose(f);
geeqie-1.0alpha3-lirc.patch:
--- NEW FILE geeqie-1.0alpha3-lirc.patch ---
diff -Nur geeqie-1.0alpha3-orig/src/lirc.c geeqie-1.0alpha3/src/lirc.c
--- geeqie-1.0alpha3-orig/src/lirc.c 2009-01-25 19:53:32.000000000 +0100
+++ geeqie-1.0alpha3/src/lirc.c 2009-01-28 10:53:37.000000000 +0100
@@ -176,7 +176,7 @@
}
if (x != 0 || y != 0)
{
- layout_image_scroll(lw, x, y);
+ layout_image_scroll(lw, x, y, FALSE);
}
if (ret == -1)
geeqie-1.0alpha3-metadata-exit.patch:
--- NEW FILE geeqie-1.0alpha3-metadata-exit.patch ---
diff -Nur geeqie-1.0alpha3-orig/src/utilops.c geeqie-1.0alpha3/src/utilops.c
--- geeqie-1.0alpha3-orig/src/utilops.c 2009-01-25 19:53:32.000000000 +0100
+++ geeqie-1.0alpha3/src/utilops.c 2009-02-08 00:01:10.000000000 +0100
@@ -589,8 +589,16 @@
{
UtilityData *ud = data;
- /* this is removed when ud is destroyed */
- if (ud->perform_idle_id == -1) ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
+ if (ud->perform_idle_id == -1)
+ {
+ /* this function was called directly
+ just setup idle callback and wait until we are called again
+ */
+
+ /* this is removed when ud is destroyed */
+ ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
+ return TRUE;
+ }
g_assert(ud->flist);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 Jul 2008 09:31:01 -0000 1.3
+++ .cvsignore 26 Feb 2009 07:30:01 -0000 1.4
@@ -1 +1 @@
-geeqie-1.0alpha2.tar.gz
+geeqie-1.0alpha3.tar.gz
geeqie-1.0alpha2-editors.patch:
Index: geeqie-1.0alpha2-editors.patch
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/geeqie-1.0alpha2-editors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geeqie-1.0alpha2-editors.patch 31 Jul 2008 09:31:01 -0000 1.1
+++ geeqie-1.0alpha2-editors.patch 26 Feb 2009 07:30:02 -0000 1.2
@@ -1,19 +1,14 @@
-diff -Nur geeqie-1.0alpha2-orig/src/editors.c geeqie-1.0alpha2/src/editors.c
---- geeqie-1.0alpha2-orig/src/editors.c 2008-07-30 22:01:32.000000000 +0200
-+++ geeqie-1.0alpha2/src/editors.c 2008-07-31 10:42:04.000000000 +0200
-@@ -56,13 +56,13 @@
+diff -Nur geeqie-1.0alpha2-1341svn-orig/src/editors.c geeqie-1.0alpha2-1341svn/src/editors.c
+--- geeqie-1.0alpha2-1341svn-orig/src/editors.c 2009-01-21 16:12:56.000000000 +0100
++++ geeqie-1.0alpha2-1341svn/src/editors.c 2009-01-22 12:30:51.000000000 +0100
+@@ -57,8 +57,8 @@
static Editor editor_slot_defaults[GQ_EDITOR_SLOTS] = {
- { N_("The Gimp"), "gimp-remote %{.cr2;.crw;.nef;.raw;*}f" },
+ { N_("The Gimp"), "gimp-remote %{%raw;*}f" },
- { N_("XV"), "xv %f" },
- { N_("Xpaint"), "xpaint %f" },
- { N_("UFraw"), "ufraw %{.cr2;.crw;.nef;.raw}p" },
- { N_("Add XMP sidecar"), "%vFILE=%{.cr2;.crw;.nef;.raw}p;XMP=`echo \"$FILE\"|sed -e 's|\\.[^.]*$|.xmp|'`; exiftool -tagsfromfile \"$FILE\" \"$XMP\"" },
- { N_("Symlink"), "ln -s %p %d"},
- { NULL, NULL },
- { NULL, NULL },
+ { NULL, NULL },
+ { NULL, NULL },
- { N_("Rotate jpeg clockwise"), "%vif jpegtran -rotate 90 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi" },
- { N_("Rotate jpeg counterclockwise"), "%vif jpegtran -rotate 270 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi" },
- /* special slots */
+ { N_("UFraw"), "ufraw %{%raw}p" },
+ { N_("Symlink"), "ln -s %p %d"},
+ { NULL, NULL },
Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/geeqie.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geeqie.spec 10 Feb 2009 21:10:46 -0000 1.7
+++ geeqie.spec 26 Feb 2009 07:30:02 -0000 1.8
@@ -1,25 +1,25 @@
-%define upstreamversion 1.0alpha2
+%define upstreamversion 1.0alpha3
Summary: Image browser and viewer
Name: geeqie
Version: 1.0
-Release: 0.9.alpha2%{?dist}
+Release: 0.14.alpha3%{?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
# bz 222639
Patch3: geeqie-1.0alpha1-print-pagesize.patch
Patch4: geeqie-1.0alpha2-gcc-warn.patch
-# on version upgrade: remove this!
-Patch5: geeqie-1.0alpha2-remote-blank.patch
-# on version upgrade: remove this!
-Patch6: geeqie-1.0alpha2-float-layout.patch
-Patch7: geeqie-1.0alpha2-vf_notify_cb.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 >= 2.4.0
+BuildRequires: gtk2-devel
BuildRequires: lcms-devel
BuildRequires: exiv2-devel
BuildRequires: lirc-devel
@@ -47,13 +47,14 @@
%patch2 -p1 -b .editors
%patch3 -p1 -b .print-pagesize
%patch4 -p1 -b .gcc-warn
-%patch5 -p1 -b .remote-blank
-%patch6 -p1 -b .float-layout
-%patch7 -p1 -b .vf_notify_cb
+%patch5 -p1 -b .lirc
+%patch6 -p1 -b .docdirs
+%patch7 -p1 -b .metadata-exit
%build
%configure --enable-lirc
+make clean
make %{?_smp_mflags}
@@ -66,7 +67,6 @@
${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}
rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}/ChangeLog
-[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop ] && exit 1
desktop-file-install \
--delete-original \
--vendor fedora \
@@ -98,8 +98,32 @@
%changelog
-* Tue Feb 10 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.9.alpha2
-- fix vf_notify_cb crash (#484912)
+* 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
+
+* Wed Jan 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.13.alpha3
+- ignore .helpdir/.htmldir values in geeqierc to fix "Help"
+- add --enable-lirc again to build with LIRC
+
+* Mon Jan 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.12.alpha3
+- update to alpha3 tarball
+
+* Thu Jan 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.11.alpha2.1341svn
+- update to svn 1341 for pre-alpha3 testing (image metadata features)
+- drop obsolete patches remote-blank and float-layout
+
+* Wed Dec 24 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.11.alpha2.1307svn
+- update to svn 1307 for "Safe delete"
+
+* Thu Dec 18 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.11.alpha2.1299svn
+- drop desktop file Exec= invocation patch (no longer necessary)
+
+* Thu Dec 18 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.10.alpha2.1299svn
+- update to svn 1299 for new exiv2
+- disable LIRC support which is broken
+
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.9.alpha2
+- respin (exiv2)
* Tue Aug 12 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.8.alpha2
- fix float layout for --blank mode
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Jul 2008 09:31:01 -0000 1.3
+++ sources 26 Feb 2009 07:30:02 -0000 1.4
@@ -1 +1 @@
-3a9acd46defdebe7444cc9f46fdfa956 geeqie-1.0alpha2.tar.gz
+0f0c3991ee4ef9232e21ed49fa879b83 geeqie-1.0alpha3.tar.gz
--- geeqie-1.0alpha2-float-layout.patch DELETED ---
--- geeqie-1.0alpha2-remote-blank.patch DELETED ---
--- geeqie-1.0alpha2-vf_notify_cb.patch DELETED ---
More information about the fedora-extras-commits
mailing list