- release 2

[packages/feh.git] / feh.spec

diff --git a/feh.spec b/feh.spec
index d3f66af22de04dcdcd824184e71d3c41cb858e33..afefd44671ac7f7b25fa8f3a2e45f735b1c77f2e 100644 (file)
--- a/feh.spec
+++ b/feh.spec
@@ -2,14 +2,14 @@ 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.11.2
+Version:       2.1
 Release:       2
 License:       BSD
 Group:         X11/Applications/Graphics
 Source0:       https://derf.homelinux.org/~derf/projects/feh/%{name}-%{version}.tar.bz2
-# Source0-md5: 3b2354d78a882ce02b429bbe053467a2
-URL:           https://derf.homelinux.org/~derf/projects/feh/
-Patch0:                %{name}-install.patch
+# Source0-md5: b7fe5db6d7239902c9ed52733e978b3a
+URL:           http://feh.finalrewind.org/
+# Patch0:              %{name}-install.patch
 Source1:       %{name}-bash-completion
 BuildRequires: giblib-devel >= 1.2.4
 BuildRequires: imlib2-devel >= 1.0.0
@@ -49,21 +49,22 @@ 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
+# %patch0 -p1
 %{__sed} -i "s,CFLAGS ?=.*,CFLAGS = %{rpmcflags}," config.mk
 
 %build
@@ -81,18 +82,18 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} -r $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/*
+%{_mandir}/man1/*.1*
 
-%files bash-completion
+%files -n bash-completion-feh
 %defattr(644,root,root,755)
 %{_sysconfdir}/bash_completion.d/%{name}