diff --git a/.cvsignore b/.cvsignore index e69de29..c3d3b3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +geeqie-1.0alpha1.tar.gz diff --git a/geeqie-1.0alpha1-desktop.patch b/geeqie-1.0alpha1-desktop.patch new file mode 100644 index 0000000..5c7de6e --- /dev/null +++ b/geeqie-1.0alpha1-desktop.patch @@ -0,0 +1,11 @@ +diff -Nur geeqie-1.0alpha1-orig/geeqie.desktop geeqie-1.0alpha1/geeqie.desktop +--- geeqie-1.0alpha1-orig/geeqie.desktop 2008-04-22 22:05:36.000000000 +0200 ++++ geeqie-1.0alpha1/geeqie.desktop 2008-04-26 11:17:34.000000000 +0200 +@@ -16,6 +16,5 @@ + # Startup notification disabled, since the remote -r switch may not open a new window... + #StartupNotify=false + #StartupWMClass=geeqie +-Encoding=UTF-8 +-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; diff --git a/geeqie-1.0alpha1-editors.patch b/geeqie-1.0alpha1-editors.patch new file mode 100644 index 0000000..63a94f7 --- /dev/null +++ b/geeqie-1.0alpha1-editors.patch @@ -0,0 +1,19 @@ +diff -Nur geeqie-1.0alpha1-orig/src/editors.c geeqie-1.0alpha1/src/editors.c +--- geeqie-1.0alpha1-orig/src/editors.c 2008-04-22 22:05:10.000000000 +0200 ++++ geeqie-1.0alpha1/src/editors.c 2008-04-25 18:14:23.000000000 +0200 +@@ -58,13 +58,13 @@ + + static gchar *editor_slot_defaults[GQ_EDITOR_SLOTS * 2] = { + 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\"", + NULL, NULL, + 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 */ diff --git a/geeqie-1.0alpha1-print-pagesize.patch b/geeqie-1.0alpha1-print-pagesize.patch new file mode 100644 index 0000000..46a0f91 --- /dev/null +++ b/geeqie-1.0alpha1-print-pagesize.patch @@ -0,0 +1,19 @@ +diff -Nur geeqie-1.0alpha1-orig/src/print.c geeqie-1.0alpha1/src/print.c +--- geeqie-1.0alpha1-orig/src/print.c 2008-04-22 22:05:10.000000000 +0200 ++++ geeqie-1.0alpha1/src/print.c 2008-04-25 18:16:25.000000000 +0200 +@@ -1111,7 +1111,6 @@ + fprintf(f, "%%%%Title:\n"); + + /* setup page size, coordinates (do we really need this?) */ +-#if 0 + fprintf(f, "<<\n"); + fprintf(f, "/PageSize [%f %f]\n", pw->layout_width, pw->layout_height); + fprintf(f, "/ImagingBBox [%f %f %f %f]\n", /* l b r t */ +@@ -1120,7 +1119,6 @@ + fprintf(f, "/Orientation %d\n", + (pw->paper_orientation == PAPER_ORIENTATION_PORTRAIT) ? 0 : 1); + fprintf(f, ">> setpagedevice\n"); +-#endif + + ret = !pipe_handler_check(pe); + pipe_handler_free(pe); diff --git a/geeqie.spec b/geeqie.spec new file mode 100644 index 0000000..acc33ce --- /dev/null +++ b/geeqie.spec @@ -0,0 +1,100 @@ +%define upstreamversion 1.0alpha1 + +Summary: Image browser and viewer +Name: geeqie +Version: 1.0 +Release: 0.4.alpha1%{?dist} +License: GPLv2 +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 +# bz 222639 +Patch3: geeqie-1.0alpha1-print-pagesize.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: gettext desktop-file-utils + +# Something for the future: +# Replace GQView last stable release in Fedora space, +# plus allow for it to return if a higher version. +# Stalled upstream GQView development is at 2.1.5. +#Obsoletes: gqview <= 2.0.4 + +%description +*** This software is currently in alpha state *** + +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 +through graphics files. Its many features include single click file +viewing, support for external editors, previewing images using thumbnails, +and zoom. + + +%prep +%setup -q -n %{name}-%{upstreamversion} +%patch1 -p1 -b .desktop +%patch2 -p1 -b .editors +%patch3 -p1 -b .print-pagesize + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +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 \ + ${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 \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop + +%find_lang %name + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +update-desktop-database &> /dev/null || : + + +%postun +update-desktop-database &> /dev/null || : + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc %{_datadir}/doc/%{name}* +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/applications/fedora-%{name}.desktop + + +%changelog +* Thu May 8 2008 Michael Schwendt - 1.0-0.4.alpha1 +- scriptlets: run update-desktop-database without path +- drop dependency on desktop-file-utils +- drop ChangeLog file as it's too low-level + +* Fri Apr 25 2008 Michael Schwendt - 1.0-0.3.alpha1 +- package GQview fork "geeqie 1.0alpha1" based on Fedora gqview.spec +- BR lcms-devel exiv2-devel +- update -desktop and -editors patch +- update spec file with more dir macros + diff --git a/sources b/sources index e69de29..6a30e56 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +8e4838018b597cb6df056959ccf1ba45 geeqie-1.0alpha1.tar.gz