X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffeh.git;a=blobdiff_plain;f=feh.spec;h=4601a2094ba5ab6a7f483c6cb423f5990c8b1245;hp=114850485a4d93cbc960440862feffc9560d8f18;hb=13aa8ee6150c3fee5878b7f1b54fa125ab652797;hpb=1931893bfebed2a053f49b722a0ddb50096e5f8b

diff --git a/feh.spec b/feh.spec
index 1148504..4601a20 100644
--- a/feh.spec
+++ b/feh.spec
@@ -2,18 +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.5
-Release:	0.9
+Version:	2.5
+Release:	3
 License:	BSD
 Group:		X11/Applications/Graphics
 Source0:	https://derf.homelinux.org/~derf/projects/feh/%{name}-%{version}.tar.bz2
-# Source0-md5:	aee156f0a82582108c5a56fbe85319ae
-URL:		https://derf.homelinux.org/~derf/projects/feh/
+# Source0-md5:	d5f6048f79005c05b51060beafd1f08d
+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
 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)
@@ -46,46 +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
 %{__make} \
-	CC="%{__cc}"
+	CC="%{__cc}" \
+	PREFIX=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 %{__make} install \
-	PREFIX=$RPM_BUILD_ROOT%{_prefix}
+	DESTDIR=$RPM_BUILD_ROOT \
+	PREFIX=%{_prefix}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
 
-rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
+%{__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}