[packages/icc_examin] - updated to 0.56

qboosh qboosh at pld-linux.org
Thu Aug 31 21:39:19 CEST 2023


commit fa7bade3328ce3f75e64270087c300e4460fb763
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Aug 31 21:29:04 2023 +0200

    - updated to 0.56

 icc_examin-pld.patch | 11 ++++++-----
 icc_examin.spec      | 31 ++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/icc_examin.spec b/icc_examin.spec
index f3cc7ec..1c46cb5 100644
--- a/icc_examin.spec
+++ b/icc_examin.spec
@@ -1,17 +1,24 @@
+#
+# Conditional build:
+%bcond_with	cinepaint	# CinePaint plugin (currently built from cinepaint.spec)
+
 Summary:	X Color Management tools
 Summary(pl.UTF-8):	Narzędzia X Color Management (do zarządzania kolorami w X)
 Name:		icc_examin
-Version:	0.55
+Version:	0.56
 Release:	1
 License:	MIT
 Group:		X11/Applications/Graphics
-Source0:	http://downloads.sourceforge.net/oyranos/%{name}-%{version}.tar.bz2
-# Source0-md5:	51ba3b849eb47793974cab6956750cf0
+#Source0Download: https://github.com/oyranos-cms/icc-examin/releases
+Source0:	https://github.com/oyranos-cms/icc-examin/archive/%{version}/icc-examin-%{version}.tar.gz
+# Source0-md5:	079b3d4babf6c981d11cc0e30eb6307f
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-paths.patch
 Patch2:		%{name}-pld.patch
-URL:		http://www.oyranos.org/icc-examin
+#URL:		http://www.oyranos.org/icc-examin
+URL:		https://github.com/oyranos-cms/icc-examin
 BuildRequires:	OpenGL-GLU-devel
+%{?with_cinepaint:BuildRequires:	cinepaint-devel >= 0.2.20}
 BuildRequires:	fltk-devel >= 1.1.4
 BuildRequires:	fltk-gl-devel >= 1.1.4
 BuildRequires:	fontconfig-devel
@@ -44,7 +51,7 @@ ICC, danych pomiarowych (CGATS), wizualizacji VRML gam argylla oraz
 tablic gamma kart graficznych.
 
 %prep
-%setup -q
+%setup -q -n icc-examin-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -58,29 +65,31 @@ export LDFLAGS="%{rpmldflags}"
 # NOTE: not autoconf configure, but mostly compatible
 %configure
 
-%{__make}
+%{__make} \
+	%{!?with_cinepaint:CINEPAINT=}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	%{!?with_cinepaint:CINEPAINT= INSTALL_TARGET=install_global}
 
 # system DejaVuSans.ttf is used instead
 %{__rm} $RPM_BUILD_ROOT%{_fontsdir}/FreeSans.ttf
 
 # fix location of themable icon
 install -d $RPM_BUILD_ROOT%{_iconsdir}
-mv $RPM_BUILD_ROOT%{_pixmapsdir}/hicolor $RPM_BUILD_ROOT%{_iconsdir}
+%{__mv} $RPM_BUILD_ROOT%{_pixmapsdir}/hicolor $RPM_BUILD_ROOT%{_iconsdir}
 
-%find_lang icc_examin
+%find_lang icc-examin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f icc_examin.lang
+%files -f icc-examin.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog README TODO
+%doc AUTHORS BUGS ChangeLog.md README.md TODO
 %attr(755,root,root) %{_bindir}/iccexamin
 %{_desktopdir}/iccexamin.desktop
 %{_pixmapsdir}/iccexamin.png
diff --git a/icc_examin-pld.patch b/icc_examin-pld.patch
index 8852da3..cd0f5a7 100644
--- a/icc_examin-pld.patch
+++ b/icc_examin-pld.patch
@@ -1,6 +1,6 @@
---- icc_examin-0.54/configure.orig	2013-01-11 12:55:26.676880980 +0100
-+++ icc_examin-0.54/configure	2013-03-31 21:11:35.026149419 +0200
-@@ -345,6 +345,11 @@
+--- icc-examin-0.56/configure.orig	2016-12-09 23:50:43.000000000 +0100
++++ icc-examin-0.56/configure	2023-08-28 06:26:29.924434276 +0200
+@@ -346,6 +346,11 @@ else
        test -n $ECHO && $ECHO $e "$echo_" >> $CONF_LOG; test -n "$INFOECHO" && $INFOECHO "$echo_"
          DISTNAME="$echo_"
        SYS=1; fi
@@ -12,7 +12,7 @@
      if [ -f /etc/debian_version ]; then
        if [ -f /etc/issue.net ]; then
          echo_="`cat /etc/issue.net || cat /etc/debian_version`"
-@@ -352,10 +357,7 @@
+@@ -353,11 +358,8 @@ else
          DISTNAME="$echo_"
          SYS=2; fi; fi
      if [ $SYS -eq 0 ]; then
@@ -21,7 +21,8 @@
 -        test -n $ECHO && $ECHO $e "$echo_" >> $CONF_LOG; test -n "$INFOECHO" && $INFOECHO "$echo_"
 -        DISTNAME="$echo_"
 -    fi; fi
-+      DISTNAME="Linux"
++        DISTNAME="Linux"
 +    fi
      OSUNAME=Linux
    else
+     if [ $UNAME_ = "SunOS" ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icc_examin.git/commitdiff/fa7bade3328ce3f75e64270087c300e4460fb763



More information about the pld-cvs-commit mailing list