up to 3.10.2

[packages/feh.git] / feh.spec

diff --git a/feh.spec b/feh.spec
index 88f8145ab62d481f0c3e50e4d7118acd1dbb4ba1..48492c979f9d2fbef8524b0a7f570c586a93fc86 100644 (file)
--- a/feh.spec
+++ b/feh.spec
@@ -2,12 +2,12 @@ Summary:      Fast image viewer/indexer/montager
 Summary(hu.UTF-8):     Gyors képnézegető/indexelő/montázsoló
 Summary(pl.UTF-8):     Szybki program do przeglądania/indeksowania/montowania obrazów
 Name:          feh
-Version:       3.10.1
+Version:       3.10.2
 Release:       1
 License:       BSD
 Group:         X11/Applications/Graphics
 Source0:       https://feh.finalrewind.org/%{name}-%{version}.tar.bz2
-# Source0-md5: 08446a75833a0bcb09a36e9a4c7e64df
+# Source0-md5: 0a780bf321c0653d03e3e18410f4d1ba
 URL:           https://feh.finalrewind.org/
 # Bash completion by https://github.com/scop/bash-completion/blob/master/completions/feh
 Source1:       %{name}-bash-completion
@@ -19,12 +19,13 @@ BuildRequires:      libexif-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libmagic-devel
 BuildRequires: libpng-devel
+BuildRequires: rpm-build >= 4.6
 BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXt-devel
-Requires:      ImageMagick
-Requires:      imlib2_loaders
+Suggests:      ImageMagick
+Suggests:      imlib2_loaders
 Provides:      WallpaperChanger
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -88,22 +89,29 @@ Dopełnianie parametrów feh dla powłoki ZSH.
 %setup -q
 
 %build
+CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} \
+       CC="%{__cc}" \
        PREFIX=%{_prefix} \
+       exif=1 \
        help=1 \
        inotify=1 \
-       exif=1
+       magic=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -d $RPM_BUILD_ROOT%{zsh_compdir}
+install -d $RPM_BUILD_ROOT{%{bash_compdir},%{zsh_compdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       PREFIX=%{_prefix}
+       PREFIX="%{_prefix}" \
+       bin_dir="$RPM_BUILD_ROOT%{_bindir}" \
+       man_dir="$RPM_BUILD_ROOT%{_mandir}" \
+       desktop_dir="$RPM_BUILD_ROOT%{_desktopdir}" \
+       icon_dir="$RPM_BUILD_ROOT%{_iconsdir}/hicolor"
 
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{bash_compdir}/%{name}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{zsh_compdir}/_%{name}
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -122,17 +130,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog examples README.md TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/feh
 %{_datadir}/feh
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/feh.1*
 %{_desktopdir}/feh.desktop
 %{_iconsdir}/hicolor/48x48/apps/feh.png
 %{_iconsdir}/hicolor/scalable/apps/feh.svg
 
 %files -n bash-completion-feh
 %defattr(644,root,root,755)
-%{_sysconfdir}/bash_completion.d/%{name}
+%{bash_compdir}/%{name}
 
 %files -n zsh-completion-feh
 %defattr(644,root,root,755)
-%{zsh_compdir}/_feh
+%{zsh_compdir}/_%{name}