Accepting request 392990 from home:Zaitor:branches:GNOME:Apps

Superseede.. fix .changes (it has many many versions...) - stil lua is diabled...

OBS-URL: https://build.opensuse.org/request/show/392990
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=12

geeqie-1.1-fix-bashisms.patch

@@ -1,21 +0,0 @@
-diff -Ndur geeqie-1.1/plugins/rotate/geeqie-rotate geeqie-1.1-fix-bashisms/plugins/rotate/geeqie-rotate
---- geeqie-1.1/plugins/rotate/geeqie-rotate	2012-08-12 23:13:40.000000000 +0300
-+++ geeqie-1.1-fix-bashisms/plugins/rotate/geeqie-rotate	2014-11-17 05:25:16.014771785 +0200
-@@ -8,7 +8,7 @@
- rotate()
- {
-     ext=`echo "${1##*.}" |tr "[:upper:]" "[:lower:]"`
--    [ "x$ext" == "x" ] && return 1 #no extension
-+    [ "x$ext" = "x" ] && return 1 #no extension
- 
-     gq_metadata="$GQ_METADATA_DIR/$1.gq.xmp"
-     if [ -f "$gq_metadata" ]; then
-@@ -48,7 +48,7 @@
- }
- 
- get_sidecars=
--if [ "x$1" == "x-g" ] ; then
-+if [ "x$1" = "x-g" ] ; then
-     get_sidecars=yes
-     shift
- fi

geeqie-1.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf
-size 1966211

geeqie-1.2.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248
+size 1129804

geeqie-bigendian.patch

@@ -1,39 +0,0 @@
-Index: geeqie-1.1/src/image_load_tiff.c
-===================================================================
---- geeqie-1.1.orig/src/image_load_tiff.c
-+++ geeqie-1.1/src/image_load_tiff.c
-@@ -326,18 +326,21 @@ static gboolean image_loader_tiff_load (
- 		/* Turns out that the packing used by TIFFRGBAImage depends on 
-         	 * the host byte order... 
- 	         */ 
--		while (pixels < pixbuf->pixels + bytes) 
-+		{
-+		guchar *ptr = pixels;
-+		while (ptr < pixels + bytes)
- 			{
--			uint32 pixel = *(uint32 *)pixels;
-+			uint32 pixel = *(uint32 *)ptr;
- 			int r = TIFFGetR(pixel);
- 			int g = TIFFGetG(pixel);
- 			int b = TIFFGetB(pixel);
- 			int a = TIFFGetA(pixel);
--			*pixels++ = r;
--			*pixels++ = g;
--			*pixels++ = b;
--			*pixels++ = a;
-+			*ptr++ = r;
-+			*ptr++ = g;
-+			*ptr++ = b;
-+			*ptr++ = a;
- 			}
-+		}
- #endif
- 
- 		lt->area_updated_cb(loader, 0, 0, width, height, lt->data);
-@@ -419,4 +422,4 @@ void image_loader_backend_set_tiff(Image
- 
- 
- 
--#endif
-\ No newline at end of file
-+#endif

geeqie.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Apr 18 14:30:31 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 1.2.3:
+  + Support for GTK+ 3.
+  + Support for lcms2.
+  + Basic support for lua scripting.
+  + Several bugfixes.
+- Replace pkgconfig(gtk+-2.0) for pkgconfig(gtk+-3.0) BuildReqiures
+  following upstreams port to gtk3.
+- Add disabled pkgconfig(lua-5.1) BuildRequires, configure does not
+  find our lua.
+- Replace libchamplain-devel for pkgconfig(champlain-0.12)
+  BuildRequires, align with what configure looks for, but keep it
+  disabled, since upstream deams libchamplain support experimental,
+  and it's not the champlain we have in Tumbleweed.
+- Add libtool BuildRequires and pass autogen.sh as the tarball is
+  not bootstrapped.
+- Update package descriptions.
+- Update source and Url to new home.
+- Drop geeqie-bigendian.patch and geeqie-1.1-fix-bashisms.patch:
+  Fixed upstream.
+- Remove conditionals for obsolete versions of openSUSE.
+
 -------------------------------------------------------------------
 Wed Dec 17 13:55:36 UTC 2014 - zaitor@opensuse.org
 

geeqie.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package geeqie
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,52 +17,46 @@
 
 
 Name:           geeqie
-Version:        1.1
+Version:        1.2.3
 Release:        0
 Summary:        Lightweight Gtk+ based image viewer
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Viewers
-## FIXME - Check on version update if support for the libchamplain we have in factory is finaly supported, last checked version 1.1
+Url:            http://www.geeqie.org/
-Url:            http://geeqie.sourceforge.net/
+Source:         http://www.geeqie.org/%{name}-%{version}.tar.xz
-Source:         http://downloads.sourceforge.net/project/geeqie/geeqie/geeqie-1.1/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM geeqie-bigendian.patch dvaleev@suse.com -- Fix build on big endian systems. Taken from upstream commit c6793b7
-Patch0:         geeqie-bigendian.patch
-# PATCH-FIX-UPSTREAM geeqie-1.1-fix-bashisms.patch ledest@gmail.com -- Fix bashisms, upstream commit 7a32d30
-Patch1:         geeqie-1.1-fix-bashisms.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  gnome-doc-utils
 BuildRequires:  intltool
-## FIXME - disabled since the version we have in factory is not supportet by current version 1.1
-# BuildRequires:  libchamplain-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
+# Needed to bootstrap the tarball
+BuildRequires:  libtool
 BuildRequires:  lirc-devel
 BuildRequires:  update-desktop-files
+# Disabled as libchamplain support is still marked as experimental
+#BuildRequires:  pkgconfig(champlain-0.12) >= 0.12
 BuildRequires:  pkgconfig(exiv2) >= 0.11
-BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(lcms) >= 1.14
+# FIXME! Blasted configure does not find it..... - looks for lua5.1
+#BuildRequires:  pkgconfig(lua-5.1) >= 5.1
 Recommends:     %{name}-lang
-# geeqie is a fork of the last know gqview release
-Obsoletes:      gqview <= 2.1.5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Geeqie is a lightweight Gtk+ based image viewer for Unix like
+Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
-operating systems.
 
 %lang_package
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
+# Needed to bootstrap
+./autogen.sh
 %configure \
         --enable-lirc \
-        --enable-gps \
+        --with-readmedir=%{_defaultdocdir}/%{name}
-        --with-readmedir=%{_defaultdocdir}/%{name} \
-        --with-htmldir=%{_defaultdocdir}/%{name}/html
 make %{?_smp_mflags}
 
 %install
@@ -71,29 +65,23 @@ make %{?_smp_mflags}
 %suse_update_desktop_file %{name}
 %fdupes %{buildroot}
 
-%if 0%{?suse_version} > 1130
-
 %post
 %desktop_database_post
-%endif
-
-%if 0%{?suse_version} > 1130
 
 %postun
 %desktop_database_postun
-%endif
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%doc %{_defaultdocdir}/%{name}
 %{_bindir}/geeqie
 %{_datadir}/applications/geeqie.desktop
 %{_datadir}/geeqie/
 %{_datadir}/pixmaps/geeqie.png
 %{_libexecdir}/geeqie/
-%doc %{_mandir}/man1/geeqie.1%{?ext_man}
+%{_mandir}/man1/geeqie.1%{?ext_man}
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog