rpms/geeqie/devel geeqie-1.0alpha2-desktop.patch, NONE, 1.1 geeqie-1.0alpha2-editors.patch, NONE, 1.1 geeqie-1.0alpha2-gcc-warn.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 geeqie.spec, 1.2, 1.3 sources, 1.2, 1.3 geeqie-1.0alpha1-desktop.patch, 1.1, NONE geeqie-1.0alpha1-editors.patch, 1.1, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Thu Jul 31 09:31:32 UTC 2008
Author: mschwendt
Update of /cvs/pkgs/rpms/geeqie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19221
Modified Files:
.cvsignore geeqie.spec sources
Added Files:
geeqie-1.0alpha2-desktop.patch geeqie-1.0alpha2-editors.patch
geeqie-1.0alpha2-gcc-warn.patch
Removed Files:
geeqie-1.0alpha1-desktop.patch geeqie-1.0alpha1-editors.patch
Log Message:
* Thu Jul 31 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.6.alpha2
- update to 1.0alpha2 (now GPLv3)
- build with new LIRC support
geeqie-1.0alpha2-desktop.patch:
--- NEW FILE geeqie-1.0alpha2-desktop.patch ---
diff -Nur geeqie-1.0alpha2-orig/geeqie.desktop geeqie-1.0alpha2/geeqie.desktop
--- geeqie-1.0alpha2-orig/geeqie.desktop 2008-07-30 22:01:52.000000000 +0200
+++ geeqie-1.0alpha2/geeqie.desktop 2008-07-31 10:39:39.000000000 +0200
@@ -16,5 +16,5 @@
# Startup notification disabled, since the remote -r switch may not open a new window...
#StartupNotify=false
#StartupWMClass=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.0alpha2-editors.patch:
--- NEW FILE geeqie-1.0alpha2-editors.patch ---
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 @@
static Editor editor_slot_defaults[GQ_EDITOR_SLOTS] = {
{ N_("The Gimp"), "gimp-remote %{.cr2;.crw;.nef;.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 */
geeqie-1.0alpha2-gcc-warn.patch:
--- NEW FILE geeqie-1.0alpha2-gcc-warn.patch ---
diff -Nur geeqie-1.0alpha2-orig/src/filecache.c geeqie-1.0alpha2/src/filecache.c
--- geeqie-1.0alpha2-orig/src/filecache.c 2008-07-30 22:01:32.000000000 +0200
+++ geeqie-1.0alpha2/src/filecache.c 2008-07-31 10:52:24.000000000 +0200
@@ -172,7 +172,7 @@
{
FileCacheEntry *fe = work->data;
work = work->next;
- DEBUG_1("cache entry: fc=%p [%lu] %s %ld", fc, ++n, fe->fd->path, fe->size);
+ DEBUG_1("cache entry: fc=%p [%lu] %s %ld", fc, (unsigned long int)++n, fe->fd->path, fe->size);
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 May 2008 18:37:05 -0000 1.2
+++ .cvsignore 31 Jul 2008 09:31:01 -0000 1.3
@@ -1 +1 @@
-geeqie-1.0alpha1.tar.gz
+geeqie-1.0alpha2.tar.gz
Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geeqie.spec 25 Jun 2008 13:17:03 -0000 1.2
+++ geeqie.spec 31 Jul 2008 09:31:01 -0000 1.3
@@ -1,21 +1,23 @@
-%define upstreamversion 1.0alpha1
+%define upstreamversion 1.0alpha2
Summary: Image browser and viewer
Name: geeqie
Version: 1.0
-Release: 0.5.alpha1%{?dist}
-License: GPLv2
+Release: 0.6.alpha2%{?dist}
+License: GPLv3
Group: User Interface/X
Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
-Patch1: geeqie-1.0alpha1-desktop.patch
-Patch2: geeqie-1.0alpha1-editors.patch
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
URL: http://geeqie.sourceforge.net/
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: lcms-devel
BuildRequires: exiv2-devel
+BuildRequires: lirc-devel
BuildRequires: gettext desktop-file-utils
# Something for the future:
@@ -39,10 +41,11 @@
%patch1 -p1 -b .desktop
%patch2 -p1 -b .editors
%patch3 -p1 -b .print-pagesize
+%patch4 -p1 -b .gcc-warn
%build
-%configure
+%configure --enable-lirc
make %{?_smp_mflags}
@@ -51,7 +54,7 @@
make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install
# We want these _docdir files in GQ_HELPDIR.
-install -p -m 0644 AUTHORS COPYING NEWS README TODO \
+install -p -m 0644 AUTHORS COPYING NEWS README* TODO \
${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}
rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}-%{upstreamversion}/ChangeLog
@@ -87,6 +90,10 @@
%changelog
+* Thu Jul 31 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.6.alpha2
+- update to 1.0alpha2 (now GPLv3)
+- build with new LIRC support
+
* Wed Jun 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.5.alpha1
- respin for exiv2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 May 2008 18:37:05 -0000 1.2
+++ sources 31 Jul 2008 09:31:01 -0000 1.3
@@ -1 +1 @@
-8e4838018b597cb6df056959ccf1ba45 geeqie-1.0alpha1.tar.gz
+3a9acd46defdebe7444cc9f46fdfa956 geeqie-1.0alpha2.tar.gz
--- geeqie-1.0alpha1-desktop.patch DELETED ---
--- geeqie-1.0alpha1-editors.patch DELETED ---
More information about the fedora-extras-commits
mailing list