commit 1a76e2205602f1d5edaa8b0aa8551d6524fd9b37
Author: Elan Ruusamäe <[email protected]>
Date: Mon May 2 12:21:14 2016 +0300
packaging fixes
- desktop deps
- tar.xz deps
- package helpers as executable
- re-entrant install fix
geeqie.spec | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/geeqie.spec b/geeqie.spec
index 6410bd2..e43720b 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -10,7 +10,7 @@ Source0: http://www.geeqie.org/%{name}-%{version}.tar.xz
# Source0-md5: fab78be9fca02b68cd670e5359457b88
Patch0: libdir-fix.patch
Patch1: %{name}-raws.patch
-URL: http://www.geeqie.org
+URL: http://www.geeqie.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: exiv2-devel
@@ -21,9 +21,13 @@ BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires: desktop-file-utils
Requires: libjpeg-progs
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
%define specflags_ia32 -fomit-frame-pointer
%description
@@ -64,27 +68,25 @@ 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 \
+ desktopdir=%{_desktopdir} \
DESTDIR=$RPM_BUILD_ROOT
-%{__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
-(cd doc/html ; ln -s GuideIndex.html index.html)
+ln -sf GuideIndex.html doc/html/index.html
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%find_lang %{name}
%post
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database
>/dev/null 2>&1 ||:
+%update_desktop_database
%postun
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database
>/dev/null 2>&1
+%update_desktop_database
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,8 +95,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS README TODO ChangeLog doc/html
%attr(755,root,root) %{_bindir}/%{name}
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*
-%{_desktopdir}/*.desktop
+%{_mandir}/man1/%{name}.1*
+%{_desktopdir}/%{name}.desktop
%{_pixmapsdir}/%{name}.png
-%{_mandir}/man1/*
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-import
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-rotate
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-symlink
+%attr(755,root,root) %{_libdir}/%{name}/geeqie-ufraw
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/geeqie.git/commitdiff/9e0dc5450207fb274e7709b9b59ec122b8489b76
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
