- 1.13

[packages/feh.git] / feh.spec

diff --git a/feh.spec b/feh.spec
index b6019a35fc97fc8d77f9fb3918eb0d06800f7502..a5d20cae2932cb7a3a6fa093e8ea8e0945fd9637 100644 (file)
--- a/feh.spec
+++ b/feh.spec
@@ -2,20 +2,21 @@ 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:       1.4
+Version:       1.13
 Release:       1
 License:       BSD
 Group:         X11/Applications/Graphics
 Source0:       https://derf.homelinux.org/~derf/projects/feh/%{name}-%{version}.tar.bz2
-# Source0-md5: 15963b996feed2d7d2213fa08c34ff1e
+# Source0-md5: 6383dad095c12447e8cdab2d3571c84a
 URL:           https://derf.homelinux.org/~derf/projects/feh/
+Patch0:                %{name}-install.patch
 Source1:       %{name}-bash-completion
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: giblib-devel >= 1.2.4
 BuildRequires: imlib2-devel >= 1.0.0
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
+BuildRequires: sed >= 4.0
+BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXt-devel
 Provides:      WallpaperChanger
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,49 +49,51 @@ Zaawansowane opcje zawierają szybie powiększanie, ładowanie stopniowe,
 rekursywne otwieranie plików (pokaz slajdów z hierarchii katalogów),
 oraz sterowanie z klawiatury/myszki (też z kółkiem).
 
-%package bash-completion
+%package -n bash-completion-feh
 Summary:       bash-completion to feh
 Summary(pl.UTF-8):     bashowe dopełnianie linii poleceń programu feh
 Group:         Applications/Shells
 Requires:      bash-completion
+Obsoletes:     feh-bash-completion
 
-%description bash-completion
+%description -n bash-completion-feh
 bash-completion to feh.
 
-%description bash-completion -l pl.UTF-8
+%description -n bash-completion-feh -l pl.UTF-8
 bashowe dopełnianie linii poleceń programu feh.
 
 %prep
 %setup -q
+%patch0 -p1
+%{__sed} -i "s,CFLAGS ?=.*,CFLAGS = %{rpmcflags}," config.mk
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure
-%{__make}
+%{__make} \
+       CC="%{__cc}" \
+       PREFIX=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       PREFIX=%{_prefix}
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog examples README TODO
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/feh
 %{_mandir}/man1/*
 
-%files bash-completion
+%files -n bash-completion-feh
 %defattr(644,root,root,755)
 %{_sysconfdir}/bash_completion.d/%{name}