[geeqie] TODO: Lua support wants lua5.1.pc >= 5.1, which isn't available
Michael Schwendt
mschwendt at fedoraproject.org
Tue Jan 20 14:14:13 UTC 2015
commit ee60832c97c9cb78216b879844a6bb31a93419a0
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Tue Jan 20 15:14:40 2015 +0100
TODO: Lua support wants lua5.1.pc >= 5.1, which isn't available
(only lua.pc 5.2.x exists).
- Add new BUGS file to documentation.
- Drop the LCMS1 bcond.
- Some patches not needed anymore.
- Drop old conditional for desktop file vendor.
- Update to 1.2 from gitorious including the merged LCMS2 patch (post-1.2).
No official tarball release yet.
.gitignore | 1 +
geeqie.spec | 80 ++++++++++++++++++++++++++++++++++-------------------------
sources | 2 +-
3 files changed, 48 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0b76d5..5574605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
geeqie-1.0.tar.gz
/geeqie-1.1.tar.gz
+/geeqie-a1afabd.tar.bz2
diff --git a/geeqie.spec b/geeqie.spec
index bb2ad88..5305916 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,53 +1,66 @@
-%bcond_with lcms1
-
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%define upstreamversion 1.1
+%define upstreamversion 1.2
%global _hardened_build 1
Summary: Image browser and viewer
Name: geeqie
-Version: 1.1
-Release: 22%{?dist}
+Version: 1.2
+Release: 0.1.20141130gita1afabd%{?dist}
License: GPLv2+
Group: User Interface/X
-Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
+#Source: http://downloads.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
+
+# git clone https://gitorious.org/geeqie/geeqie.git
+# cd geeqie
+# git checkout a1afabd3ce740872a857234b91eeb64fcf239f6a
+# rm -rf .git
+Source: geeqie-a1afabd.tar.bz2
+BuildRequires: autoconf automake libtool
+
URL: http://geeqie.sourceforge.net/
# add -Wl,--as-needed without disturbing %%configure macro
Patch0: geeqie-1.1-LDFLAGS.patch
+
# from master branch to fix regression
-Patch1: geeqie-1.1-bar_keywords.c.diff
+#Patch1: geeqie-1.1-bar_keywords.c.diff
+
# in upstream bug tracker
+# status: still open
+# doesn't apply anymore due to changes in fullscreen.c
Patch2: geeqie-1.0-fix-fullscreen.patch
+
# bz 889897
# reported upstream: http://sourceforge.net/p/geeqie/patches/28/
-Patch3: geeqie-1.0-double_generic_dialog_close.patch
+# closed
+#Patch3: geeqie-1.0-double_generic_dialog_close.patch
+
# from master
-Patch4: geeqie-1.1-editors-NULL.patch
+#Patch4: geeqie-1.1-editors-NULL.patch
+
# reported upstream
# https://sourceforge.net/tracker/?func=detail&atid=1054680&aid=3602709&group_id=222125
+# not fixed in 1.2
Patch5: geeqie-1.1-filedata-change-notification.patch
+
# reported upstream
# https://sourceforge.net/tracker/?func=detail&aid=3603866&group_id=222125&atid=1054680
# avoid crash due to non-existent files in history path_list and collections
# improved patch in gitorious merge request 5
-Patch6: geeqie-1.1-collection-and-history-inexistent-files.patch
+# closed
+#Patch6: geeqie-1.1-collection-and-history-inexistent-files.patch
+
# reported upstream
# https://sourceforge.net/tracker/?func=detail&aid=3605406&group_id=222125&atid=1054682
+# and gitorious merge request
Patch7: geeqie-1.1-large-files.patch
-# LCMS2 patch originally from Geeqie-devel mailing-list
-# but modified/revised for bug-fixes
-Patch8: geeqie-1.1-lcms2.patch
+
# from master
-Patch9: geeqie-1.1-percent-char-in-filenames.patch
+#Patch9: geeqie-1.1-percent-char-in-filenames.patch
BuildRequires: gtk2-devel
-%if %{with lcms1}
-BuildRequires: lcms-devel
-%else
BuildRequires: lcms2-devel
-%endif
BuildRequires: exiv2-devel
BuildRequires: lirc-devel
BuildRequires: libjpeg-devel
@@ -77,7 +90,9 @@ and zoom.
%prep
-%setup -q -n %{name}-%{upstreamversion}
+#setup -q -n %{name}-%{upstreamversion}
+%setup -q -n %{name}
+autoreconf -f -i ; intltoolize
# guard against missing executables at (re)build-time,
# these are needed by the plug-in scripts
for f in exiftran exiv2 mogrify zenity ; do
@@ -89,18 +104,9 @@ for f in ufraw-batch ; do
done
%endif
%patch0 -p1 -b .LDFLAGS
-%patch1 -p1 -b .keywords
-%patch2 -p1 -b .fix-fullscreen
-%patch3 -p1 -b .fix-dialog-close
-%patch4 -p1 -b .editors-NULL
+#patch2 -p1 -b .fix-fullscreen
%patch5 -p1 -b .filedata-notification
-%patch6 -p1 -b .collection-inexistent-files
%patch7 -p1 -b .large-files
-%if ! %{with lcms1}
-%patch8 -p1
-autoreconf -f -i
-%endif
-%patch9 -p1 -b .percent-char-in-filenames
%build
%configure --enable-lirc --disable-tiff \
@@ -116,15 +122,11 @@ make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install
[ ! -f ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/index.html ] && exit -1
# We want these _docdir files in GQ_HELPDIR.
-install -p -m 0644 AUTHORS COPYING NEWS README* TODO \
+install -p -m 0644 AUTHORS BUGS CODING COPYING ChangeLog NEWS README* TODO \
${RPM_BUILD_ROOT}%{_pkgdocdir}
-rm -f ${RPM_BUILD_ROOT}%{_pkgdocdir}/ChangeLog
desktop-file-install \
--delete-original \
-%if 0%{?fedora} < 19
- --vendor fedora \
-%endif
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
@@ -150,6 +152,16 @@ update-desktop-database &> /dev/null || :
%changelog
+* Sun Nov 30 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2-0.1.20141130gita1afabd
+- TODO: Lua support wants lua5.1.pc >= 5.1, which isn't available
+ (only lua.pc 5.2.x exists).
+- Add new BUGS file to documentation.
+- Drop the LCMS1 bcond.
+- Some patches not needed anymore.
+- Drop old conditional for desktop file vendor.
+- Update to 1.2 from gitorious including the merged LCMS2 patch (post-1.2).
+ No official tarball release yet.
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 2e56e00..9d6f852 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e63351988625c84b0fd80bc4eefd923b geeqie-1.1.tar.gz
+907b2d6944238f0e4708fcb29e137c83 geeqie-a1afabd.tar.bz2
More information about the scm-commits
mailing list