2015-03-10 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* dcraw, fotoxx, ufraw: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9427 ec354946-7b23-47d6-9f5a-488ba84defc7

d/dcraw/dcraw-vl.spec

@@ -1,17 +1,20 @@
 Summary: Tool for decoding raw image data from digital cameras
-Summary(ja): デジタルカメラの Raw イメージデータをデコードするツール
+Summary(ja): デジタルカメラの RAW 画像データをデコードするツール
 Name: dcraw
-Version: 9.12
+Version: 9.24.4
 Release: 1%{?_dist_release}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://cybercom.net/~dcoffin/dcraw
 Source0: http://cybercom.net/~dcoffin/dcraw/archive/dcraw-%{version}.tar.gz
+Patch0: dcraw-9.19-CVE-2013-1438.patch
+Patch1: dcraw-9.21-lcms2-error-reporting.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
 BuildRequires: libjpeg-devel
-BuildRequires: lcms-devel
+BuildRequires: lcms2-devel
 BuildRequires: jasper-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 This package contains dcraw, a command line tool to decode raw image data
@@ -19,9 +22,11 @@ downloaded from digital cameras.
 
 %prep
 %setup -q -n dcraw
+%patch0 -p1 -b .CVE-2013-1438
+%patch1 -p1 -b .lcms2-error-reporting
 
 %build
-gcc %optflags -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\""%{_datadir}/locale"\" -o dcraw dcraw.c
+gcc %optflags -lm -ljasper -ljpeg -llcms2 -DLOCALEDIR=\""%{_datadir}/locale"\" -o dcraw dcraw.c
 # build language catalogs
 for catsrc in dcraw_*.po; do
     lang="${catsrc%.po}"
@@ -64,6 +69,10 @@ rm -rf %buildroot
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Mar 10 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 9.24.4-1
+- update to 9.24.4
+- add BuildRequires: lcms2-devel instead of lcms-devel
+
 * Sat Jun 16 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.12-1
 - update to 9.12
 - add BuildRequires: jasper-devel

f/fotoxx/fotoxx-vl.spec

@@ -1,71 +1,108 @@
+%define mapname fotoxx-maps
+%define mapver  1.1
+%define mapsrc  %{mapname}-%{mapver}
+
 Summary:	Digital Photo editor
 Summary(ja):	デジタル写真編集ソフトウェア
 
 Name:		fotoxx
-Version:	10.11.1
+Version:	15.03.1
 Release:	1%{?_dist_release}
 
 Group:		Applications/Multimedia
-License:	GPLv2
+License:	GPLv3+
-URL:		http://kornelix.squarespace.com/%{name}
+URL:		http://www.kornelix.com/fotoxx.html
 
-Source0:	http://kornelix.squarespace.com/storage/downloads/%{name}-%{version}.tar.gz
+Source0:	http://www.kornelix.com/uploads/1/3/0/3/13035936/%{name}-%{version}.tar.gz
-Source1:	%{name}.desktop
+Source1:        http://www.kornelix.com/uploads/1/3/0/3/13035936/%{mapsrc}.tar.gz
+Source2:	%{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:	desktop-file-utils
 BuildRequires:  freeimage-devel
-BuildRequires:	gtk2-devel
+BuildRequires:	gtk3-devel
 BuildRequires:  libtiff-devel
 BuildRequires:	perl-Image-ExifTool 
 BuildRequires:  ufraw
 BuildRequires:  xdg-utils
+BuildRequires:  lcms2-devel
 
-Requires:	perl-Image-ExifTool
+Requires:	dcraw
-Requires:	printoxx
 Requires:	ufraw
+Requires:	perl-Image-ExifTool
 Requires:	xdg-utils
 
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 %description
 Fotoxx is a free open source Linux program for editing image files
 from a digital camera. The goal of fotoxx is to meet most image editing
 needs while remaining easy to use.
 
 %prep
-%setup -q 
+%setup -q -a 1 
 
 %build
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; 
+# This package's Makefile is bizarre
-make %{?_smp_mflags} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
+# Misc. environment tweaks to let Makefile honor %%{optflags}
-
+make %{?_smp_mflags} PREFIX=%{_prefix} \
+  CXXFLAGS="%{optflags}" \
+  LDFLAGS="%{optflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install manpage DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
 install -Dm 644 -p icons/%{name}.png  $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor="" \
+
-  --mode 644 \
+pushd %{mapsrc}
-  --remove-category="Application" \
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+popd
-  %{SOURCE1}
+
+desktop-file-install \
+    --vendor="" \
+    --mode 644 \
+    --remove-category="Application" \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+    %{SOURCE2}
+
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata/
+install -m 644 appdata/%{name}.appdata.xml $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+
+%postun
+if [ $1 -eq 0 ] ; then
+    update-desktop-database -q &> /dev/null ||:
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc doc/*
 %dir %{_datadir}/%{name}
+%dir %{_datadir}/%{mapname}
 %{_bindir}/%{name}
-%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/*
-%{_datadir}/%{name}/locales/
+%{_datadir}/%{mapname}/*
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 10 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 15.03.1-1
+- new upstream release including fotoxx-maps-1.1
+- updated desktop file (SOURCE2)
+- rebuilt with libtiff 4.0.3  
+- added Vendor and Distribution tag
+
 * Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 10.11.1-1
 - updated to 10.11.1
 - built with new toolchains

u/ufraw/ufraw-vl.spec

@@ -1,27 +1,38 @@
+%bcond_with     cinepaint
+
 Summary:	Utility for digital camera raw images
-Summary(ja): 	デジタルカメラの raw イメージ用ユーティリティ
+Summary(ja): 	デジタルカメラの RAW 画像ユーティリティ
 Name:		ufraw
-Version:	0.18
+Version:	0.21
-Release: 	6%{?_dist_release}
+Release: 	1%{?_dist_release}
 
 License:	GPLv2
 Group:		Applications/Graphics
 URL:		http://ufraw.sourceforge.net/
 
 Source0:	%{name}-%{version}.tar.gz
+# added Japanese comment
+Source10:       %{name}.desktop
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:  cfitsio-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  gimp-devel
-BuildRequires:	gtk2-devel >= 2.6
+BuildRequires:  glib2-devel >= 2.12
-BuildRequires:  gtkimageview-devel >= 1.3.0
+BuildRequires:	gtk2-devel >= 2.12
-BuildRequires:	lcms-devel
+BuildRequires:  gtkimageview-devel >= 1.6.1
+BuildRequires:	lcms2-devel
+BuildRequires:  lensfun-devel >= 0.2.5
 BuildRequires:	libexif-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	perl
 BuildRequires:	zlib-devel
+%if %{with cinepaint}
+BuildRequires: cinepaint-devel >= 0.22
+%define cinepaintplugindir %(pkg-config --variable=programplugindir cinepaint-gtk)/plug-ins
+%endif
 Requires(post): GConf2, shared-mime-info, desktop-file-utils
 Requires(postun): shared-mime-info, desktop-file-utils
 Requires(pre): GConf2
@@ -34,7 +45,7 @@ formats and has editor for the tone curves. It allows easy process more
 images in a batch on command-line.
 
 %description -l ja
-デジタルカメラの raw イメージを読み込み、操作するためのアプリケーション
+デジタルカメラから RAW 画像を読み込み、操作するためのアプリケーション
 です。カラーマネージメント機能を持ち、Nikon のカーブフォーマットの読み
 込みやトーンカーブの編集が可能です。また大量のファイルをコマンドライン
 から簡単にバッチ処理できます。
@@ -43,7 +54,7 @@ images in a batch on command-line.
 
 %package gimp
 Summary:        Raw image loader plugin for The GIMP
-Summary(ja):	GIMP 用の raw イメージ読み込み用プラグイン
+Summary(ja):	GIMP 用の RAW 画像読み込みプラグイン
 Group:		Applications/Graphics
 Requires:       gimp
 
@@ -52,39 +63,48 @@ ufraw-gimp is a GIMP plug-in to read and manipulate raw images from
 digital cameras.
 
 %description gimp -l ja
-ufraw-gimp はデジタルカメラの raw イメージを読み込み、操作するための
+ufraw-gimp はデジタルカメラの RAW 画像を読み込み、操作するための GIMP プラグインです。
-GIMP 用の plug-in です。
 
 #---------------------------------------------------------------------------
-
+%if %{with cinepaint}
+%package cinepaint
+Summary:        CinePaint plugin to retrieve raw image data from digital cameras
+Group:          Applications/Multimedia
+Requires:       ufraw = %{version}-%{release}
+Requires:       cinepaint
+
+%description cinepaint
+The ufraw-cinepaint package contains a CinePaint plugin for opening raw format
+images of digital cameras.
+%endif
+#---------------------------------------------------------------------------
 	
 %prep
 %setup -q
 
+cp -p %{SOURCE10} .
+
 %build
-%configure --with-gimp --enable-extras DESTDIR=$RPM_BUILD_ROOT
+%configure --enable-mime --enable-extras --with-gimp DESTDIR=$RPM_BUILD_ROOT
-%{__make}
+make schemasdir=%{_sysconfdir}/gconf/schemas
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=$RPM_BUILD_ROOT
-%{__make} install DESTDIR=${RPM_BUILD_ROOT}
+
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+# don't ship dcraw binary
+rm -f $RPM_BUILD_ROOT%{_bindir}/dcraw
 
 # install schemas to sysconfdir manually.
-%{__install} -d ${RPM_BUILD_ROOT}/%{_sysconfdir}/gconf/schemas
+%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
 ./generate_schemas.sh %{_prefix} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/ufraw.schemas
-#{__mv} ${RPM_BUILD_ROOT}/%{_datadir}/gconf/schemas/ufraw.schemas ${RPM_BUILD_ROOT}/%{_sysconfdir}/gconf/schemas
+mv $RPM_BUILD_ROOT%{_datadir}/gconf/schemas/ufraw.schemas $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
-#{__rm} -rf ${RPM_BUILD_ROOT}/%{_datadir}/gconf/schemas
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gconf/schemas
-
-# install .desktop manually.
-%{__install} -d $RPM_BUILD_ROOT/%{_datadir}/applications
-%{__install} -m 644 ufraw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 
 # install mime-info manually. (But this has been included in shared-mime-info >= 0.21)
-%{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/mime/packages
+%{__install} -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
-%{__install} -m 644 ufraw-mime.xml ${RPM_BUILD_ROOT}/%{_datadir}/mime/packages
+%{__install} -m 644 ufraw-mime.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
 
 %find_lang %{name}
 
@@ -123,9 +143,10 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 %doc COPYING MANIFEST README TODO
 %{_bindir}/ufraw
 %{_bindir}/ufraw-batch
-%{_bindir}/dcraw
+#{_bindir}/dcraw
 %{_bindir}/nikon-curve
 %{_sysconfdir}/gconf/schemas/ufraw.schemas
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/ufraw.desktop
 %{_datadir}/mime/packages/ufraw-mime.xml
 %{_datadir}/pixmaps/ufraw.png
@@ -135,7 +156,19 @@ update-desktop-database %{_datadir}/applications >& /dev/null ||:
 %defattr(-,root,root)
 %{_libdir}/gimp/2.0/plug-ins/ufraw-gimp
 
+%if %{with cinepaint}
+%files cinepaint
+%defattr(-, root, root, -)
+%{cinepaintplugindir}/ufraw-cinepaint
+%endif
+
 %changelog
+* Tue Mar 10 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.21-1
+- updated to 0.21
+- removed %{_bindir}/dcraw to avoid conflicting with dcraw package
+- added BR: lensfun-devel
+- added BR: lcms2-devel instead of lcms-devel
+
 * Wed Feb 25 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.18-6
 - rebuilt with cfitsio 3.370