add forgotten patch

[packages/geeqie.git] / geeqie.spec

diff --git a/geeqie.spec b/geeqie.spec
index ab5fd339de2f1c69dba610ceb63c3312f6354718..6410bd25c6d523732216f845c742338918571ae2 100644 (file)
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -2,18 +2,19 @@ Summary:      Graphics file browser utility
 Summary(hu.UTF-8):     Képfájl-böngésző eszköz
 Summary(pl.UTF-8):     Narzędzie do przeglądania plików graficznych
 Name:          geeqie
-Version:       1.0
-Release:       3
+Version:       1.2.3
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Graphics
-Source0:       http://downloads.sourceforge.net/geeqie/%{name}-%{version}.tar.gz
-# Source0-md5: 1d67ef990390224c5052697d93bb49c0
+Source0:       http://www.geeqie.org/%{name}-%{version}.tar.xz
+# Source0-md5: fab78be9fca02b68cd670e5359457b88
 Patch0:                libdir-fix.patch
-URL:           http://geeqie.sourceforge.net/
+Patch1:                %{name}-raws.patch
+URL:           http://www.geeqie.org
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: exiv2-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: gtk+2-devel >= 2:2.4.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libpng-devel
@@ -49,6 +50,7 @@ i opcje filtrowania, jak również wsparcie dla zewnętrznego edytora.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -62,18 +64,19 @@ i opcje filtrowania, jak również wsparcie dla zewnętrznego edytora.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/html
 
 %{__make} install \
+       helpdir=/html \
        DESTDIR=$RPM_BUILD_ROOT
 
-install AUTHORS README TODO ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-# gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}%{_state}/{AUTHORS,TODO,ChangeLog}
-rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/COPYING
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/applications/*.desktop $RPM_BUILD_ROOT%{_desktopdir}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/{applications,template.desktop}
+%{__rm} -r $RPM_BUILD_ROOT/html
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/zh_CN{.GB2312,}
+(cd doc/html ; ln -s GuideIndex.html index.html)
 
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/applications/*.desktop $RPM_BUILD_ROOT%{_desktopdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{applications,template.desktop}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
@@ -88,9 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-#doc AUTHORS README TODO ChangeLog
-%docdir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/
+%doc AUTHORS README TODO ChangeLog doc/html
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*