Merge branch 'irfanview-rpm' into 'master'

irfanview 4.53

Closes #6

See merge request bgstack15/stackrpms!60

8 files changed, 444 insertions, 207 deletions

diff --git a/irfanview/debian/README.Debian b/irfanview/debian/README.Debian
index bcba7ce..04853e4 100644
--- a/irfanview/debian/README.Debian
+++ b/irfanview/debian/README.Debian
@@ -1,5 +1,22 @@
 irfanview for Devuan
 
-No customizations beyond what was necessary to build the dpkg.
+To retrieve the source files, you can use:
+wget --referer='http://www.irfanview.info/files/iview453.zip' --user-agent='Mozilla (X11)' http://irfanview.info/files/iview453.zip
 
- -- B Stack <bgstack15@gmail.com>  Thu, 07 Feb 2019 14:33:49 -0500
+To build the irfanview_4.53.orig.tar.gz, you have to take all four source zip files:
+* iview453.zip
+* iview453_x64.zip
+* iview453_plugins.zip
+* iview453_plugins_x64.zip
+
+And extract them like so:
+iver=453
+dir_iver="$( echo "${iver}" | head -c1 ).$( echo "${iver}" | tail -c3 )"
+mkdir -p "irfanview-${dir_iver}" ; cd "irfanview-${dir_iver}"
+mkdir -p irfanview-bin32 irfanview-bin64
+cd irfanview-bin32 ; unzip ../../iview${iver}.zip     ; cd Plugins ; unzip ../../../iview${iver}_plugins.zip     ; cd ../..
+cd irfanview-bin64 ; unzip ../../iview${iver}_x64.zip ; cd Plugins ; unzip ../../../iview${iver}_plugins_x64.zip ; cd ../..
+cd ..
+tar -zcf "irfanview_${dir_iver}.orig.tar.gz" "irfanview-${dir_iver}"
+
+ -- B Stack <bgstack15@gmail.com>  Thu, 17 May 2019 22:40:20 -0500
diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog
index 250ac3e..5f71d4f 100644
--- a/irfanview/debian/changelog
+++ b/irfanview/debian/changelog
@@ -1,3 +1,26 @@
+irfanview (4.53-1+devuan) manual; urgency=medium
+
+  - Version 4.53 Release date: 2019-05-15
+
+    * New effect in Image->Effects menu: Insert Speech Bubbles
+      Examples/Screenshot: [speech_bubbles.jpg](http://www.irfanview.com/screenshot/big/37_speech_bubbles.jpg)
+    * New effect in Image menu: Add Shadow, Shape, Rounded corners, Snowflake etc.
+    * New effect in Image menu: Add Hexagon (or tiles), Star, Spikes, Heart etc.
+    * Show mouse zoom magnifier: CTRL+SHIFT + Mouse-move in the image
+      (mouse wheel zooms within magnifier area, click inside closes it)
+    * New border effect in "Add Frame" dialog: Broken Edge
+    * New effect added: Radial Brighten (Effects browser dialog)
+    * New option in Capture dialog: Draw red circle around cursor
+    * New option in Advanced batch dialog: Set maximal dimensions for resize
+    * Profiles option added to Contact Sheet dialog
+    * Option to read 1 BPP images in RAW dialog
+    * Command line: /filepattern can be combined with /slideshow
+    * TIF/PCX/PSD loading bugs fixed (thanks to Apriorit)
+    * Some PlugIns are changed/updated, please install the newest versions:
+      http://www.irfanview.com/plugins.htm
+
+ -- B Stack <bgstack15@gmail.com>  Sat, 18 May 2019 07:36:41 -0500
+
 irfanview (4.52-3devuan) manual; urgency=medium
 
   * Rebuilt into 32-bit and 64-bit pre-built binary packages.
diff --git a/irfanview/debian/i_view64.ini b/irfanview/debian/i_view64.ini
index 1d78118..04b4e54 120000..100644
--- a/irfanview/debian/i_view64.ini
+++ b/irfanview/debian/i_view64.ini
@@ -1 +1,167 @@
-i_view32.ini
\ No newline at end of file
+[Others]

+Test=1

+StartOption=0

+StartFolder=

+OneInstance=0

+ESCThumbs=1

+ESCExit=0

+SaveChanges=0

+ShowPNGAlpha=1

+ShowTIFAnnot=0

+ShowFullPath=1

+CenterWindow=0

+RememberWinPos=1

+LoopCurDir=1

+BeepOnLoop=1

+JumpOnPageKey=0

+UseUndo=1

+PasteSel=0

+SpecialPasteFit=1

+PaletteNearest=1

+VideoSize=100

+UseInternalPlayer=1

+VideoDS=1

+VideoLoop=0

+VideoHidePlaybar=0

+UseMCIforFlash=0

+UseQTforMOV=0

+UseQTforPICT=1

+AskDelete=1

+DelToRecycle=1

+JumpAfterDelete=0

+CloseOnDelete=0

+DelSideCars=0

+SideCarExts=THM|XMP|

+NotUpdateDirIndex=0

+RenameExtension=1

+AskOverwriteSave=1

+DisplaySaveDialog=1

+Unicode=0

+UseMRUDs=1

+UseMRUFs=1

+SaveSlideDir=1

+SaveBatchDir=0

+ExternalViewer=Z:\usr\bin\irfanview-vlc

+ExternalViewer2=

+ExternalViewer3=Z:\usr\share\irfanview\i_view32.exe

+ShortExtViewer=0

+ExtViewerFullLine=1

+PropPage=12

+[Viewing]

+FullScreen=0

+Dither24BPP=0

+BackColor=0

+EnableGamma=0

+GammaValue=1.00

+EnableBWGamma=1

+BWGamma=0.5

+ContextMenu=0

+ZoomFactor=10

+ZoomOption=0

+ZoomTable=3;10;14;16;19;21;25;28;33;38;43;50;57;66;76;87;100;115;132;150;174;200;230;260;300;350;400;450;500;600;700;800;900;1000;1200;1400;1600;2000;3000;

+UseICM=0

+ICMOption=0

+ICMFile=

+UseICMAlways=0

+InICMFile=sRGB

+ViewAll=1

+ShowHiddenFiles=1

+MultipageScroll=1

+GridSize=75

+SelColor=-1

+ShowFullScreen=1

+WMult=100

+HMult=100

+TxtPos=0

+TxtAlign=0

+TxtLayer=1

+FSCenter=1

+FSResample=1

+FSZoomResample=0

+FSAlpha=0

+FS_LMouse=0

+FS_RMouse=0

+MultimonStretch=0

+ShowFullScreenName=1

+FullBackColor=0

+HideCursor=0

+FullText=$D$F $X

+TranspText=1

+FontColor=65280

+TxtBgkr=16777215

+FontParam=-13|0|0|0|400|0|0|0|0|1|2|4|49|

+Font=Courier New

+[JPEG]

+Load Grayscale=0

+ExifRotate=1

+[PhotoCD]

+Loading Size=3

+[MultiGIF]

+PlayAnimation=1

+UseSingleTrans=0

+[Extensions]

+AllUsers=0

+UseOtherExt=0

+AllExtensions=

+UseAssociatedOnly=0

+CustomExtensions=JPG|JPEG|JPE|GIF|BMP|TIF|TIFF|PNG|PCX|ICO|PSD|CUR|ANI|TXT|PS|PDF|AI|SVG|

+UseThumbBMP=0

+[Edit]

+ColorChannel=0

+CutColor=0

+[StatusBar]

+Text=$M

+[Effects]

+AutoCropTol=0

+[TXT]

+TXTFileFont=0

+TranspText=1

+FontColor=65280

+TxtBgkr=16777215

+FontParam=-13|0|0|0|400|0|0|0|0|1|2|4|49|

+Font=Courier New

+[Copy-Move]

+AskCopy=1

+AskMove=1

+CopyDir=

+MoveDir=

+[Language]

+DLL=ENGLISH

+Lang=English

+[Toolbar]

+Skin=

+Size=

+Flag=1966075

+[Plugins]

+CRW_Preview=1

+CRW_Canon=0

+CRW_HALF=1

+CRW_AWB=0

+CRW_CWB=1

+CRW_NoBright=0

+CRW_Bright=1.00

+CRW_Highlight=0

+TTF_text=!"#$%&'()*+,-./0123456789:;<=>?@§ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`§abcdefghijklmnopqrstuvwxyz{|}~

+8BFPath=

+[WinPosition]

+xKoord=22

+yKoord=49

+Width=484

+Height=354

+Maximized=0

+[RecentFiles]

+File0=

+File1=

+File2=

+File3=

+File4=

+File5=

+File6=

+File7=

+File8=

+File9=

+File10=

+File11=

+File12=

+File13=

+File14=

diff --git a/irfanview/debian/rules b/irfanview/debian/rules
index e4ab04c..c05c160 100755
--- a/irfanview/debian/rules
+++ b/irfanview/debian/rules
@@ -25,7 +25,7 @@ export buildroot_64="${debuilddir}/${appname_64}"
 override_dh_fixperms:
 	dh_fixperms
 	chmod 0666 ${buildroot_32}${_datadir}/${appdir_32}/i_view32.ini || :
-	chmod 0666 ${buildroot_64}${_datadir}/${appdir_64}/i_view32.ini || :
+	chmod 0666 ${buildroot_64}${_datadir}/${appdir_64}/i_view64.ini || :
 
 override_dh_auto_install:
 	dh_auto_install
@@ -41,15 +41,15 @@ override_dh_auto_install:
 	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/128x128/apps
 	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/256x256/apps
 	mkdir -p ${buildroot_common}${_datadir}/icons/hicolor/scalable/apps
-	convert irfanview-circle.svg -filter Lanczos -resize 16x16 ${buildroot_common}${_datadir}/icons/hicolor/16x16/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 22x22 ${buildroot_common}${_datadir}/icons/hicolor/22x22/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 24x24 ${buildroot_common}${_datadir}/icons/hicolor/24x24/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 32x32 ${buildroot_common}${_datadir}/icons/hicolor/32x32/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 48x48 ${buildroot_common}${_datadir}/icons/hicolor/48x48/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 64x64 ${buildroot_common}${_datadir}/icons/hicolor/64x64/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 96x96 ${buildroot_common}${_datadir}/icons/hicolor/96x96/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 128x128 ${buildroot_common}${_datadir}/icons/hicolor/128x128/apps/${appname}.png
-	convert irfanview-circle.svg -filter Lanczos -resize 256x256 ${buildroot_common}${_datadir}/icons/hicolor/256x256/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 16x16 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/16x16/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 22x22 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/22x22/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 24x24 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/24x24/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 32x32 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/32x32/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 48x48 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/48x48/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 64x64 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/64x64/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 96x96 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/96x96/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 128x128 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/128x128/apps/${appname}.png
+	convert -background none -filter Lanczos -resize 256x256 irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/256x256/apps/${appname}.png
 	cp -p irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/scalable/apps/${appname}.svg
 	rm -f ./irfanview-circle.svg || :
 
diff --git a/irfanview/irfanview.default b/irfanview/irfanview.default
deleted file mode 100644
index e972fb9..0000000
--- a/irfanview/irfanview.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# File: /etc/sysconfig/irfanview
-WINEARCH=win32
-WINEPREFIX=$HOME/.wine
-EXEC_NAME="i_view32.exe"
-EXEC_PATH="/usr/share/irfanview/i_view32.exe"
diff --git a/irfanview/irfanview.spec b/irfanview/irfanview.spec
index 56cdcca..b693bb4 100644
--- a/irfanview/irfanview.spec
+++ b/irfanview/irfanview.spec
@@ -1,49 +1,37 @@
 %global dummy_package 0
 %global include_plugins 1
 %global devtty /dev/null
-# select irfanview binary build: 32 or 64
-%global arch 32
+%global upstream_url http://gitlab.com/bgstack15/big-sources/raw/master/%{name}
+#global upstream_url http://www.irfanview.info/files
 
 Name:		irfanview
-Version:	4.52
+Version:	4.53
 Release:	1
-Summary:	Irfanview graphic viewer
+Summary:	irfanview is a graphics viewer
 %define version_num %( echo %version | tr -d '\.' )
 
 Group:   Applications/Graphics
 License:	Freeware
 URL:		http://bgstack15.wordpress.com
-# must download like: curl 'https://www.irfanview.info/files/iview451_x64.zip' --compressed -H 'Referer: https://www.irfanview.info/files/iview451_x64.zip'  iview451_x64.zip
-%if 0%{?arch} == 64
-#Source0: http://www.irfanview.info/files/iview%%{version_num}_x64.zip
-#Source1: http://www.irfanview.info/files/iview%%{version_num}_plugins_x64.zip
-Source0: http://gitlab.com/bgstack15/big-sources/raw/master/%{name}/iview%{version_num}_x64.zip
-Source0: http://gitlab.com/bgstack15/big-sources/raw/master/%{name}/iview%{version_num}_plugins_x64.zip
-%else
-#Source0: http://www.irfanview.info/files/iview%%{version_num}.zip
-#Source1: http://www.irfanview.info/files/iview%%{version_num}_plugins.zip
-Source0: http://gitlab.com/bgstack15/big-sources/raw/master/%{name}/iview%{version_num}.zip
-Source1: http://gitlab.com/bgstack15/big-sources/raw/master/%{name}/iview%{version_num}_plugins.zip
-%endif
-Source2: %{name}.desktop
-Source3: %{name}
-Source4: %{name}.default
-Source5: %{name}-vlc
-Source6: i_view32.ini
-Source7: %{name}-icons.tgz
+# from original upstream, you must download like:
+#    curl 'https://www.irfanview.info/files/iview451_x64.zip' --compressed -H 'Referer: https://www.irfanview.info/files/iview451_x64.zip' -A 'Mozilla (X11)' iview451_x64.zip
+Source0: %{upstream_url}/iview%{version_num}.zip
+Source1: %{upstream_url}/iview%{version_num}_plugins.zip
+Source2: %{upstream_url}/iview%{version_num}_x64.zip
+Source3: %{upstream_url}/iview%{version_num}_plugins_x64.zip
+Source4: %{name}.desktop
+Source5: %{name}32
+Source6: %{name}64
+Source7: %{name}-vlc
+Source8: i_view32.ini
+Source9: %{name}-icons.tgz
 
 Packager:	Bgstack15 <bgstack15@gmail.com>
 Buildarch:	noarch
 BuildRequires: desktop-file-utils
 BuildRequires: ImageMagick
-Requires(pre): bgscripts-core >= 1.1-20
-# WORKHERE: this requires will depend on if this is i686 or x86_64 package
-%if 0%{?arch} == 64
-Requires:	/usr/bin/wine64
-%else
-Requires:	/usr/bin/wine32
-%endif
-Obsoletes:  irfan < 4.51-2
+BuildRequires: unzip
+
 Provides:	application(irfanview.desktop)
 Provides:	mimehandler(image/bmp)
 Provides:	mimehandler(image/gif)
@@ -58,76 +46,86 @@ Provides:	mimehandler(x-content/image-dcf)
 %description
 Irfanview is an amazing graphics application for a different platform. Irfanview is ported to GNU/Linux using wine.
 
-%prep
-# main
-export UNZIP=-o || :
-%setup -q -c
-
-# plugins
-%if 0%{?include_plugins}
-pushd Plugins
-%{__unzip} -o %{SOURCE1}
-popd
-%endif
+%package common
+Summary:	common components for irfanview
+Requires(pre): bgscripts-core >= 1.1-20
 
-# icons
-%{__tar} -zxvf %{SOURCE7}
-for shape in square clear lubuntu circle ;
-do
-   for s in 16 22 24 32 48 64 96 128 256 ;
-   do
-      convert %{name}-${shape}.svg -filter Lanczos -resize ${s}x${s} %{name}-${shape}-${s}.png
-   done
-done
+%description common
+Common elements like desktop file and icons.
+
+%package bin32
+Requires:	/usr/bin/wine32
+Requires:	%{name}-common
+Provides:	irfanview
+Obsoletes:  irfan < 4.51-2
+Obsoletes:  irfanview < 4.53-1
+Summary: irfanview 32-bit
+
+%description bin32
+The 32-bit release of irfanview
+
+%package bin64
+Requires:	/usr/bin/wine64
+Requires:	%{name}-common
+Provides:	irfanview
+Obsoletes:  irfan < 4.51-2
+Obsoletes:  irfanview < 4.53-1
+Summary: irfanview 64-bit
+
+%description bin64
+The 64-bit release of irfanview
+
+%prep
+export UNZIP=-o
+mkdir -p irfanview-bin32 irfanview-bin64
+pushd irfanview-bin32 ; unzip %{SOURCE0} ; cd Plugins ; unzip %{SOURCE1} ; popd
+pushd irfanview-bin64 ; unzip %{SOURCE2} ; cd Plugins ; unzip %{SOURCE3} ; popd
 
 %build
 # the upstream source is the binaries; nothing to do here
 :
 
 %install
-# main files
-%if 0%{?arch} == 64
-%{__install} -p -D -m0755 -t %{buildroot}%{_datadir}/%{name} i_view64.exe
-%else
-%{__install} -p -D -m0755 -t %{buildroot}%{_datadir}/%{name} i_view32.exe
-%endif
-# skipped iv_uninstall.exe
-
-%if 0%{?include_plugins}
-#%{__install} -p -D -m0644 -t %{buildroot}%{_datadir}/%{name}/Plugins Plugins/*
-%{__cp} -pr Plugins %{buildroot}%{_datadir}/%{name}/
-%{__chmod} -R u=rwX,g=rX,o=rX %{buildroot}%{_datadir}/%{name}/Plugins
-%endif
-
-%{__install} -p -D -m0644 -t %{buildroot}%{_datadir}/%{name}/Toolbars Toolbars/*
-%{__install} -p -D -m0644 -t %{buildroot}%{_datadir}/%{name}/Languages Languages/*
+install -d %{buildroot}%{_datadir}/%{name}32 %{buildroot}%{_datadir}/%{name}64 %{buildroot}%{_bindir} %{buildroot}%{_datadir}/applications %{buildroot}%{_docdir}/%{name}
+
+# architectures
+for thisarch in 32 64 ;
+do
+   cd %{name}-bin${thisarch}
+   install -m0755 -t %{buildroot}%{_datadir}/%{name}${thisarch} i_view${thisarch}.exe
+   install -m0644 -t %{buildroot}%{_datadir}/%{name}${thisarch} *.chm
+   cp -pr Languages Plugins Toolbars %{buildroot}%{_datadir}/%{name}${thisarch}
+   test ${thisarch} -eq 32 && __ts=%{SOURCE5} || __ts=%{SOURCE6}
+   install -m0666 -t %{buildroot}%{_bindir} ${__ts}
+   cp -pr %{SOURCE8} %{buildroot}%{_datadir}/%{name}${thisarch}/i_view${thisarch}.ini
+   cd ..
+done
 
 # desktop files
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
 
 # application start and default scripts
-%{__install} -p -D -m0755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
-%{__install} -p -D -m0666 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%{__install} -p -D -m0755 %{SOURCE5} %{buildroot}%{_bindir}/%{name}-vlc
-
-# select architecture
-%if 0%{?arch} == 64
-   %{__sed} -i -r -e 's/32/64/g;' -e 's/\.wine$/\.wine64/;' \
-      %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%endif
-
-# application default config
-%{__install} -p -D -m0666 %{SOURCE6} %{buildroot}%{_sysconfdir}/i_view32.ini
-%{__ln_s} ../../..%{_sysconfdir}/i_view32.ini %{buildroot}%{_datadir}/%{name}/i_view32.ini
+%{__install} -p -D -m0754 %{SOURCE8} %{buildroot}%{_bindir}/%{name}-vlc
 
 # man pages
+pushd %{name}-bin32
 %{__install} -p -D -m0644 -t %{buildroot}%{_docdir}/%{name} *.txt *.chm
 %{__install} -p -D -m0644 -t %{buildroot}%{_docdir}/%{name}/Html Html/*
+popd
 
 # icons
-%{__install} -p -D -m0644 -t %{buildroot}%{_datadir}/%{name}/icons *.svg *.png
-%{__install} -p -D -m0644 %{name}-square.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{__tar} -zxvf %{SOURCE9} %{name}-circle.svg
+for shape in circle ;
+do
+   for s in 16 22 24 32 48 64 96 128 256 ;
+   do
+      mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
+      convert -background none -filter Lanczos -resize ${s}x${s} %{name}-${shape}.svg %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
+   done
+done
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+cp -p %{name}-circle.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 # system services
 # none
@@ -136,111 +134,56 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 rm -rf %{buildroot} || :
 
 %post
-# Deploy theme icons
-which xdg-icon-resource 1>%{devtty} 2>&1 && {
-
-   # Deploy default apps icons
-   for theme in locolor Numix-Circle Lubuntu ;
-   do
-      shape=square
-      case "${theme}" in Numix-Circle) shape=circle;; Lubuntu) shape=lubuntu;; esac
-      # Deploy scalable application icons
-      %{__cp} -p %{_datadir}/%{name}/icons/%{name}-${shape}.svg %{_datadir}/icons/${theme}/scalable/apps/%{name}.svg
-   done
-
-   # Deploy custom apps icons
-   # custom: Numix-Circle apps 48 uses svg
-   cp -p %{_datadir}/%{name}/icons/%{name}-circle.svg %{_datadir}/icons/Numix-Circle/48/apps/%{name}.svg &
-   # custom: Lubuntu apps 48 uses svg
-   cp -p %{_datadir}/%{name}/icons/%{name}-lubuntu.svg %{_datadir}/icons/Lubuntu/apps/48/%{name}.svg &
-   # default
-   cp -p %{_datadir}/%{name}/icons/%{name}-square-48.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-
-} 1>%{devtty} 2>&1
-
-# Mimetypes and default applications
-which xdg-mime 1>/dev/null 2>&1 &&
-{
-   for user in $( /usr/share/bgscripts/enumerate-users.sh || : ) ;
-   do
-
-      # Skip non-user objects
-      ! getent passwd "${user}" && continue
-
-      # Add new mimetypes
-      #su "${user}" -c "xdg-mime install %{_datadir}/%{name}/inc/nonedefined.xml &"
-
-      # Assign default applications
-      while read line;
-      do
-         echo "${user} ${line}"
-         # Assign mimetype a default application
-         su "${user}" -c "test -f ~/.config/mimeapps.list && xdg-mime default irfanview.desktop ${line} &" &
-
-      done <<'EOW'
-image/bmp
-image/gif
-image/ico
-image/jpeg
-image/png
-image/tiff
-image/vnd.adobe.photoshop
-x-content/image-dcf
-EOW
-   done
-} 1>%{devtty} 2>&1
-
 # Update icon caches
-for word in hicolor locolor Numix-Circle Numix Lubuntu elementary-xfce ;
+for word in hicolor ;
 do
    touch --no-create %{_datadir}/icons/${word} || :
 done
-/usr/bin/update-mime-database "%{_datadir}/mime" &> /dev/null || :
 update-desktop-database &> /dev/null || :
 /sbin/ldconfig || :
 
-%preun
-if test "$1" = "0" ;   # total uninstall
-then
-{
-
-   # Remove theme icons
-   which xdg-icon-resource 1>%{devtty} 2>&1 && {
-
-      # Remove default apps icons
-      for theme in locolor Numix-Circle Lubuntu ;
-      do
-
-         # Remove scalable apps icons
-         %{__rm} -f %{_datadir}/icons/${theme}/scalable/apps/%{name}.svg
-
-      # Remove custom apps icons
-      # custom: Numix-Circle apps 48 uses svg
-      rm -f %{_datadir}/icons/Numix-Circle/48/apps/%{name}.svg
-      # custom: Lubuntu apps 48 uses svg
-      rm -f %{_datadir}/icons/Lubuntu/apps/48/%{name}.svg
-      # default
-      rm -f %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-
-      done
-
-   }
-} 1>%{devtty} 2>&1
-fi
+%post bin32
+case "${1}" in
+   1|2)
+      update-alternatives --install /usr/bin/irfanview irfanview /usr/bin/irfanview32 70
+      update-alternatives --install /usr/bin/x-graphics-viewer x-graphics-viewer /usr/bin/irfanview32 70
+      ;;
+esac
+
+%post bin64
+case "${1}" in
+   1|2)
+      update-alternatives --install /usr/bin/irfanview irfanview /usr/bin/irfanview64 60
+      update-alternatives --install /usr/bin/x-graphics-viewer x-graphics-viewer /usr/bin/irfanview64 60
+      ;;
+esac
+
+%preun bin32
+case "${1}" in
+   0)
+      update-alternatives --remove irfanview /usr/bin/irfanview32
+      update-alternatives --remove x-graphics-viewer /usr/bin/irfanview32
+      ;;
+esac
+
+%preun bin64
+case "${1}" in
+   0)
+      update-alternatives --remove irfanview /usr/bin/irfanview64
+      update-alternatives --remove x-graphics-viewer /usr/bin/irfanview64
+      ;;
+esac
 
 %postun
 update-desktop-database &> /dev/null || :
 if test "$1" = "0" ;
 then
 
-   for word in hicolor locolor Numix-Circle Numix Lubuntu elementary-xfce ;
+   for word in hicolor ;
    do
       touch --no-create %{_datadir}/icons/${word} &>/dev/null 
-      gtk-update-icon-cache %{_datadir}/icons/${word} &>/dev/null || :
    done
 
-   /usr/bin/update-mime-database "%{_datadir}/mime" &>/dev/null || :
-
 fi
 /sbin/ldconfig || :
 
@@ -248,15 +191,23 @@ fi
 /usr/bin/gtk-update-icon-cache "%{_datadir}/icons/hicolor" &>/dev/null || :
 /usr/bin/update-mime-database "%{_datadir}/mime" &>/dev/null || :
 
-%files
-%{_datadir}/%{name}
+%files common
 %{_docdir}/%{name}
+%{_bindir}/%{name}-vlc
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
-%attr(755, -, -) %{_bindir}/*
-%config %{_sysconfdir}/sysconfig/%{name}
-%config %attr(666, -, -) %{_sysconfdir}/i_view32.ini
+%ghost %attr(755, -, -) %{_bindir}/%{name}
+
+%files bin32
+%config %attr(666, -, -) %{_datadir}/%{name}32/i_view32.ini
+%attr(0755, -, -) %{_bindir}/%{name}32
+%{_datadir}/%{name}32
+
+%files bin64
+%config %attr(666, -, -) %{_datadir}/%{name}64/i_view64.ini
+%attr(0755, -, -) %{_bindir}/%{name}64
+%{_datadir}/%{name}64
 
 %changelog
-* Tue Nov 29 2016 B Stack <bgstack15@gmail.com>
-- initial package built
+* Sat May 18 2019 B Stack <bgstack15@gmail.com> - 4.53-1
+- version bump
diff --git a/irfanview/irfanview b/irfanview/irfanview32
index bb2af33..66f0ee8 100755
--- a/irfanview/irfanview
+++ b/irfanview/irfanview32
@@ -5,29 +5,20 @@
 # Title: Wrapper script for passing files to Irfanview
 # Purpose: Converts file paths to a wine format and also handles compressed files
 # History: 2016-01-29 Initial quick script written. It used a bunch of sed commands to transform paths to a wine format.
+#    2019-02-26 remove /etc/default/irfanview file
 # Usage: irfan /path/to/image /another/image/file
 # Reference:
 #    Ideas for zip expansion and winepath https://github.com/Zykr/IrfanViewLinux/blob/master/irfanview
 # Improve:
 
-IV_DEFAULT_FILE=/etc/sysconfig/irfanview
-# prepend IV_ to variables from defaults file and apply them
-if test -r "${IV_DEFAULT_FILE}" ;
-then
-   IV_tmpfile="$( mktemp )"
-   sed -r -e 's/^\s*(.*=.*)/IV_\1/;' < "${IV_DEFAULT_FILE}" > "${IV_tmpfile}"
-   source "${IV_tmpfile}"
-   rm -f "${IV_tmpfile}"
-fi
-
 # load variables
 test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine"
 test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine
 test -z "${IV_DEVTTY}" && export IV_DEVTTY=/dev/null
 test -z "${IV_EXEC_NAME}" && export IV_EXEC_NAME="i_view32.exe"
-test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview/i_view32.exe"
+test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview32/i_view32.exe"
 
-IV_VERSION="2018-09-02a"
+IV_VERSION="2019-02-26a"
 
 # Define functions
 expandword() {
diff --git a/irfanview/irfanview64 b/irfanview/irfanview64
new file mode 100755
index 0000000..b67e43d
--- /dev/null
+++ b/irfanview/irfanview64
@@ -0,0 +1,94 @@
+#!/bin/sh
+# File: /usr/bin/irfanview64
+# Author: bgstack15@gmail.com
+# Startdate: 2016-01-29
+# Title: Wrapper script for passing files to Irfanview
+# Purpose: Converts file paths to a wine format and also handles compressed files
+# History: 2016-01-29 Initial quick script written. It used a bunch of sed commands to transform paths to a wine format.
+#    2019-02-26 remove /etc/default/irfanview file
+# Usage: irfan /path/to/image /another/image/file
+# Reference:
+#    Ideas for zip expansion and winepath https://github.com/Zykr/IrfanViewLinux/blob/master/irfanview
+# Improve:
+
+# load variables
+test -z "${IV_WINEPREFIX}" && export IV_WINEPREFIX="$HOME/.wine64"
+test -n "${IV_WINEPREFIX}" && export WINEPREFIX="${IV_WINEPREFIX}" || export WINEPREFIX=$HOME/.wine64
+test -z "${IV_DEVTTY}" && export IV_DEVTTY=/dev/null
+test -z "${IV_EXEC_NAME}" && export IV_EXEC_NAME="i_view64.exe"
+test -z "${IV_EXEC_PATH}" && export IV_EXEC_PATH="/usr/share/irfanview64/i_view64.exe"
+
+IV_VERSION="2019-02-26a"
+
+# Define functions
+expandword() {
+   # call: expandword "${word}"
+   # if file, add it
+   # if directory, expand it
+   # if tarball, extract it and operate on the directory like normal
+   local _word="$( echo "${@}" | sed -e 'sF\/\/F\/Fg;' )"
+   if test -d "${_word}";
+   then
+      # loop through all files in the directory
+      for _newword in "${_word}"/*;
+      do
+         expandword "${_newword}";
+      done
+   elif test -f "${_word}";
+   then
+      # file exists so check if tarball
+      case "${_word}" in
+         *.tgz|*.tar.gz)
+            # extract it and expand the temporary directory
+            _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
+            echo "tmpdir ${_tmpdir}" 1>${IV_DEVTTY}
+            tar -zx -C "${_tmpdir}" -f "${_word}" 1>${IV_DEVTTY} 2>&1
+            expandword "${_tmpdir}"
+            ;;
+         *.zip)
+            _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}"
+            echo "tmpdir ${_tmpdir}" 1>${IV_DEVTTY}
+            echo "7za e -w${_tmpdir} ${_word}" 1>${IV_DEVTTY} 2>&1
+            ( cd "${_tmpdir}"; 7za e "${_word}" 1>${IV_DEVTTY} 2>&1; )
+            expandword "${_tmpdir}"
+            ;;
+         *)
+            # assume it is readable and add it to list of files to open
+            echo "File ${_word}" 1>${IV_DEVTTY}
+            thisfile="$( getwinepath "${_word}" )"
+            irfanfiles="${irfanfiles} \"${thisfile}\""
+            ;;
+      esac
+   fi
+}
+
+getwinepath() {
+   # call: getwinepath "$foo"
+   winepath -w "${@}"
+}
+
+# Define variables
+alltempdirs=""
+
+# prepare files
+irfanargs=
+irfanfiles=
+
+for word in "${@}";
+do
+   expandword "${word}"
+done
+irfanfiles="${irfanfiles## }"
+
+# run wine
+cd $WINEPREFIX
+echo "${irfanfiles}" | xargs echo wine "${IV_EXEC_PATH}" ${irfanargs} > ${IV_DEVTTY}
+echo "${irfanfiles}" | xargs wine "${IV_EXEC_PATH}"  ${irfanargs} &
+
+#wait $( pgrep -P $$ ${IV_EXEC_NAME} )
+# WORKHERE try wait with:
+wait %1
+for thistempdir in ${alltempdirs};
+do
+   rm -rf "${thistempdir}" 1>${IV_DEVTTY}
+done