commit 7c7f57517afea580c3d0e27d411c27563cf6f550
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Wed Feb 5 09:08:25 2014 +0200
fix missing fix-info-dir
tora.spec | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/tora.spec b/tora.spec
index eb6c8b4..77a2b97 100644
--- a/tora.spec
+++ b/tora.spec
@@ -2,12 +2,12 @@
# Conditional build:
%bcond_with oracle # build with oracle support
%bcond_with instantclient # build oracle support with oracle-instantclient
-#
+
Summary: A graphical toolkit for database developers and administrators
Summary(pl.UTF-8): Zestaw graficznych narzędzi dla programistów i
administratorów baz danych
Name: tora
Version: 2.1.3
-Release: 5
+Release: 6
License: GPL v2
Group: Applications/Databases/Interfaces
Source0: http://downloads.sourceforge.net/tora/%{name}-%{version}.tar.gz
@@ -70,11 +70,11 @@ rm -f src/moc_*
--libdir=%{_datadir}/%{name} \
--with-qt-libraries=%{_libdir} \
%if %{with oracle}
- %if %{with instantclient}
+ %if %{with instantclient}
--with-instant-client \
--with-oracle-includes=%{_includedir}/oracle/client \
--with-oracle-libraries=%{_libdir} \
- %endif
+ %endif
--with-oracle
%else
--without-oracle
@@ -85,17 +85,22 @@ rm -f src/moc_*
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install src/icons/tora.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p src/icons/tora.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
cp -a src/templates $RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
%files
%defattr(644,root,root,755)
%doc BUGS NEWS README TODO
@@ -105,5 +110,5 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/templates
%{_datadir}/%{name}/*.qm
%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_pixmapsdir}/*.xpm
%{_infodir}/tora*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tora.git/commitdiff/7c7f57517afea580c3d0e27d411c27563cf6f550
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
