[packages/xnviewmp] use system exiftool
glen
glen at pld-linux.org
Sun May 17 19:22:17 CEST 2015
commit 5b1d3a031e398d7cac3864988fd7cf2e4330ba6e
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun May 17 20:21:40 2015 +0300
use system exiftool
xnviewmp.spec | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/xnviewmp.spec b/xnviewmp.spec
index 8c335f0..875e98c 100644
--- a/xnviewmp.spec
+++ b/xnviewmp.spec
@@ -1,15 +1,14 @@
-# TODO
-# - system exiftool
+# NOTE:
+# - requires libjpeg6 (in pld build libjpeg6.spec)
#
# Conditional build:
%bcond_without system_qt # package with system Qt4
-#
-# NOTE:
-# - requires libjpeg6 (in pld build libjpeg6.spec)
+%bcond_without system_exiftool # package with system exiftool
+
Summary: XnViewMP - The enhanced version of XnView for all platforms
Name: xnviewmp
Version: 0.72
-Release: 0.4
+Release: 0.5
License: FREEWARE (NO Adware, NO Spyware) for private or educational use
Group: X11/Applications
Source0: http://download.xnview.com/XnViewMP-linux.tgz
@@ -53,9 +52,17 @@ tar xf $SOURCE -C tmp
mv tmp/XnView/* .
%patch0 -p1
+# .pod sources
+%{__rm} AddOn/lib/File/RandomAccess.pod
+%{__rm} AddOn/lib/Image/ExifTool.pod
+
%if %{with system_qt}
%{__rm} language/qt_*.qm
%endif
+%if %{with system_exiftool}
+%{__rm} AddOn/exiftool
+%{__rm} -r AddOn/lib
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -80,11 +87,6 @@ cp -p xnview.png $RPM_BUILD_ROOT%{_pixmapsdir}
cat *.lang > lang.%{name}
-# cleanups
-# .pod sources
-%{__rm} $RPM_BUILD_ROOT%{_appdir}/AddOn/lib/File/RandomAccess.pod
-%{__rm} $RPM_BUILD_ROOT%{_appdir}/AddOn/lib/Image/ExifTool.pod
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -115,15 +117,15 @@ rm -rf $RPM_BUILD_ROOT
%{_appdir}/AddOn/Masks
%{_appdir}/AddOn/Thumbs
-# exiftool
+%if %{without system_exiftool}
%attr(755,root,root) %{_appdir}/AddOn/exiftool
%dir %{_appdir}/AddOn/lib
%dir %{_appdir}/AddOn/lib/Image
%{_appdir}/AddOn/lib/Image/ExifTool.pm
%{_appdir}/AddOn/lib/Image/ExifTool
-
%dir %{_appdir}/AddOn/lib/File
%{_appdir}/AddOn/lib/File/RandomAccess.pm
+%endif
%dir %{_appdir}/Plugins
%attr(755,root,root) %{_appdir}/Plugins/IlmImf.so
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xnviewmp.git/commitdiff/5b1d3a031e398d7cac3864988fd7cf2e4330ba6e
More information about the pld-cvs-commit
mailing list